diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 462450a91c..6bcdf604db 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -10,23 +10,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
with:
fetch-depth: 0
- name: Set up Helm
- uses: azure/setup-helm@v3
+ uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78
with:
version: v3.10.0
- - uses: actions/setup-python@v4
+ - uses: actions/setup-python@7f4fc3e22c37d6ff65e88745f38bd3157c663f7c
with:
python-version: '3.9'
check-latest: true
# see example https://github.com/helm/chart-testing-action
- name: Set up chart-testing
- uses: helm/chart-testing-action@v2.3.1
+ uses: helm/chart-testing-action@afea100a513515fbd68b0e72a7bb0ae34cb62aec
- name: Run chart-testing (lint)
run: ct lint --target-branch ${GITHUB_BASE_REF}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 799f0d77da..671b57d947 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -13,7 +13,7 @@ jobs:
contents: write
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
with:
fetch-depth: 0
diff --git a/.golangci.yaml b/.golangci.yaml
index 0ce3e6d0be..48daba66ec 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,12 +1,6 @@
-version: "2"
-output:
- formats:
- text:
- path: stdout
- colors: false
-issues:
- max-same-issues: 0
- max-issues-per-linter: 0
+run:
+ concurrency: 2
+ timeout: 10m0s
linters:
exclusions:
generated: lax
@@ -22,9 +16,7 @@ linters:
formatters:
enable:
- gofmt
- exclusions:
- generated: lax
- paths:
- - third_party$
- - builtin$
- - examples$
+output:
+ formats:
+ - format: line-number
+ path: stdout
diff --git a/Makefile b/Makefile
index c9976facca..3dc5dd7043 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ $(BUILD_CMDS): $(SOURCES)
test: unit functional
check: work
- go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.3.1 run --timeout=20m ./...
+ go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0 run --timeout=20m ./...
unit: work
go test -tags=unit $(shell go list ./... | sed -e '/sanity/ { N; d; }' | sed -e '/tests/ {N; d;}') $(TESTARGS)
diff --git a/OWNERS b/OWNERS
index 564c372f78..df49611ef9 100644
--- a/OWNERS
+++ b/OWNERS
@@ -6,10 +6,12 @@ emeritus_approvers:
approvers:
- dulek
- kayrus
+- mandre
- stephenfin
- zetaab
reviewers:
- dulek
- kayrus
+- mandre
- stephenfin
- zetaab
diff --git a/charts/cinder-csi-plugin/Chart.yaml b/charts/cinder-csi-plugin/Chart.yaml
index 34d3dddb6e..5074bc9df8 100644
--- a/charts/cinder-csi-plugin/Chart.yaml
+++ b/charts/cinder-csi-plugin/Chart.yaml
@@ -1,8 +1,8 @@
apiVersion: v1
-appVersion: v1.34.0
+appVersion: v1.31.3
description: Cinder CSI Chart for OpenStack
name: openstack-cinder-csi
-version: 2.34.0
+version: 2.31.7
home: https://github.com/kubernetes/cloud-provider-openstack
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
maintainers:
diff --git a/charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml b/charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml
index 1f4a13454a..a03e0b9979 100644
--- a/charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml
+++ b/charts/cinder-csi-plugin/templates/nodeplugin-daemonset.yaml
@@ -23,6 +23,8 @@ spec:
serviceAccount: csi-cinder-node-sa
hostNetwork: true
dnsPolicy: {{ .Values.csi.plugin.nodePlugin.dnsPolicy }}
+ securityContext:
+ {{- toYaml .Values.csi.plugin.nodePlugin.podSecurityContext | nindent 8 }}
containers:
- name: node-driver-registrar
securityContext:
diff --git a/charts/cinder-csi-plugin/values.yaml b/charts/cinder-csi-plugin/values.yaml
index 27ec3a53a3..4f94643e81 100644
--- a/charts/cinder-csi-plugin/values.yaml
+++ b/charts/cinder-csi-plugin/values.yaml
@@ -25,7 +25,7 @@ csi:
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
- tag: v8.3.0
+ tag: v8.4.0
pullPolicy: IfNotPresent
resources: {}
extraArgs: {}
diff --git a/charts/manila-csi-plugin/Chart.yaml b/charts/manila-csi-plugin/Chart.yaml
index 872f67c021..6bf6eb6111 100644
--- a/charts/manila-csi-plugin/Chart.yaml
+++ b/charts/manila-csi-plugin/Chart.yaml
@@ -1,8 +1,8 @@
apiVersion: v1
-appVersion: v1.34.0
+appVersion: v1.31.3
description: Manila CSI Chart for OpenStack
name: openstack-manila-csi
-version: 2.34.0
+version: 2.31.3
home: http://github.com/kubernetes/cloud-provider-openstack
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
maintainers:
diff --git a/charts/manila-csi-plugin/values.yaml b/charts/manila-csi-plugin/values.yaml
index b1d172abe1..8a10521bbe 100644
--- a/charts/manila-csi-plugin/values.yaml
+++ b/charts/manila-csi-plugin/values.yaml
@@ -100,7 +100,7 @@ controllerplugin:
snapshotter:
image:
repository: registry.k8s.io/sig-storage/csi-snapshotter
- tag: v8.3.0
+ tag: v8.4.0
pullPolicy: IfNotPresent
resources: {}
extraEnv: []
diff --git a/charts/openstack-cloud-controller-manager/Chart.yaml b/charts/openstack-cloud-controller-manager/Chart.yaml
index ebde3ae585..468eb44a66 100644
--- a/charts/openstack-cloud-controller-manager/Chart.yaml
+++ b/charts/openstack-cloud-controller-manager/Chart.yaml
@@ -1,10 +1,10 @@
apiVersion: v2
-appVersion: v1.34.0
+appVersion: v1.31.3
description: Openstack Cloud Controller Manager Helm Chart
icon: https://object-storage-ca-ymq-1.vexxhost.net/swift/v1/6e4619c416ff4bd19e1c087f27a43eea/www-images-prod/openstack-logo/OpenStack-Logo-Vertical.png
home: https://github.com/kubernetes/cloud-provider-openstack
name: openstack-cloud-controller-manager
-version: 2.34.0
+version: 2.31.3
maintainers:
- name: eumel8
email: f.kloeker@telekom.de
diff --git a/charts/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml b/charts/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml
index f2ee6ac5f1..2b2d160b70 100644
--- a/charts/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml
+++ b/charts/openstack-cloud-controller-manager/templates/clusterrolebinding-sm.yaml
@@ -10,7 +10,7 @@ metadata:
{{- end }}
subjects:
- kind: User
- name: system:serviceaccount:{{ .Release.Namespace }}:{{ include "occm.name" . }}
+ name: system:serviceaccount:{{ .Release.Namespace }}:{{ .Values.serviceAccountName }}
apiGroup: rbac.authorization.k8s.io
roleRef:
kind: ClusterRole
diff --git a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml
index 3f0441cc23..40f98ea3f8 100644
--- a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml
+++ b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml
@@ -46,6 +46,10 @@ spec:
containers:
- name: openstack-cloud-controller-manager
image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
+ {{- with .Values.securityContext }}
+ securityContext:
+ {{- toYaml . | nindent 12 }}
+ {{- end }}
args:
- /bin/openstack-cloud-controller-manager
- --v={{ .Values.logVerbosityLevel }}
diff --git a/charts/openstack-cloud-controller-manager/values.yaml b/charts/openstack-cloud-controller-manager/values.yaml
index 6d928aae4f..d813226992 100644
--- a/charts/openstack-cloud-controller-manager/values.yaml
+++ b/charts/openstack-cloud-controller-manager/values.yaml
@@ -74,6 +74,16 @@ podSecurityContext:
# seccompProfile:
# type: RuntimeDefault
+# Set security settings for the controller container
+# For all available options, see https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#securitycontext-v1-core
+securityContext: {}
+# securityContext:
+# capabilities:
+# drop:
+# - ALL
+# readOnlyRootFilesystem: true
+# allowPrivilegeEscalation: false
+
# List of controllers should be enabled.
# Use '*' to enable all controllers.
# Prefix a controller with '-' to disable it.
diff --git a/cmd/cinder-csi-plugin/main.go b/cmd/cinder-csi-plugin/main.go
index 88bb86c987..ff45846aef 100644
--- a/cmd/cinder-csi-plugin/main.go
+++ b/cmd/cinder-csi-plugin/main.go
@@ -90,6 +90,8 @@ func main() {
cmd.PersistentFlags().BoolVar(&withTopology, "with-topology", true, "cluster is topology-aware")
+ cmd.PersistentFlags().BoolVar(&withTopology, "with-topology", true, "cluster is topology-aware")
+
cmd.PersistentFlags().StringSliceVar(&cloudNames, "cloud-name", []string{""}, "Cloud name to instruct CSI driver to read additional OpenStack cloud credentials from the configuration subsections. This option can be specified multiple times to manage multiple OpenStack clouds.")
cmd.PersistentFlags().StringToStringVar(&additionalTopologies, "additional-topology", map[string]string{}, "Additional CSI driver topology keys, for example topology.kubernetes.io/region=REGION1. This option can be specified multiple times to add multiple additional topology keys.")
@@ -99,7 +101,6 @@ func main() {
cmd.PersistentFlags().BoolVar(&provideControllerService, "provide-controller-service", true, "If set to true then the CSI driver does provide the controller service (default: true)")
cmd.PersistentFlags().BoolVar(&provideNodeService, "provide-node-service", true, "If set to true then the CSI driver does provide the node service (default: true)")
cmd.PersistentFlags().BoolVar(&noClient, "node-service-no-os-client", false, "If set to true then the CSI driver node service will not use the OpenStack client (default: false)")
- cmd.PersistentFlags().MarkDeprecated("node-service-no-os-client", "This flag is deprecated and will be removed in the future. Node service do not use OpenStack credentials anymore.") //nolint:errcheck
openstack.AddExtraFlags(pflag.CommandLine)
@@ -112,7 +113,6 @@ func handle() {
d := cinder.NewDriver(&cinder.DriverOpts{
Endpoint: endpoint,
ClusterID: cluster,
- PVCLister: csi.GetPVCLister(),
WithTopology: withTopology,
})
@@ -122,7 +122,7 @@ func handle() {
var err error
clouds := make(map[string]openstack.IOpenStack)
for _, cloudName := range cloudNames {
- clouds[cloudName], err = openstack.GetOpenStackProvider(cloudName)
+ clouds[cloudName], err = openstack.GetOpenStackProvider(cloudName, false)
if err != nil {
klog.Warningf("Failed to GetOpenStackProvider %s: %v", cloudName, err)
return
@@ -133,7 +133,17 @@ func handle() {
}
if provideNodeService {
- // Initialize mount
+ var err error
+ clouds := make(map[string]openstack.IOpenStack)
+ for _, cloudName := range cloudNames {
+ clouds[cloudName], err = openstack.GetOpenStackProvider(cloudName, noClient)
+ if err != nil {
+ klog.Warningf("Failed to GetOpenStackProvider %s: %v", cloudName, err)
+ return
+ }
+ }
+
+ //Initialize mount
mount := mount.GetMountProvider()
cfg, err := openstack.GetConfigFromFiles(cloudConfig)
diff --git a/docs/cinder-csi-plugin/multi-region-clouds.md b/docs/cinder-csi-plugin/multi-region-clouds.md
index e0f07d9248..60761c11ac 100644
--- a/docs/cinder-csi-plugin/multi-region-clouds.md
+++ b/docs/cinder-csi-plugin/multi-region-clouds.md
@@ -167,7 +167,7 @@ spec:
- name: liveness-probe
...
- name: cinder-csi-plugin
- image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.34.1
+ image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.3
args:
- /bin/cinder-csi-plugin
- --endpoint=$(CSI_ENDPOINT)
@@ -217,7 +217,7 @@ spec:
- name: liveness-probe
...
- name: cinder-csi-plugin
- image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.34.1
+ image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.3
args:
- /bin/cinder-csi-plugin
- --endpoint=$(CSI_ENDPOINT)
@@ -283,7 +283,7 @@ spec:
- Topology=true
...
- name: cinder-csi-plugin
- image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.34.1
+ image: docker.io/k8scloudprovider/cinder-csi-plugin:v1.31.3
args:
- /bin/cinder-csi-plugin
- --endpoint=$(CSI_ENDPOINT)
diff --git a/docs/cinder-csi-plugin/using-cinder-csi-plugin.md b/docs/cinder-csi-plugin/using-cinder-csi-plugin.md
index 643a95126e..ba13777941 100644
--- a/docs/cinder-csi-plugin/using-cinder-csi-plugin.md
+++ b/docs/cinder-csi-plugin/using-cinder-csi-plugin.md
@@ -120,11 +120,9 @@ In addition to the standard set of klog flags, `cinder-csi-plugin` accepts the f
Defaults to `true` (enabled).
- --pvc-annotations <disabled>
+ --node-service-no-os-client <disabled>
- If set to true then the CSI driver will use PVC annotations to provide volume
- scheduler hints. See [Supported PVC Annotations](#supported-pvc-annotations)
- for more information.
+ If set to true then the CSI driver does not provide the OpenStack client in the node service.
Defaults to `false` (disabled).
diff --git a/docs/keystone-auth/using-keystone-webhook-authenticator-and-authorizer.md b/docs/keystone-auth/using-keystone-webhook-authenticator-and-authorizer.md
index e3e452aa83..7a191a802d 100644
--- a/docs/keystone-auth/using-keystone-webhook-authenticator-and-authorizer.md
+++ b/docs/keystone-auth/using-keystone-webhook-authenticator-and-authorizer.md
@@ -252,7 +252,7 @@ it as a service. There are several things we need to notice in the
deployment manifest:
- We are using image
- `registry.k8s.io/provider-os/k8s-keystone-auth:v1.34.1`
+ `registry.k8s.io/provider-os/k8s-keystone-auth:v1.31.3`
- We use `k8s-auth-policy` configmap created above.
- The pod uses service account `keystone-auth` created above.
- We use `keystone-auth-certs` secret created above to inject the
diff --git a/docs/magnum-auto-healer/using-magnum-auto-healer.md b/docs/magnum-auto-healer/using-magnum-auto-healer.md
index 7bc58b0957..ae055ca893 100644
--- a/docs/magnum-auto-healer/using-magnum-auto-healer.md
+++ b/docs/magnum-auto-healer/using-magnum-auto-healer.md
@@ -73,7 +73,7 @@ user_id=ceb61464a3d341ebabdf97d1d4b97099
user_project_id=b23a5e41d1af4c20974bf58b4dff8e5a
password=password
region=RegionOne
-image=registry.k8s.io/provider-os/magnum-auto-healer:v1.34.1
+image=registry.k8s.io/provider-os/magnum-auto-healer:v1.31.3
cat < /etc/kubernetes/octavia-ingress-controller/deployment.yaml
---
diff --git a/examples/webhook/keystone-deployment.yaml b/examples/webhook/keystone-deployment.yaml
index 5319518759..57ce208b7d 100644
--- a/examples/webhook/keystone-deployment.yaml
+++ b/examples/webhook/keystone-deployment.yaml
@@ -18,7 +18,7 @@ spec:
serviceAccountName: k8s-keystone
containers:
- name: k8s-keystone-auth
- image: registry.k8s.io/provider-os/k8s-keystone-auth:v1.34.1
+ image: registry.k8s.io/provider-os/k8s-keystone-auth:v1.31.3
args:
- ./bin/k8s-keystone-auth
- --tls-cert-file
diff --git a/go.mod b/go.mod
index d2c17b2701..6d4128db2e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,11 @@
module k8s.io/cloud-provider-openstack
-go 1.24.0
+go 1.25.1
require (
github.com/container-storage-interface/spec v1.11.0
github.com/google/uuid v1.6.0
+ github.com/gophercloud/gophercloud v1.14.1
github.com/gophercloud/gophercloud/v2 v2.8.0
github.com/gophercloud/utils/v2 v2.0.0-20250930154317-576cdf6142a7
github.com/hashicorp/go-version v1.7.0
@@ -21,9 +22,9 @@ require (
github.com/stretchr/testify v1.11.1
go.uber.org/goleak v1.3.0
golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9
- golang.org/x/sys v0.39.0
- golang.org/x/term v0.38.0
- google.golang.org/grpc v1.79.3
+ golang.org/x/sys v0.36.0
+ golang.org/x/term v0.35.0
+ google.golang.org/grpc v1.76.0
google.golang.org/protobuf v1.36.10
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/godo.v2 v2.0.9
@@ -54,7 +55,7 @@ replace (
)
require (
- cel.dev/expr v0.25.1 // indirect
+ cel.dev/expr v0.24.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/MichaelTJones/walk v0.0.0-20161122175330-4748e29d5718 // indirect
@@ -133,28 +134,28 @@ require (
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
- go.opentelemetry.io/otel v1.39.0 // indirect
+ go.opentelemetry.io/otel v1.38.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
- go.opentelemetry.io/otel/metric v1.39.0 // indirect
- go.opentelemetry.io/otel/sdk v1.39.0 // indirect
- go.opentelemetry.io/otel/trace v1.39.0 // indirect
+ go.opentelemetry.io/otel/metric v1.38.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.38.0 // indirect
+ go.opentelemetry.io/otel/trace v1.38.0 // indirect
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
go.uber.org/automaxprocs v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
- golang.org/x/crypto v0.46.0 // indirect
- golang.org/x/mod v0.30.0 // indirect
- golang.org/x/net v0.48.0 // indirect
- golang.org/x/oauth2 v0.34.0 // indirect
- golang.org/x/sync v0.19.0 // indirect
- golang.org/x/text v0.32.0 // indirect
+ golang.org/x/crypto v0.42.0 // indirect
+ golang.org/x/mod v0.28.0 // indirect
+ golang.org/x/net v0.45.0 // indirect
+ golang.org/x/oauth2 v0.31.0 // indirect
+ golang.org/x/sync v0.17.0 // indirect
+ golang.org/x/text v0.29.0 // indirect
golang.org/x/time v0.13.0 // indirect
- golang.org/x/tools v0.39.0 // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
+ golang.org/x/tools v0.37.0 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
diff --git a/go.sum b/go.sum
index 5030cb79e9..41ddffcf6b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
-cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
+cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
+cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
@@ -172,6 +172,8 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gophercloud/gophercloud v1.14.1 h1:DTCNaTVGl8/cFu58O1JwWgis9gtISAFONqpMKNg/Vpw=
+github.com/gophercloud/gophercloud v1.14.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
github.com/gophercloud/gophercloud/v2 v2.8.0 h1:of2+8tT6+FbEYHfYC8GBu8TXJNsXYSNm9KuvpX7Neqo=
github.com/gophercloud/gophercloud/v2 v2.8.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk=
github.com/gophercloud/utils/v2 v2.0.0-20250930154317-576cdf6142a7 h1:y0/17y47lq1dD97qEqbbvjsMF8PzLmqmD839aOePRuc=
@@ -351,20 +353,20 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
-go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
-go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
+go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 h1:GqRJVj7UmLjCVyVJ3ZFLdPRmhDUp2zFmQe3RHIOsw24=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0/go.mod h1:ri3aaHSmCTVYu2AWv44YMauwAQc0aqI9gHKIcSbI1pU=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 h1:lwI4Dc5leUqENgGuQImwLo4WnuXFPetmPpkLi2IrX54=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0/go.mod h1:Kz/oCE7z5wuyhPxsXDuaPteSWqjSBD5YaSdbxZYGbGk=
-go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
-go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
-go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
-go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
-go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
-go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
-go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
-go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
+go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
+go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
+go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
+go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
+go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
+go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
+go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
+go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
go.opentelemetry.io/proto/otlp v1.8.0 h1:fRAZQDcAFHySxpJ1TwlA1cJ4tvcrw7nXl9xWWC8N5CE=
go.opentelemetry.io/proto/otlp v1.8.0/go.mod h1:tIeYOeNBU4cvmPqpaji1P+KbB4Oloai8wN4rWzRrFF0=
@@ -384,8 +386,9 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI=
+golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9 h1:TQwNpfvNkxAVlItJf6Cr5JTsVZoC/Sj7K3OZv2Pc14A=
golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
@@ -396,8 +399,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
-golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
-golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
+golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
+golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -414,15 +417,16 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220802222814-0bcc04d9c69b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
+golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
-golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
+golang.org/x/oauth2 v0.31.0 h1:8Fq0yVZLh4j4YA47vHKFTa9Ew5XIrCP8LC6UeNZnLxo=
+golang.org/x/oauth2 v0.31.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -430,8 +434,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
+golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -457,18 +461,18 @@ golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q=
-golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg=
+golang.org/x/term v0.35.0 h1:bZBVKBudEyhRcajGcNc3jIfWPqV4y/Kt2XcoigOWtDQ=
+golang.org/x/term v0.35.0/go.mod h1:TPGtkTLesOwf2DE8CgVYiZinHAOuy5AYUYT1lENIZnA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
+golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
golang.org/x/time v0.13.0 h1:eUlYslOIt32DgYD6utsuUeHs4d7AsEYLuIAdg7FlYgI=
golang.org/x/time v0.13.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -482,8 +486,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
-golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
-golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
+golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
+golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -497,10 +501,10 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/genproto v0.0.0-20201209185603-f92720507ed4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 h1:fCvbg86sFXwdrl5LgVcTEvNC+2txB5mgROGmRL5mrls=
-google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 h1:gRkg/vSppuSQoDjxyiGfN4Upv/h/DQmIR10ZU8dh4Ww=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff h1:8Zg5TdmcbU8A7CXGjGXF1Slqu/nIFCRaR3S5gT2plIA=
+google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff/go.mod h1:dbWfpVPvW/RqafStmRWBUpMN14puDezDMHxNYiRfQu0=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff h1:A90eA31Wq6HOMIQlLfzFwzqGKBTuaVztYu/g8sn+8Zc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@@ -509,8 +513,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
-google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
+google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
+google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
diff --git a/manifests/barbican-kms/ds.yaml b/manifests/barbican-kms/ds.yaml
index 805202edc7..70fb6ef485 100644
--- a/manifests/barbican-kms/ds.yaml
+++ b/manifests/barbican-kms/ds.yaml
@@ -30,7 +30,7 @@ spec:
serviceAccountName: cloud-controller-manager
containers:
- name: barbican-kms
- image: registry.k8s.io/provider-os/barbican-kms-plugin:v1.34.1
+ image: registry.k8s.io/provider-os/barbican-kms-plugin:v1.31.3
args:
- /bin/barbican-kms-plugin
- --socketpath=$(KMS_ENDPOINT)
diff --git a/manifests/barbican-kms/pod.yaml b/manifests/barbican-kms/pod.yaml
index 11fca5f2e4..61cf9af9bb 100644
--- a/manifests/barbican-kms/pod.yaml
+++ b/manifests/barbican-kms/pod.yaml
@@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: barbican-kms
- image: registry.k8s.io/provider-os/barbican-kms-plugin:v1.34.1
+ image: registry.k8s.io/provider-os/barbican-kms-plugin:v1.31.3
args:
- "--socketpath=/kms/kms.sock"
- "--cloud-config=/etc/kubernetes/cloud-config"
diff --git a/manifests/cinder-csi-plugin/cinder-csi-controllerplugin.yaml b/manifests/cinder-csi-plugin/cinder-csi-controllerplugin.yaml
index 29cec731a4..62adf511b8 100644
--- a/manifests/cinder-csi-plugin/cinder-csi-controllerplugin.yaml
+++ b/manifests/cinder-csi-plugin/cinder-csi-controllerplugin.yaml
@@ -55,7 +55,7 @@ spec:
- name: socket-dir
mountPath: /var/lib/csi/sockets/pluginproxy/
- name: csi-snapshotter
- image: registry.k8s.io/sig-storage/csi-snapshotter:v8.3.0
+ image: registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0
args:
- "--csi-address=$(ADDRESS)"
- "--timeout=3m"
@@ -93,7 +93,7 @@ spec:
- mountPath: /var/lib/csi/sockets/pluginproxy/
name: socket-dir
- name: cinder-csi-plugin
- image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.34.1
+ image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.31.3
args:
- /bin/cinder-csi-plugin
- "--endpoint=$(CSI_ENDPOINT)"
diff --git a/manifests/cinder-csi-plugin/cinder-csi-nodeplugin.yaml b/manifests/cinder-csi-plugin/cinder-csi-nodeplugin.yaml
index 31359f4216..ac59fa8a13 100644
--- a/manifests/cinder-csi-plugin/cinder-csi-nodeplugin.yaml
+++ b/manifests/cinder-csi-plugin/cinder-csi-nodeplugin.yaml
@@ -53,7 +53,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
- image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.34.1
+ image: registry.k8s.io/provider-os/cinder-csi-plugin:v1.31.3
args:
- /bin/cinder-csi-plugin
- "--endpoint=$(CSI_ENDPOINT)"
diff --git a/manifests/controller-manager/cloud-controller-manager-role-bindings.yaml b/manifests/controller-manager/cloud-controller-manager-role-bindings.yaml
index 19f3f95318..d34b3713aa 100644
--- a/manifests/controller-manager/cloud-controller-manager-role-bindings.yaml
+++ b/manifests/controller-manager/cloud-controller-manager-role-bindings.yaml
@@ -10,7 +10,7 @@ items:
name: system:cloud-node-controller
subjects:
- kind: ServiceAccount
- name: cloud-node-controller
+ name: cloud-controller-manager
namespace: kube-system
- apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
diff --git a/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml b/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
index b2d289f15e..195e06bdb2 100644
--- a/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
+++ b/manifests/controller-manager/openstack-cloud-controller-manager-ds.yaml
@@ -23,8 +23,13 @@ spec:
labels:
k8s-app: openstack-cloud-controller-manager
spec:
- nodeSelector:
- node-role.kubernetes.io/control-plane: "true"
+ affinity:
+ nodeAffinity:
+ requiredDuringSchedulingIgnoredDuringExecution:
+ nodeSelectorTerms:
+ - matchExpressions:
+ - key: node-role.kubernetes.io/control-plane
+ operator: Exists
securityContext:
runAsUser: 1001
tolerations:
@@ -42,7 +47,7 @@ spec:
serviceAccountName: cloud-controller-manager
containers:
- name: openstack-cloud-controller-manager
- image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.34.1
+ image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.31.3
args:
- /bin/openstack-cloud-controller-manager
- --v=1
diff --git a/manifests/controller-manager/openstack-cloud-controller-manager-pod.yaml b/manifests/controller-manager/openstack-cloud-controller-manager-pod.yaml
index fd3f6d26d7..9bc8ddb82e 100644
--- a/manifests/controller-manager/openstack-cloud-controller-manager-pod.yaml
+++ b/manifests/controller-manager/openstack-cloud-controller-manager-pod.yaml
@@ -11,7 +11,7 @@ metadata:
spec:
containers:
- name: openstack-cloud-controller-manager
- image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.34.1
+ image: registry.k8s.io/provider-os/openstack-cloud-controller-manager:v1.31.3
args:
- /bin/openstack-cloud-controller-manager
- --v=1
diff --git a/manifests/magnum-auto-healer/magnum-auto-healer.yaml b/manifests/magnum-auto-healer/magnum-auto-healer.yaml
index ad2b7ae196..f460d3e576 100644
--- a/manifests/magnum-auto-healer/magnum-auto-healer.yaml
+++ b/manifests/magnum-auto-healer/magnum-auto-healer.yaml
@@ -88,7 +88,7 @@ spec:
node-role.kubernetes.io/control-plane: ""
containers:
- name: magnum-auto-healer
- image: registry.k8s.io/provider-os/magnum-auto-healer:v1.34.1
+ image: registry.k8s.io/provider-os/magnum-auto-healer:v1.31.3
imagePullPolicy: Always
args:
- /bin/magnum-auto-healer
diff --git a/manifests/manila-csi-plugin/csi-controllerplugin.yaml b/manifests/manila-csi-plugin/csi-controllerplugin.yaml
index 389e31dc02..d51a414c46 100644
--- a/manifests/manila-csi-plugin/csi-controllerplugin.yaml
+++ b/manifests/manila-csi-plugin/csi-controllerplugin.yaml
@@ -50,7 +50,7 @@ spec:
- name: plugin-dir
mountPath: /var/lib/kubelet/plugins/manila.csi.openstack.org
- name: snapshotter
- image: "registry.k8s.io/sig-storage/csi-snapshotter:v8.3.0"
+ image: "registry.k8s.io/sig-storage/csi-snapshotter:v8.4.0"
args:
- "--csi-address=$(ADDRESS)"
env:
@@ -78,7 +78,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
- image: registry.k8s.io/provider-os/manila-csi-plugin:v1.34.1
+ image: registry.k8s.io/provider-os/manila-csi-plugin:v1.31.3
command: ["/bin/sh", "-c",
'/bin/manila-csi-plugin
--endpoint=$(CSI_ENDPOINT)
diff --git a/manifests/manila-csi-plugin/csi-nodeplugin.yaml b/manifests/manila-csi-plugin/csi-nodeplugin.yaml
index 52dfa450e2..5705cf6e69 100644
--- a/manifests/manila-csi-plugin/csi-nodeplugin.yaml
+++ b/manifests/manila-csi-plugin/csi-nodeplugin.yaml
@@ -50,7 +50,7 @@ spec:
capabilities:
add: ["SYS_ADMIN"]
allowPrivilegeEscalation: true
- image: registry.k8s.io/provider-os/manila-csi-plugin:v1.34.1
+ image: registry.k8s.io/provider-os/manila-csi-plugin:v1.31.3
command: ["/bin/sh", "-c",
'/bin/manila-csi-plugin
--endpoint=$(CSI_ENDPOINT)
diff --git a/pkg/autohealing/healthcheck/plugin_endpoint.go b/pkg/autohealing/healthcheck/plugin_endpoint.go
index ef24af4162..91604f3597 100644
--- a/pkg/autohealing/healthcheck/plugin_endpoint.go
+++ b/pkg/autohealing/healthcheck/plugin_endpoint.go
@@ -19,6 +19,7 @@ package healthcheck
import (
"context"
"crypto/tls"
+ "crypto/x509"
"fmt"
"net/http"
"os"
@@ -26,6 +27,7 @@ import (
"time"
"github.com/mitchellh/mapstructure"
+ "k8s.io/client-go/util/cert"
log "k8s.io/klog/v2"
"k8s.io/cloud-provider-openstack/pkg/autohealing/utils"
@@ -34,6 +36,7 @@ import (
const (
EndpointType = "Endpoint"
TokenPath = "/var/run/secrets/kubernetes.io/serviceaccount/token"
+ CAPath = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt"
TimeLayout = "2006-01-02 15:04:05"
)
@@ -61,6 +64,13 @@ type EndpointCheck struct {
// (Optional) Token to use in the request header. Default: read from TokenPath file
Token string `mapstructure:"token"`
+
+ // (Optional) Path to a CA certificate file used to verify the node's TLS certificate. Only used when Protocol is HTTPS.
+ // Default: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+ CAFile string `mapstructure:"ca-file"`
+
+ // (Optional) If true, skip TLS certificate verification. Default: false
+ TLSInsecure bool `mapstructure:"tls-insecure"`
}
// GetName returns name of the health check
@@ -141,9 +151,18 @@ func (check *EndpointCheck) Check(ctx context.Context, node NodeInfo, controller
protocol := strings.ToLower(check.Protocol)
switch protocol {
case "https":
- tr := &http.Transport{
- TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+ tlsConfig := &tls.Config{InsecureSkipVerify: check.TLSInsecure}
+ if check.CAFile != "" && !check.TLSInsecure {
+ var caPool *x509.CertPool
+ var err error
+ caPool, err = cert.NewPool(check.CAFile)
+ if err != nil {
+ log.Errorf("Node %s, failed to load CA file %s, error: %v", nodeName, check.CAFile, err)
+ return check.checkDuration(ctx, node, controller, false)
+ }
+ tlsConfig.RootCAs = caPool
}
+ tr := &http.Transport{TLSClientConfig: tlsConfig}
client = &http.Client{Transport: tr, Timeout: time.Second * 5}
case "http":
client = &http.Client{Timeout: time.Second * 5}
@@ -195,6 +214,7 @@ func NewEndpointCheck(config interface{}) (HealthCheck, error) {
OKCodes: []int{200},
RequireToken: false,
UnhealthyAnnotation: "autohealing.openstack.org/unhealthy-timestamp",
+ CAFile: CAPath,
}
decConfig := mapstructure.DecoderConfig{
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 44cdba7717..d6dbeee6c6 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -38,11 +38,11 @@ import (
type AuthOpts struct {
AuthURL string `gcfg:"auth-url" mapstructure:"auth-url" name:"os-authURL" value:"optional" dependsOn:"os-password|os-trustID|os-applicationCredentialSecret|os-clientCertPath"`
- UserID string `gcfg:"user-id" mapstructure:"user-id" name:"os-userID" value:"optional"`
- Username string `name:"os-userName" value:"optional"`
- Password string `name:"os-password" value:"optional"`
- TenantID string `gcfg:"tenant-id" mapstructure:"project-id" name:"os-projectID" value:"optional"`
- TenantName string `gcfg:"tenant-name" mapstructure:"project-name" name:"os-projectName" value:"optional"`
+ UserID string `gcfg:"user-id" mapstructure:"user-id" name:"os-userID" value:"optional" dependsOn:"os-password"`
+ Username string `name:"os-userName" value:"optional" dependsOn:"os-password"`
+ Password string `name:"os-password" value:"optional" dependsOn:"os-domainID|os-domainName,os-projectID|os-projectName,os-userID|os-userName"`
+ TenantID string `gcfg:"tenant-id" mapstructure:"project-id" name:"os-projectID" value:"optional" dependsOn:"os-password|os-clientCertPath"`
+ TenantName string `gcfg:"tenant-name" mapstructure:"project-name" name:"os-projectName" value:"optional" dependsOn:"os-password|os-clientCertPath"`
TrustID string `gcfg:"trust-id" mapstructure:"trust-id" name:"os-trustID" value:"optional"`
TrusteeID string `gcfg:"trustee-id" mapstructure:"trustee-id" name:"os-trusteeID" value:"optional" dependsOn:"os-trustID"`
TrusteePassword string `gcfg:"trustee-password" mapstructure:"trustee-password" name:"os-trusteePassword" value:"optional" dependsOn:"os-trustID"`
@@ -52,7 +52,7 @@ type AuthOpts struct {
TenantDomainName string `gcfg:"tenant-domain-name" mapstructure:"project-domain-name" name:"os-projectDomainName" value:"optional"`
UserDomainID string `gcfg:"user-domain-id" mapstructure:"user-domain-id" name:"os-userDomainID" value:"optional"`
UserDomainName string `gcfg:"user-domain-name" mapstructure:"user-domain-name" name:"os-userDomainName" value:"optional"`
- Region string `name:"os-region" value:"optional"`
+ Region string `name:"os-region" value:"optional" dependsOn:"os-password|os-applicationCredentialSecret|os-trusteePassword"`
EndpointType gophercloud.Availability `gcfg:"os-endpoint-type" mapstructure:"os-endpoint-type" name:"os-endpointType" value:"optional"`
CAFile string `gcfg:"ca-file" mapstructure:"ca-file" name:"os-certAuthorityPath" value:"optional"`
TLSInsecure string `gcfg:"tls-insecure" mapstructure:"tls-insecure" name:"os-TLSInsecure" value:"optional" matches:"^true|false$"`
diff --git a/pkg/csi/cinder/controllerserver.go b/pkg/csi/cinder/controllerserver.go
index 1a1b9e2ff6..e9bdb6bbd6 100644
--- a/pkg/csi/cinder/controllerserver.go
+++ b/pkg/csi/cinder/controllerserver.go
@@ -18,7 +18,6 @@ package cinder
import (
"context"
- "errors"
"fmt"
"slices"
"sort"
@@ -86,7 +85,19 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
// Volume Type
volType := volParams["type"]
- // Volume AZ
+ var volAvailability string
+ if cs.Driver.withTopology {
+ // First check if volAvailability is already specified, if not get preferred from Topology
+ // Required, incase vol AZ is different from node AZ
+ volAvailability = volParams["availability"]
+ if volAvailability == "" {
+ accessibleTopologyReq := req.GetAccessibilityRequirements()
+ // Check from Topology
+ if accessibleTopologyReq != nil {
+ volAvailability = util.GetAZFromTopology(topologyKey, accessibleTopologyReq)
+ }
+ }
+ }
accessibleTopologyReq := req.GetAccessibilityRequirements()
ignoreVolumeAZ := cloud.GetBlockStorageOpts().IgnoreVolumeAZ
@@ -128,9 +139,9 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
}
// Volume Create
- properties := map[string]string{cinderCSIClusterIDKey: cs.Driver.clusterID}
+ properties := map[string]string{cinderCSIClusterIDKey: cs.Driver.cluster}
// Tag volume with metadata if present: https://github.com/kubernetes-csi/external-provisioner/pull/399
- for _, mKey := range sharedcsi.RecognizedCSIProvisionerParams {
+ for _, mKey := range []string{"csi.storage.k8s.io/pvc/name", "csi.storage.k8s.io/pvc/namespace", "csi.storage.k8s.io/pv/name"} {
if v, ok := req.Parameters[mKey]; ok {
properties[mKey] = v
}
@@ -460,7 +471,7 @@ func (cs *controllerServer) ListVolumes(ctx context.Context, req *csi.ListVolume
}
var volumeList []volumes.Volume
- volumeList, token, err = cs.Clouds[cloudName].ListVolumes(ctx, maxEntries, token)
+ volumeList, token, err = cs.Clouds[cloudName].ListVolumes(maxEntries, token)
if err != nil {
klog.Errorf("Failed to ListVolumes: %v", err)
if cpoerrors.IsInvalidError(err) {
diff --git a/pkg/csi/cinder/controllerserver_test.go b/pkg/csi/cinder/controllerserver_test.go
index df608d1b2c..e635fbef8a 100644
--- a/pkg/csi/cinder/controllerserver_test.go
+++ b/pkg/csi/cinder/controllerserver_test.go
@@ -23,12 +23,8 @@ import (
"github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "google.golang.org/grpc/codes"
- "google.golang.org/grpc/status"
- sharedcsi "k8s.io/cloud-provider-openstack/pkg/csi"
"k8s.io/cloud-provider-openstack/pkg/csi/cinder/openstack"
- cpoerrors "k8s.io/cloud-provider-openstack/pkg/util/errors"
)
func fakeControllerServer() (*controllerServer, *openstack.OpenStackMock) {
@@ -36,11 +32,7 @@ func fakeControllerServer() (*controllerServer, *openstack.OpenStackMock) {
d := NewDriver(&DriverOpts{Endpoint: FakeEndpoint, ClusterID: FakeCluster, WithTopology: true})
- cs := NewControllerServer(d, map[string]openstack.IOpenStack{
- "": osmock,
- })
- return cs, osmock
-}
+ d := NewDriver(&DriverOpts{Endpoint: FakeEndpoint, ClusterID: FakeCluster, WithTopology: true})
func fakeControllerServerWithMultipleRegions() (*controllerServer, *openstack.OpenStackMock, *openstack.OpenStackMock) {
osmock := new(openstack.OpenStackMock)
@@ -665,9 +657,6 @@ type ListVolumesTestResult struct {
}
func TestGlobalListVolumesMultipleClouds(t *testing.T) {
- fakeCs, osmock := fakeControllerServer()
- fakeCsMulti, osmockMulti, osmockMultiAlt := fakeControllerServerWithMultipleRegions()
-
tests := []*ListVolumesTest{
{
name: "Single cloud, no volume",
@@ -733,11 +722,11 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
maxEntries: 0,
volumeSet: map[string]ListVolumeTestOSMock{
"": {
- mockCloud: osmockMulti,
+ mockCloud: osmock,
mockVolumesRes: []volumes.Volume{},
},
"region-x": {
- mockCloud: osmockMultiAlt,
+ mockCloud: osmockRegionX,
mockVolumesRes: []volumes.Volume{},
},
},
@@ -752,11 +741,11 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
maxEntries: 0,
volumeSet: map[string]ListVolumeTestOSMock{
"": {
- mockCloud: osmockMulti,
+ mockCloud: osmock,
mockVolumesRes: []volumes.Volume{},
},
"region-x": {
- mockCloud: osmockMultiAlt,
+ mockCloud: osmockRegionX,
mockVolumesRes: []volumes.Volume{},
},
},
@@ -769,7 +758,7 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
maxEntries: 0,
volumeSet: map[string]ListVolumeTestOSMock{
"": {
- mockCloud: osmockMulti,
+ mockCloud: osmock,
mockVolumesRes: []volumes.Volume{
{ID: "vol1"},
{ID: "vol2"},
@@ -778,7 +767,7 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
},
},
"region-x": {
- mockCloud: osmockMultiAlt,
+ mockCloud: osmockRegionX,
mockVolumesRes: []volumes.Volume{
{ID: "vol5"},
{ID: "vol6"},
@@ -802,7 +791,7 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
startingToken: ":region-x",
volumeSet: map[string]ListVolumeTestOSMock{
"": {
- mockCloud: osmockMulti,
+ mockCloud: osmock,
mockVolumesRes: []volumes.Volume{
{ID: "vol1"},
{ID: "vol2"},
@@ -811,7 +800,7 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
},
},
"region-x": {
- mockCloud: osmockMultiAlt,
+ mockCloud: osmockRegionX,
mockVolumesRes: []volumes.Volume{
{ID: "vol5"},
{ID: "vol6"},
@@ -833,11 +822,11 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
maxEntries: 2,
volumeSet: map[string]ListVolumeTestOSMock{
"": {
- mockCloud: osmockMulti,
+ mockCloud: osmock,
mockVolumesRes: []volumes.Volume{},
},
"region-x": {
- mockCloud: osmockMultiAlt,
+ mockCloud: osmockRegionX,
mockVolumesRes: []volumes.Volume{},
},
},
@@ -851,14 +840,14 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
maxEntries: 2,
volumeSet: map[string]ListVolumeTestOSMock{
"": {
- mockCloud: osmockMulti,
+ mockCloud: osmock,
mockVolumesRes: []volumes.Volume{
{ID: "vol1"},
{ID: "vol2"},
},
},
"region-x": {
- mockCloud: osmockMultiAlt,
+ mockCloud: osmockRegionX,
mockVolumesRes: []volumes.Volume{
{ID: "vol3"},
{ID: "vol4"},
@@ -880,14 +869,14 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
startingToken: ":region-x",
volumeSet: map[string]ListVolumeTestOSMock{
"": {
- mockCloud: osmockMulti,
+ mockCloud: osmock,
mockVolumesRes: []volumes.Volume{
{ID: "vol1"},
{ID: "vol2"},
},
},
"region-x": {
- mockCloud: osmockMultiAlt,
+ mockCloud: osmockRegionX,
mockVolumesRes: []volumes.Volume{
{ID: "vol3"},
{ID: "vol4"},
@@ -909,14 +898,14 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
startingToken: "vol4:region-x",
volumeSet: map[string]ListVolumeTestOSMock{
"": {
- mockCloud: osmockMulti,
+ mockCloud: osmock,
mockVolumesRes: []volumes.Volume{
{ID: "vol1"},
{ID: "vol2"},
},
},
"region-x": {
- mockCloud: osmockMultiAlt,
+ mockCloud: osmockRegionX,
mockTokenReq: "vol4",
mockVolumesRes: []volumes.Volume{
{ID: "vol5"},
@@ -933,6 +922,7 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
+ // Init assert
assert := assert.New(t)
// Setup Mock
for _, volumeSet := range test.volumeSet {
@@ -965,7 +955,7 @@ func TestGlobalListVolumesMultipleClouds(t *testing.T) {
// Invoke ListVolumes
cs := fakeCs
if len(test.volumeSet) > 1 {
- cs = fakeCsMulti
+ cs = fakeCsMultipleClouds
}
actualRes, err := cs.ListVolumes(FakeCtx, fakeReq)
if err != nil {
diff --git a/pkg/csi/cinder/driver.go b/pkg/csi/cinder/driver.go
index 047572242e..2e83a12433 100644
--- a/pkg/csi/cinder/driver.go
+++ b/pkg/csi/cinder/driver.go
@@ -66,7 +66,7 @@ type Driver struct {
name string
fqVersion string //Fully qualified version in format {Version}@{CPO version}
endpoint string
- clusterID string
+ cluster string
withTopology bool
ids *identityServer
@@ -84,19 +84,15 @@ type DriverOpts struct {
ClusterID string
Endpoint string
WithTopology bool
-
- PVCLister v1.PersistentVolumeClaimLister
}
func NewDriver(o *DriverOpts) *Driver {
- d := &Driver{
- name: driverName,
- fqVersion: fmt.Sprintf("%s@%s", Version, version.Version),
- endpoint: o.Endpoint,
- clusterID: o.ClusterID,
- withTopology: o.WithTopology,
- pvcLister: o.PVCLister,
- }
+ d := &Driver{}
+ d.name = driverName
+ d.fqVersion = fmt.Sprintf("%s@%s", Version, version.Version)
+ d.endpoint = o.Endpoint
+ d.cluster = o.ClusterID
+ d.withTopology = o.WithTopology
klog.Info("Driver: ", d.name)
klog.Info("Driver version: ", d.fqVersion)
diff --git a/pkg/csi/cinder/nodeserver.go b/pkg/csi/cinder/nodeserver.go
index ee91ae0c15..5595060cd0 100644
--- a/pkg/csi/cinder/nodeserver.go
+++ b/pkg/csi/cinder/nodeserver.go
@@ -292,9 +292,10 @@ func (ns *nodeServer) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoReque
return nil, status.Errorf(codes.Internal, "[NodeGetInfo] unable to retrieve instance id of node %v", err)
}
+ maxVolume := ns.Cloud.GetMaxVolLimit()
nodeInfo := &csi.NodeGetInfoResponse{
NodeId: nodeID,
- MaxVolumesPerNode: ns.Opts.NodeVolumeAttachLimit,
+ MaxVolumesPerNode: maxVolume,
}
if !ns.Driver.withTopology {
diff --git a/pkg/csi/cinder/nodeserver_test.go b/pkg/csi/cinder/nodeserver_test.go
index 8e8713e05d..60ccd33563 100644
--- a/pkg/csi/cinder/nodeserver_test.go
+++ b/pkg/csi/cinder/nodeserver_test.go
@@ -35,9 +35,25 @@ import (
func fakeNodeServer() (*nodeServer, *openstack.OpenStackMock, *mount.MountMock, *metadata.MetadataMock) {
d := NewDriver(&DriverOpts{Endpoint: FakeEndpoint, ClusterID: FakeCluster, WithTopology: true})
- osmock := new(openstack.OpenStackMock)
- openstack.OsInstances = map[string]openstack.IOpenStack{
- "": osmock,
+// Init Node Server
+func init() {
+ if fakeNs == nil {
+
+ d := NewDriver(&DriverOpts{Endpoint: FakeEndpoint, ClusterID: FakeCluster, WithTopology: true})
+
+ // mock MountMock
+ mmock = new(mount.MountMock)
+ mount.MInstance = mmock
+
+ metamock = new(metadata.MetadataMock)
+ metadata.MetadataService = metamock
+
+ omock = new(openstack.OpenStackMock)
+ openstack.OsInstances = map[string]openstack.IOpenStack{
+ "": omock,
+ }
+
+ fakeNs = NewNodeServer(d, mount.MInstance, metadata.MetadataService, openstack.OsInstances[""], map[string]string{})
}
mmock := new(mount.MountMock)
diff --git a/pkg/csi/cinder/openstack/noop_openstack.go b/pkg/csi/cinder/openstack/noop_openstack.go
new file mode 100644
index 0000000000..c2f563c0b2
--- /dev/null
+++ b/pkg/csi/cinder/openstack/noop_openstack.go
@@ -0,0 +1,144 @@
+/*
+Copyright 2024 The Kubernetes 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 openstack
+
+import (
+ "fmt"
+
+ "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/backups"
+ "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/snapshots"
+ "github.com/gophercloud/gophercloud/v2/openstack/blockstorage/v3/volumes"
+ "github.com/gophercloud/gophercloud/v2/openstack/compute/v2/servers"
+ "k8s.io/cloud-provider-openstack/pkg/util/metadata"
+)
+
+type NoopOpenStack struct {
+ bsOpts BlockStorageOpts
+ metadataOpts metadata.Opts
+}
+
+func (os *NoopOpenStack) CreateVolume(name string, size int, vtype, availability string, snapshotID string, sourceVolID string, sourceBackupID string, tags map[string]string) (*volumes.Volume, error) {
+ return nil, fmt.Errorf("CreateVolume is not implemented for ephemeral storage in this configuration")
+}
+
+func (os *NoopOpenStack) ListVolumes(limit int, startingToken string) ([]volumes.Volume, string, error) {
+ return nil, "", nil
+}
+
+func (os *NoopOpenStack) GetVolumesByName(n string) ([]volumes.Volume, error) {
+ return nil, nil
+}
+
+func (os *NoopOpenStack) DeleteVolume(volumeID string) error {
+ return nil
+}
+
+func (os *NoopOpenStack) GetVolume(volumeID string) (*volumes.Volume, error) {
+ return &volumes.Volume{ID: volumeID}, nil
+}
+
+func (os *NoopOpenStack) AttachVolume(instanceID, volumeID string) (string, error) {
+ return volumeID, nil
+}
+
+func (os *NoopOpenStack) WaitDiskAttached(instanceID string, volumeID string) error {
+ return nil
+}
+
+func (os *NoopOpenStack) WaitVolumeTargetStatus(volumeID string, tStatus []string) error {
+ return nil
+}
+
+func (os *NoopOpenStack) DetachVolume(instanceID, volumeID string) error {
+ return nil
+}
+
+func (os *NoopOpenStack) WaitDiskDetached(instanceID string, volumeID string) error {
+ return nil
+}
+
+func (os *NoopOpenStack) GetAttachmentDiskPath(instanceID, volumeID string) (string, error) {
+ return "", nil
+}
+
+func (os *NoopOpenStack) ExpandVolume(volumeID string, status string, newSize int) error {
+ return nil
+}
+
+func (os *NoopOpenStack) GetMaxVolLimit() int64 {
+ if os.bsOpts.NodeVolumeAttachLimit > 0 && os.bsOpts.NodeVolumeAttachLimit <= 256 {
+ return os.bsOpts.NodeVolumeAttachLimit
+ }
+
+ return defaultMaxVolAttachLimit
+}
+
+func (os *NoopOpenStack) GetBlockStorageOpts() BlockStorageOpts {
+ return os.bsOpts
+}
+
+func (os *NoopOpenStack) GetMetadataOpts() metadata.Opts {
+ return os.metadataOpts
+}
+
+func (os *NoopOpenStack) CreateBackup(name, volID, snapshotID, availabilityZone string, tags map[string]string) (*backups.Backup, error) {
+ return &backups.Backup{}, nil
+}
+
+func (os *NoopOpenStack) BackupsAreEnabled() (bool, error) {
+ return false, nil
+}
+
+func (os *NoopOpenStack) DeleteBackup(backupID string) error {
+ return nil
+}
+
+func (os *NoopOpenStack) CreateSnapshot(name, volID string, tags map[string]string) (*snapshots.Snapshot, error) {
+ return &snapshots.Snapshot{}, nil
+}
+
+func (os *NoopOpenStack) DeleteSnapshot(snapID string) error {
+ return nil
+}
+
+func (os *NoopOpenStack) GetSnapshotByID(snapshotID string) (*snapshots.Snapshot, error) {
+ return &snapshots.Snapshot{ID: snapshotID}, nil
+}
+
+func (os *NoopOpenStack) ListSnapshots(filters map[string]string) ([]snapshots.Snapshot, string, error) {
+ return nil, "", nil
+}
+
+func (os *NoopOpenStack) WaitSnapshotReady(snapshotID string) (string, error) {
+ return "", nil
+}
+
+func (os *NoopOpenStack) GetBackupByID(backupID string) (*backups.Backup, error) {
+ return &backups.Backup{ID: backupID}, nil
+}
+
+func (os *NoopOpenStack) ListBackups(filters map[string]string) ([]backups.Backup, error) {
+ return nil, nil
+}
+
+func (os *NoopOpenStack) WaitBackupReady(backupID string, snapshotSize int, backupMaxDurationSecondsPerGB int) (string, error) {
+ return "", nil
+}
+
+func (os *NoopOpenStack) GetInstanceByID(instanceID string) (*servers.Server, error) {
+ return &servers.Server{ID: instanceID}, nil
+}
diff --git a/pkg/csi/cinder/openstack/openstack.go b/pkg/csi/cinder/openstack/openstack.go
index 7402a61fbb..e24f5bb3e8 100644
--- a/pkg/csi/cinder/openstack/openstack.go
+++ b/pkg/csi/cinder/openstack/openstack.go
@@ -146,13 +146,13 @@ func GetConfigFromFiles(configFilePaths []string) (Config, error) {
const defaultMaxVolAttachLimit int64 = 256
-var (
- OsInstances map[string]IOpenStack
- configFiles = []string{"/etc/cloud.conf"}
-)
+var OsInstances map[string]IOpenStack
+var NoopInstances map[string]IOpenStack
+var configFiles = []string{"/etc/cloud.conf"}
func InitOpenStackProvider(cfgFiles []string, httpEndpoint string) {
OsInstances = make(map[string]IOpenStack)
+ NoopInstances = make(map[string]IOpenStack)
metrics.RegisterMetrics("cinder-csi")
if httpEndpoint != "" {
mux := http.NewServeMux()
@@ -171,7 +171,7 @@ func InitOpenStackProvider(cfgFiles []string, httpEndpoint string) {
}
// CreateOpenStackProvider creates Openstack Instance with custom Global config param
-func CreateOpenStackProvider(cloudName string) (IOpenStack, error) {
+func CreateOpenStackProvider(cloudName string, noClient bool) (IOpenStack, error) {
// Get config from file
cfg, err := GetConfigFromFiles(configFiles)
if err != nil {
@@ -180,7 +180,7 @@ func CreateOpenStackProvider(cloudName string) (IOpenStack, error) {
}
logcfg(cfg)
global := cfg.Global[cloudName]
- if global == nil {
+ if global == nil && !noClient {
return nil, fmt.Errorf("GetConfigFromFiles cloud name \"%s\" not found in configuration files: %s", cloudName, configFiles)
}
@@ -189,6 +189,16 @@ func CreateOpenStackProvider(cloudName string) (IOpenStack, error) {
cfg.Metadata.SearchOrder = fmt.Sprintf("%s,%s", metadata.ConfigDriveID, metadata.MetadataID)
}
+ if noClient {
+ // Init OpenStack
+ NoopInstances[cloudName] = &NoopOpenStack{
+ bsOpts: cfg.BlockStorage,
+ metadataOpts: cfg.Metadata,
+ }
+
+ return NoopInstances[cloudName], nil
+ }
+
provider, err := client.NewOpenStackClient(global, "cinder-csi-plugin", userAgentData...)
if err != nil {
return nil, err
@@ -224,12 +234,25 @@ func CreateOpenStackProvider(cloudName string) (IOpenStack, error) {
}
// GetOpenStackProvider returns Openstack Instance
-func GetOpenStackProvider(cloudName string) (IOpenStack, error) {
+func GetOpenStackProvider(cloudName string, noClient bool) (IOpenStack, error) {
+ if noClient {
+ NoopInstance, NoopInstanceDefined := NoopInstances[cloudName]
+ if NoopInstanceDefined {
+ return NoopInstance, nil
+ }
+ NoopInstance, err := CreateOpenStackProvider(cloudName, noClient)
+ if err != nil {
+ return nil, err
+ }
+
+ return NoopInstance, nil
+ }
+
OsInstance, OsInstanceDefined := OsInstances[cloudName]
if OsInstanceDefined {
return OsInstance, nil
}
- OsInstance, err := CreateOpenStackProvider(cloudName)
+ OsInstance, err := CreateOpenStackProvider(cloudName, noClient)
if err != nil {
return nil, err
}
diff --git a/pkg/csi/cinder/openstack/openstack_volumes.go b/pkg/csi/cinder/openstack/openstack_volumes.go
index 41499b77cf..3c9a351474 100644
--- a/pkg/csi/cinder/openstack/openstack_volumes.go
+++ b/pkg/csi/cinder/openstack/openstack_volumes.go
@@ -91,7 +91,7 @@ func (os *OpenStack) ListVolumes(ctx context.Context, limit int, startingToken s
mc := metrics.NewMetricContext("volume", "list")
if limit == 0 {
- page, err := volumes.List(os.blockstorage, nil).AllPages(ctx)
+ page, err := volumes.List(os.blockstorage, nil).AllPages(context.TODO())
if err != nil {
return nil, "", err
}
@@ -100,7 +100,7 @@ func (os *OpenStack) ListVolumes(ctx context.Context, limit int, startingToken s
}
opts := volumes.ListOpts{Limit: limit, Marker: startingToken}
- err := volumes.List(os.blockstorage, opts).EachPage(ctx, func(_ context.Context, page pagination.Page) (bool, error) {
+ err := volumes.List(os.blockstorage, opts).EachPage(context.TODO(), func(_ context.Context, page pagination.Page) (bool, error) {
var err error
vols, err = volumes.ExtractVolumes(page)
diff --git a/pkg/identity/keystone/keystone.go b/pkg/identity/keystone/keystone.go
index 480a77c827..6345d636bd 100644
--- a/pkg/identity/keystone/keystone.go
+++ b/pkg/identity/keystone/keystone.go
@@ -286,7 +286,7 @@ func (k *Auth) Handler(w http.ResponseWriter, r *http.Request) {
func (k *Auth) authenticateToken(ctx context.Context, w http.ResponseWriter, r *http.Request, token string, data map[string]interface{}) *userInfo {
user, authenticated, err := k.authn.AuthenticateToken(ctx, token)
- klog.V(4).Infof("authenticateToken : %v, %v, %v\n", token, user, err)
+ klog.V(4).Infof("authenticateToken : %v, %v\n", user, err)
if !authenticated {
var response status
diff --git a/pkg/openstack/events.go b/pkg/openstack/events.go
index 8996cafd2f..60dd5cc649 100644
--- a/pkg/openstack/events.go
+++ b/pkg/openstack/events.go
@@ -23,5 +23,4 @@ const (
eventLBAZIgnored = "LoadBalancerAvailabilityZonesIgnored"
eventLBFloatingIPSkipped = "LoadBalancerFloatingIPSkipped"
eventLBRename = "LoadBalancerRename"
- eventLBLbMethodUnknown = "LoadBalancerLbMethodUnknown"
)
diff --git a/pkg/openstack/instances.go b/pkg/openstack/instances.go
index f9b617736f..81edb97f75 100644
--- a/pkg/openstack/instances.go
+++ b/pkg/openstack/instances.go
@@ -208,7 +208,7 @@ func getServerByName(ctx context.Context, client *gophercloud.ServiceClient, nam
}
if len(serverList) == 0 {
- return nil, errors.ErrNotFound
+ return nil, cloudprovider.InstanceNotFound
}
return &serverList[0], nil
diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go
index c67ba1f1b4..157669a303 100644
--- a/pkg/openstack/loadbalancer.go
+++ b/pkg/openstack/loadbalancer.go
@@ -1339,7 +1339,7 @@ func (lbaas *LbaasV2) checkServiceUpdate(ctx context.Context, service *corev1.Se
}
}
}
- return lbaas.makeSvcConf(ctx, serviceName, service, svcConf)
+ return lbaas.makeSvcConf(serviceName, service, svcConf)
}
func (lbaas *LbaasV2) checkServiceDelete(ctx context.Context, service *corev1.Service, svcConf *serviceConfig) error {
@@ -1534,14 +1534,13 @@ func (lbaas *LbaasV2) checkService(ctx context.Context, service *corev1.Service,
} else {
klog.V(4).Infof("Ensure an internal loadbalancer service.")
}
- return lbaas.makeSvcConf(ctx, serviceName, service, svcConf)
+ return lbaas.makeSvcConf(serviceName, service, svcConf)
}
-func (lbaas *LbaasV2) makeSvcConf(ctx context.Context, serviceName string, service *corev1.Service, svcConf *serviceConfig) error {
+func (lbaas *LbaasV2) makeSvcConf(serviceName string, service *corev1.Service, svcConf *serviceConfig) error {
svcConf.connLimit = getIntFromServiceAnnotation(service, ServiceAnnotationLoadBalancerConnLimit, -1)
svcConf.lbID = getStringFromServiceAnnotation(service, ServiceAnnotationLoadBalancerID, "")
- svcConf.poolLbMethod = getStringFromServiceAnnotation(service, ServiceAnnotationLoadBalancerLbMethod, "")
- svcConf.supportLBTags = openstackutil.IsOctaviaFeatureSupported(ctx, lbaas.lb, openstackutil.OctaviaFeatureTags, lbaas.opts.LBProvider)
+ svcConf.supportLBTags = openstackutil.IsOctaviaFeatureSupported(lbaas.lb, openstackutil.OctaviaFeatureTags, lbaas.opts.LBProvider)
// Get service node-selector annotations
svcConf.nodeSelectors = getKeyValueFromServiceAnnotation(service, ServiceAnnotationLoadBalancerNodeSelector, lbaas.opts.NodeSelector)
@@ -1628,10 +1627,10 @@ func (lbaas *LbaasV2) checkListenerPorts(service *corev1.Service, curListenerMap
}
func (lbaas *LbaasV2) updateServiceAnnotation(service *corev1.Service, key, value string) {
- if service.Annotations == nil {
- service.Annotations = map[string]string{}
+ if service.ObjectMeta.Annotations == nil {
+ service.ObjectMeta.Annotations = map[string]string{}
}
- service.Annotations[key] = value
+ service.ObjectMeta.Annotations[key] = value
}
// createLoadBalancerStatus creates the loadbalancer status from the different possible sources
@@ -1699,9 +1698,9 @@ func (lbaas *LbaasV2) ensureOctaviaLoadBalancer(ctx context.Context, clusterName
msg := "Loadbalancer %s has a name of %s with incorrect cluster-name component. Renaming it to %s."
klog.Infof(msg, loadbalancer.ID, loadbalancer.Name, lbName)
lbaas.eventRecorder.Eventf(service, corev1.EventTypeWarning, eventLBRename, msg, loadbalancer.ID, loadbalancer.Name, lbName)
- loadbalancer, err = renameLoadBalancer(ctx, lbaas.lb, loadbalancer, lbName, clusterName)
+ loadbalancer, err = renameLoadBalancer(lbaas.lb, loadbalancer, lbName, clusterName)
if err != nil {
- return nil, fmt.Errorf("failed to update load balancer %s with an updated name: %w", svcConf.lbID, err)
+ return nil, fmt.Errorf("failed to update load balancer %s with an updated name", svcConf.lbID)
}
}
@@ -1743,7 +1742,7 @@ func (lbaas *LbaasV2) ensureOctaviaLoadBalancer(ctx context.Context, clusterName
return nil, fmt.Errorf("error getting loadbalancer for Service %s: %v", serviceName, err)
}
klog.InfoS("Creating loadbalancer", "lbName", lbName, "service", klog.KObj(service))
- loadbalancer, err = lbaas.createOctaviaLoadBalancer(ctx, lbName, clusterName, service, filteredNodes, svcConf)
+ loadbalancer, err = lbaas.createOctaviaLoadBalancer(lbName, clusterName, service, filteredNodes, svcConf)
if err != nil {
return nil, fmt.Errorf("error creating loadbalancer %s: %v", lbName, err)
}
@@ -1789,7 +1788,7 @@ func (lbaas *LbaasV2) ensureOctaviaLoadBalancer(ctx context.Context, clusterName
return nil, err
}
- pool, err := lbaas.ensureOctaviaPool(ctx, loadbalancer.ID, cpoutil.Sprintf255(poolFormat, portIndex, lbName), listener, service, port, filteredNodes, svcConf)
+ pool, err := lbaas.ensureOctaviaPool(loadbalancer.ID, cpoutil.Sprintf255(poolFormat, portIndex, lbName), listener, service, port, filteredNodes, svcConf)
if err != nil {
return nil, err
}
@@ -1817,7 +1816,7 @@ func (lbaas *LbaasV2) ensureOctaviaLoadBalancer(ctx context.Context, clusterName
lbaas.eventRecorder.Eventf(service, corev1.EventTypeWarning, eventLBFloatingIPSkipped, msg, serviceName, addr)
klog.Infof(msg, serviceName, addr)
} else {
- addr, err = lbaas.ensureFloatingIP(ctx, clusterName, service, loadbalancer, svcConf, isLBOwner)
+ addr, err = lbaas.ensureFloatingIP(clusterName, service, loadbalancer, svcConf, isLBOwner)
if err != nil {
return nil, err
}
@@ -1842,7 +1841,7 @@ func (lbaas *LbaasV2) ensureOctaviaLoadBalancer(ctx context.Context, clusterName
status := lbaas.createLoadBalancerStatus(service, svcConf, addr)
if lbaas.opts.ManageSecurityGroups {
- err := lbaas.ensureAndUpdateOctaviaSecurityGroup(ctx, clusterName, service, filteredNodes, svcConf)
+ err := lbaas.ensureAndUpdateOctaviaSecurityGroup(clusterName, service, filteredNodes, svcConf)
if err != nil {
return status, fmt.Errorf("failed when reconciling security groups for LB service %v/%v: %v", service.Namespace, service.Name, err)
}
@@ -1946,7 +1945,7 @@ func (lbaas *LbaasV2) updateOctaviaLoadBalancer(ctx context.Context, clusterName
return fmt.Errorf("loadbalancer %s does not contain required listener for port %d and protocol %s", loadbalancer.ID, port.Port, port.Protocol)
}
- pool, err := lbaas.ensureOctaviaPool(ctx, loadbalancer.ID, cpoutil.Sprintf255(poolFormat, portIndex, loadbalancer.Name), &listener, service, port, filteredNodes, svcConf)
+ pool, err := lbaas.ensureOctaviaPool(loadbalancer.ID, cpoutil.Sprintf255(poolFormat, portIndex, loadbalancer.Name), &listener, service, port, filteredNodes, svcConf)
if err != nil {
return err
}
@@ -1958,7 +1957,7 @@ func (lbaas *LbaasV2) updateOctaviaLoadBalancer(ctx context.Context, clusterName
}
if lbaas.opts.ManageSecurityGroups {
- err := lbaas.ensureAndUpdateOctaviaSecurityGroup(ctx, clusterName, service, filteredNodes, svcConf)
+ err := lbaas.ensureAndUpdateOctaviaSecurityGroup(clusterName, service, filteredNodes, svcConf)
if err != nil {
return fmt.Errorf("failed to update Security Group for loadbalancer service %s: %v", serviceName, err)
}
diff --git a/pkg/openstack/loadbalancer_rename.go b/pkg/openstack/loadbalancer_rename.go
index 8adda9a791..eab867d507 100644
--- a/pkg/openstack/loadbalancer_rename.go
+++ b/pkg/openstack/loadbalancer_rename.go
@@ -17,18 +17,17 @@ limitations under the License.
package openstack
import (
- "context"
"fmt"
+ "k8s.io/cloud-provider-openstack/pkg/util"
"regexp"
"strings"
- "k8s.io/cloud-provider-openstack/pkg/util"
+ "github.com/gophercloud/gophercloud"
- "github.com/gophercloud/gophercloud/v2"
- "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/listeners"
- "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/loadbalancers"
- "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/monitors"
- "github.com/gophercloud/gophercloud/v2/openstack/loadbalancer/v2/pools"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
openstackutil "k8s.io/cloud-provider-openstack/pkg/util/openstack"
)
@@ -77,8 +76,8 @@ func replaceClusterName(oldClusterName, clusterName, objectName string) string {
// renameLoadBalancer renames all the children and then the LB itself to match new lbName.
// The purpose is handling a change of clusterName.
-func renameLoadBalancer(ctx context.Context, client *gophercloud.ServiceClient, loadbalancer *loadbalancers.LoadBalancer, lbName, clusterName string) (*loadbalancers.LoadBalancer, error) {
- lbListeners, err := openstackutil.GetListenersByLoadBalancerID(ctx, client, loadbalancer.ID)
+func renameLoadBalancer(client *gophercloud.ServiceClient, loadbalancer *loadbalancers.LoadBalancer, lbName, clusterName string) (*loadbalancers.LoadBalancer, error) {
+ lbListeners, err := openstackutil.GetListenersByLoadBalancerID(client, loadbalancer.ID)
if err != nil {
return nil, err
}
@@ -92,7 +91,7 @@ func renameLoadBalancer(ctx context.Context, client *gophercloud.ServiceClient,
if oldClusterName != clusterName {
// First let's handle pool which we assume is a child of the listener. Only one pool per one listener.
- lbPool, err := openstackutil.GetPoolByListener(ctx, client, loadbalancer.ID, listener.ID)
+ lbPool, err := openstackutil.GetPoolByListener(client, loadbalancer.ID, listener.ID)
if err != nil {
return nil, err
}
@@ -100,14 +99,14 @@ func renameLoadBalancer(ctx context.Context, client *gophercloud.ServiceClient,
if oldClusterName != clusterName {
if lbPool.MonitorID != "" {
// If monitor exists, let's handle it first, as we treat it as child of the pool.
- monitor, err := openstackutil.GetHealthMonitor(ctx, client, lbPool.MonitorID)
+ monitor, err := openstackutil.GetHealthMonitor(client, lbPool.MonitorID)
if err != nil {
return nil, err
}
oldClusterName := getClusterName(fmt.Sprintf("%s[0-9]+_", monitorPrefix), monitor.Name)
if oldClusterName != clusterName {
monitor.Name = replaceClusterName(oldClusterName, clusterName, monitor.Name)
- err = openstackutil.UpdateHealthMonitor(ctx, client, monitor.ID, monitors.UpdateOpts{Name: &monitor.Name}, loadbalancer.ID)
+ err = openstackutil.UpdateHealthMonitor(client, monitor.ID, monitors.UpdateOpts{Name: &monitor.Name}, loadbalancer.ID)
if err != nil {
return nil, err
}
@@ -116,7 +115,7 @@ func renameLoadBalancer(ctx context.Context, client *gophercloud.ServiceClient,
// Monitor is handled, let's rename the pool.
lbPool.Name = replaceClusterName(oldClusterName, clusterName, lbPool.Name)
- err = openstackutil.UpdatePool(ctx, client, loadbalancer.ID, lbPool.ID, pools.UpdateOpts{Name: &lbPool.Name})
+ err = openstackutil.UpdatePool(client, loadbalancer.ID, lbPool.ID, pools.UpdateOpts{Name: &lbPool.Name})
if err != nil {
return nil, err
}
@@ -130,7 +129,7 @@ func renameLoadBalancer(ctx context.Context, client *gophercloud.ServiceClient,
}
}
listener.Name = replaceClusterName(oldClusterName, clusterName, listener.Name)
- err = openstackutil.UpdateListener(ctx, client, loadbalancer.ID, listener.ID, listeners.UpdateOpts{Name: &listener.Name, Tags: &listener.Tags})
+ err = openstackutil.UpdateListener(client, loadbalancer.ID, listener.ID, listeners.UpdateOpts{Name: &listener.Name, Tags: &listener.Tags})
if err != nil {
return nil, err
}
@@ -146,5 +145,5 @@ func renameLoadBalancer(ctx context.Context, client *gophercloud.ServiceClient,
loadbalancer.Tags[i] = replaceClusterName(oldClusterNameTag, clusterName, tag)
}
}
- return openstackutil.UpdateLoadBalancer(ctx, client, loadbalancer.ID, loadbalancers.UpdateOpts{Name: &lbName, Tags: &loadbalancer.Tags})
+ return openstackutil.UpdateLoadBalancer(client, loadbalancer.ID, loadbalancers.UpdateOpts{Name: &lbName, Tags: &loadbalancer.Tags})
}
diff --git a/pkg/openstack/loadbalancer_rename_test.go b/pkg/openstack/loadbalancer_rename_test.go
index 3e2a751fea..3e9f85cb13 100644
--- a/pkg/openstack/loadbalancer_rename_test.go
+++ b/pkg/openstack/loadbalancer_rename_test.go
@@ -17,11 +17,10 @@ limitations under the License.
package openstack
import (
+ "k8s.io/cloud-provider-openstack/pkg/util"
"strings"
"testing"
- "k8s.io/cloud-provider-openstack/pkg/util"
-
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/openstack/loadbalancer_test.go b/pkg/openstack/loadbalancer_test.go
index 27304a45ad..cb1e5fc7e6 100644
--- a/pkg/openstack/loadbalancer_test.go
+++ b/pkg/openstack/loadbalancer_test.go
@@ -2607,71 +2607,3 @@ func TestFilterNodes(t *testing.T) {
})
}
}
-
-func Test_getProxyProtocolFromServiceAnnotation(t *testing.T) {
- type args struct {
- service *corev1.Service
- }
- tests := []struct {
- name string
- args args
- want *pools.Protocol
- }{
- {
- name: "no proxy protocol",
- args: args{service: &corev1.Service{
- ObjectMeta: v1.ObjectMeta{
- Annotations: map[string]string{ServiceAnnotationLoadBalancerProxyEnabled: "false"},
- },
- }},
- want: nil,
- },
- {
- name: "proxy protocol true",
- args: args{service: &corev1.Service{
- ObjectMeta: v1.ObjectMeta{
- Annotations: map[string]string{ServiceAnnotationLoadBalancerProxyEnabled: "true"},
- },
- }},
- want: ptr.To(pools.ProtocolPROXY),
- },
- {
- name: "proxy protocol v1",
- args: args{service: &corev1.Service{
- ObjectMeta: v1.ObjectMeta{
- Annotations: map[string]string{ServiceAnnotationLoadBalancerProxyEnabled: "v1"},
- },
- }},
- want: ptr.To(pools.ProtocolPROXY),
- },
- {
- name: "proxy protocol v2",
- args: args{service: &corev1.Service{
- ObjectMeta: v1.ObjectMeta{
- Annotations: map[string]string{ServiceAnnotationLoadBalancerProxyEnabled: "v2"},
- },
- }},
- want: ptr.To(pools.ProtocolPROXYV2),
- },
- {
- name: "no proxy protocol annotation",
- args: args{service: &corev1.Service{}},
- want: nil,
- },
- {
- name: "unknown proxy protocol annotation's value",
- args: args{service: &corev1.Service{
- ObjectMeta: v1.ObjectMeta{
- Annotations: map[string]string{ServiceAnnotationLoadBalancerProxyEnabled: "not valid value"},
- },
- }},
- want: nil,
- },
- }
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- got := getProxyProtocolFromServiceAnnotation(tt.args.service)
- assert.Equalf(t, tt.want, got, "getProxyProtocolFromServiceAnnotation(%v)", tt.args.service)
- })
- }
-}
diff --git a/pkg/util/blockdevice/blockdevice_linux.go b/pkg/util/blockdevice/blockdevice_linux.go
index 237474db0b..f9c8bdf02b 100644
--- a/pkg/util/blockdevice/blockdevice_linux.go
+++ b/pkg/util/blockdevice/blockdevice_linux.go
@@ -128,13 +128,13 @@ func RescanBlockDeviceGeometry(devicePath string, deviceMountPath string, newSiz
func RescanDevice(devicePath string) error {
blockDeviceRescanPath, err := findBlockDeviceRescanPath(devicePath)
if err != nil {
- return fmt.Errorf("device does not have rescan path %s", devicePath)
+ return fmt.Errorf("Device does not have rescan path %s", devicePath)
}
klog.V(3).Infof("Resolved block device path from %q to %q", devicePath, blockDeviceRescanPath)
err = triggerRescan(blockDeviceRescanPath)
if err != nil {
- return fmt.Errorf("error rescanning new block device geometry %s", devicePath)
+ return fmt.Errorf("Error rescanning new block device geometry %s", devicePath)
}
return nil
}
diff --git a/pkg/util/openstack/loadbalancer.go b/pkg/util/openstack/loadbalancer.go
index a9225fff44..c284440f30 100644
--- a/pkg/util/openstack/loadbalancer.go
+++ b/pkg/util/openstack/loadbalancer.go
@@ -257,11 +257,27 @@ func UpdateLoadBalancerTags(ctx context.Context, client *gophercloud.ServiceClie
Tags: &tags,
}
- _, err := UpdateLoadBalancer(ctx, client, lbID, updateOpts)
+ _, err := UpdateLoadBalancer(client, lbID, updateOpts)
return err
}
+// UpdateLoadBalancer updates the load balancer
+func UpdateLoadBalancer(client *gophercloud.ServiceClient, lbID string, updateOpts loadbalancers.UpdateOpts) (*loadbalancers.LoadBalancer, error) {
+ mc := metrics.NewMetricContext("loadbalancer", "update")
+ _, err := loadbalancers.Update(client, lbID, updateOpts).Extract()
+ if mc.ObserveRequest(err) != nil {
+ return nil, err
+ }
+
+ lb, err := WaitActiveAndGetLoadBalancer(client, lbID)
+ if err != nil {
+ return nil, fmt.Errorf("failed to wait for load balancer %s ACTIVE after updating: %v", lbID, err)
+ }
+
+ return lb, nil
+}
+
// UpdateLoadBalancer updates the load balancer
func UpdateLoadBalancer(ctx context.Context, client *gophercloud.ServiceClient, lbID string, updateOpts loadbalancers.UpdateOpts) (*loadbalancers.LoadBalancer, error) {
mc := metrics.NewMetricContext("loadbalancer", "update")
@@ -557,14 +573,14 @@ func GetMembersbyPool(ctx context.Context, client *gophercloud.ServiceClient, po
}
// UpdatePool updates a pool and wait for the lb active
-func UpdatePool(ctx context.Context, client *gophercloud.ServiceClient, lbID string, poolID string, opts pools.UpdateOpts) error {
+func UpdatePool(client *gophercloud.ServiceClient, lbID string, poolID string, opts pools.UpdateOpts) error {
mc := metrics.NewMetricContext("loadbalancer_pool", "update")
- _, err := pools.Update(ctx, client, poolID, opts).Extract()
+ _, err := pools.Update(client, poolID, opts).Extract()
if mc.ObserveRequest(err) != nil {
return err
}
- if _, err := WaitActiveAndGetLoadBalancer(ctx, client, lbID); err != nil {
+ if _, err := WaitActiveAndGetLoadBalancer(client, lbID); err != nil {
return fmt.Errorf("failed to wait for load balancer %s ACTIVE after updating pool: %v", lbID, err)
}
diff --git a/pkg/util/util.go b/pkg/util/util.go
index 3497f8189e..656b7c8b08 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
- "regexp"
"strings"
"time"
"unicode"
@@ -94,6 +93,56 @@ func StringToMap(str string) map[string]string {
return keyValues
}
+// StringToMap converts a string of comma-separated key-values into a map
+func StringToMap(str string) map[string]string {
+ // break up a "key1=val,key2=val2,key3=,key4" string into a list
+ values := strings.Split(strings.TrimSpace(str), ",")
+ keyValues := make(map[string]string, len(values))
+
+ for _, kv := range values {
+ kv := strings.SplitN(strings.TrimSpace(kv), "=", 2)
+
+ k := kv[0]
+ if len(kv) == 1 {
+ if k != "" {
+ // process "key=" or "key"
+ keyValues[k] = ""
+ }
+ continue
+ }
+
+ // process "key=val" or "key=val=foo"
+ keyValues[k] = kv[1]
+ }
+
+ return keyValues
+}
+
+// StringToMap converts a string of comma-separated key-values into a map
+func StringToMap(str string) map[string]string {
+ // break up a "key1=val,key2=val2,key3=,key4" string into a list
+ values := strings.Split(strings.TrimSpace(str), ",")
+ keyValues := make(map[string]string, len(values))
+
+ for _, kv := range values {
+ kv := strings.SplitN(strings.TrimSpace(kv), "=", 2)
+
+ k := kv[0]
+ if len(kv) == 1 {
+ if k != "" {
+ // process "key=" or "key"
+ keyValues[k] = ""
+ }
+ continue
+ }
+
+ // process "key=val" or "key=val=foo"
+ keyValues[k] = kv[1]
+ }
+
+ return keyValues
+}
+
// RoundUpSize calculates how many allocation units are needed to accommodate
// a volume of given size. E.g. when user wants 1500MiB volume, while AWS EBS
// allocates volumes in gibibyte-sized chunks,
diff --git a/tests/playbooks/roles/install-csi-cinder/tasks/main.yaml b/tests/playbooks/roles/install-csi-cinder/tasks/main.yaml
index d7514faa94..788a178dfa 100644
--- a/tests/playbooks/roles/install-csi-cinder/tasks/main.yaml
+++ b/tests/playbooks/roles/install-csi-cinder/tasks/main.yaml
@@ -159,16 +159,6 @@
kubectl -n kube-system logs ds/openstack-cloud-controller-manager > /var/log/csi-pod/occm.log
- - name: Collect pod logs for debug purpose (early collection on deployment failure)
- shell:
- executable: /bin/bash
- cmd: |
- set -x
- mkdir -p /var/log/csi-pod
- kubectl logs deployment/csi-cinder-controllerplugin -n kube-system -c cinder-csi-plugin > /var/log/csi-pod/deployment-csi-cinder-controllerplugin.log
- kubectl logs daemonset/csi-cinder-nodeplugin -n kube-system -c cinder-csi-plugin > /var/log/csi-pod/deployment-csi-cinder-nodeplugin.log
- ignore_errors: true
-
- name: &failmsg Stop due to prior failure of csi-cinder-plugin
fail:
msg: *failmsg
diff --git a/tests/playbooks/roles/install-devstack/defaults/main.yaml b/tests/playbooks/roles/install-devstack/defaults/main.yaml
index 7b2c47404f..aeca584500 100644
--- a/tests/playbooks/roles/install-devstack/defaults/main.yaml
+++ b/tests/playbooks/roles/install-devstack/defaults/main.yaml
@@ -1,7 +1,7 @@
---
user: "stack"
workdir: "/home/{{ user }}/devstack"
-branch: "stable/2025.2"
+branch: "stable/2023.2"
enable_services:
- nova
- glance
diff --git a/tests/playbooks/roles/install-devstack/templates/local.conf.j2 b/tests/playbooks/roles/install-devstack/templates/local.conf.j2
index e54564412c..be1da5b2b4 100644
--- a/tests/playbooks/roles/install-devstack/templates/local.conf.j2
+++ b/tests/playbooks/roles/install-devstack/templates/local.conf.j2
@@ -148,16 +148,6 @@ if [ -f /opt/stack/data/venv/bin/activate ]; then
deactivate
fi
-{% if "nova" in enable_services %}
-[[post-config|$NOVA_CONF]]
-[libvirt]
-# Workaround for nova bug #2119114. Until that bug is resolved, Nova will
-# always timeout when detaching volumes (which affects deletion of PVCs)
-#
-# https://bugs.launchpad.net/nova/+bug/2119114
-device_detach_timeout = 1
-{% endif %}
-
{% if "glance" in enable_services %}
[[post-config|$GLANCE_API_CONF]]
[glance_store]
diff --git a/tests/playbooks/roles/install-k3s/defaults/main.yaml b/tests/playbooks/roles/install-k3s/defaults/main.yaml
index aa5632d3d7..7e2ab5f7e2 100644
--- a/tests/playbooks/roles/install-k3s/defaults/main.yaml
+++ b/tests/playbooks/roles/install-k3s/defaults/main.yaml
@@ -1,5 +1,5 @@
---
-k3s_release: v1.34.1+k3s1
+k3s_release: v1.31.5+k3s1
worker_node_count: 1
cluster_token: "K1039d1cf76d1f8b0e8b0d48e7c60d9c4a43c2e7a56de5d86f346f2288a2677f1d7::server:2acba4e60918c0e2d1f1d1a7c4e81e7b"
devstack_workdir: "{{ ansible_user_dir }}/devstack"
diff --git a/tests/playbooks/test-csi-cinder-e2e.yaml b/tests/playbooks/test-csi-cinder-e2e.yaml
index e30ab85851..54c30ecce1 100644
--- a/tests/playbooks/test-csi-cinder-e2e.yaml
+++ b/tests/playbooks/test-csi-cinder-e2e.yaml
@@ -4,7 +4,7 @@
gather_facts: true
vars:
- e2e_test_version: v1.34.1
+ e2e_test_version: v1.31.3
user: stack
devstack_workdir: /home/{{ user }}/devstack
diff --git a/tests/scripts/create-gce-vm.sh b/tests/scripts/create-gce-vm.sh
index 9f861e665b..462aba6268 100755
--- a/tests/scripts/create-gce-vm.sh
+++ b/tests/scripts/create-gce-vm.sh
@@ -94,7 +94,7 @@ main() {
local disk_name="devstack-${FLAVOR}-ubuntu2404"
if ! gcloud compute disks describe "${disk_name}" --zone "${GCP_ZONE}" > /dev/null 2>&1;
then
- gcloud compute disks create "${disk_name}" \
+ gcloud compute disks create devstack-${FLAVOR} \
--image-project ubuntu-os-cloud --image-family ubuntu-2404-lts-amd64 \
--zone "${GCP_ZONE}"
fi
diff --git a/vendor/cel.dev/expr/BUILD.bazel b/vendor/cel.dev/expr/BUILD.bazel
index f5bda3bb17..37d8adc950 100644
--- a/vendor/cel.dev/expr/BUILD.bazel
+++ b/vendor/cel.dev/expr/BUILD.bazel
@@ -16,6 +16,7 @@ go_library(
importpath = "cel.dev/expr",
visibility = ["//visibility:public"],
deps = [
+ "@org_golang_google_genproto_googleapis_rpc//status:go_default_library",
"@org_golang_google_protobuf//reflect/protoreflect",
"@org_golang_google_protobuf//runtime/protoimpl",
"@org_golang_google_protobuf//types/known/anypb",
diff --git a/vendor/cel.dev/expr/MODULE.bazel b/vendor/cel.dev/expr/MODULE.bazel
index cb98ed5991..85ac9ff617 100644
--- a/vendor/cel.dev/expr/MODULE.bazel
+++ b/vendor/cel.dev/expr/MODULE.bazel
@@ -11,9 +11,26 @@ bazel_dep(
version = "0.39.1",
repo_name = "bazel_gazelle",
)
+bazel_dep(
+ name = "googleapis",
+ version = "0.0.0-20241220-5e258e33.bcr.1",
+ repo_name = "com_google_googleapis",
+)
+bazel_dep(
+ name = "googleapis-cc",
+ version = "1.0.0",
+)
+bazel_dep(
+ name = "googleapis-java",
+ version = "1.0.0",
+)
+bazel_dep(
+ name = "googleapis-go",
+ version = "1.0.0",
+)
bazel_dep(
name = "protobuf",
- version = "27.1",
+ version = "27.0",
repo_name = "com_google_protobuf",
)
bazel_dep(
@@ -46,11 +63,12 @@ python.toolchain(
)
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
-go_sdk.download(version = "1.23.0")
+go_sdk.download(version = "1.22.0")
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//:go.mod")
use_repo(
go_deps,
+ "org_golang_google_genproto_googleapis_rpc",
"org_golang_google_protobuf",
)
diff --git a/vendor/cel.dev/expr/checked.pb.go b/vendor/cel.dev/expr/checked.pb.go
index b18085e9b6..bb225c8ab3 100644
--- a/vendor/cel.dev/expr/checked.pb.go
+++ b/vendor/cel.dev/expr/checked.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
-// protoc v5.27.1
+// protoc-gen-go v1.28.1
+// protoc v3.21.5
// source: cel/expr/checked.proto
package expr
@@ -13,7 +13,6 @@ import (
structpb "google.golang.org/protobuf/types/known/structpb"
reflect "reflect"
sync "sync"
- unsafe "unsafe"
)
const (
@@ -137,21 +136,24 @@ func (Type_WellKnownType) EnumDescriptor() ([]byte, []int) {
}
type CheckedExpr struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- ReferenceMap map[int64]*Reference `protobuf:"bytes,2,rep,name=reference_map,json=referenceMap,proto3" json:"reference_map,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- TypeMap map[int64]*Type `protobuf:"bytes,3,rep,name=type_map,json=typeMap,proto3" json:"type_map,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
- SourceInfo *SourceInfo `protobuf:"bytes,5,opt,name=source_info,json=sourceInfo,proto3" json:"source_info,omitempty"`
- ExprVersion string `protobuf:"bytes,6,opt,name=expr_version,json=exprVersion,proto3" json:"expr_version,omitempty"`
- Expr *Expr `protobuf:"bytes,4,opt,name=expr,proto3" json:"expr,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ ReferenceMap map[int64]*Reference `protobuf:"bytes,2,rep,name=reference_map,json=referenceMap,proto3" json:"reference_map,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+ TypeMap map[int64]*Type `protobuf:"bytes,3,rep,name=type_map,json=typeMap,proto3" json:"type_map,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+ SourceInfo *SourceInfo `protobuf:"bytes,5,opt,name=source_info,json=sourceInfo,proto3" json:"source_info,omitempty"`
+ ExprVersion string `protobuf:"bytes,6,opt,name=expr_version,json=exprVersion,proto3" json:"expr_version,omitempty"`
+ Expr *Expr `protobuf:"bytes,4,opt,name=expr,proto3" json:"expr,omitempty"`
}
func (x *CheckedExpr) Reset() {
*x = CheckedExpr{}
- mi := &file_cel_expr_checked_proto_msgTypes[0]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *CheckedExpr) String() string {
@@ -162,7 +164,7 @@ func (*CheckedExpr) ProtoMessage() {}
func (x *CheckedExpr) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[0]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -213,8 +215,11 @@ func (x *CheckedExpr) GetExpr() *Expr {
}
type Type struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // Types that are valid to be assigned to TypeKind:
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ // Types that are assignable to TypeKind:
//
// *Type_Dyn
// *Type_Null
@@ -229,16 +234,16 @@ type Type struct {
// *Type_Type
// *Type_Error
// *Type_AbstractType_
- TypeKind isType_TypeKind `protobuf_oneof:"type_kind"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ TypeKind isType_TypeKind `protobuf_oneof:"type_kind"`
}
func (x *Type) Reset() {
*x = Type{}
- mi := &file_cel_expr_checked_proto_msgTypes[1]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Type) String() string {
@@ -249,7 +254,7 @@ func (*Type) ProtoMessage() {}
func (x *Type) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[1]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -264,126 +269,100 @@ func (*Type) Descriptor() ([]byte, []int) {
return file_cel_expr_checked_proto_rawDescGZIP(), []int{1}
}
-func (x *Type) GetTypeKind() isType_TypeKind {
- if x != nil {
- return x.TypeKind
+func (m *Type) GetTypeKind() isType_TypeKind {
+ if m != nil {
+ return m.TypeKind
}
return nil
}
func (x *Type) GetDyn() *emptypb.Empty {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_Dyn); ok {
- return x.Dyn
- }
+ if x, ok := x.GetTypeKind().(*Type_Dyn); ok {
+ return x.Dyn
}
return nil
}
func (x *Type) GetNull() structpb.NullValue {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_Null); ok {
- return x.Null
- }
+ if x, ok := x.GetTypeKind().(*Type_Null); ok {
+ return x.Null
}
return structpb.NullValue(0)
}
func (x *Type) GetPrimitive() Type_PrimitiveType {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_Primitive); ok {
- return x.Primitive
- }
+ if x, ok := x.GetTypeKind().(*Type_Primitive); ok {
+ return x.Primitive
}
return Type_PRIMITIVE_TYPE_UNSPECIFIED
}
func (x *Type) GetWrapper() Type_PrimitiveType {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_Wrapper); ok {
- return x.Wrapper
- }
+ if x, ok := x.GetTypeKind().(*Type_Wrapper); ok {
+ return x.Wrapper
}
return Type_PRIMITIVE_TYPE_UNSPECIFIED
}
func (x *Type) GetWellKnown() Type_WellKnownType {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_WellKnown); ok {
- return x.WellKnown
- }
+ if x, ok := x.GetTypeKind().(*Type_WellKnown); ok {
+ return x.WellKnown
}
return Type_WELL_KNOWN_TYPE_UNSPECIFIED
}
func (x *Type) GetListType() *Type_ListType {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_ListType_); ok {
- return x.ListType
- }
+ if x, ok := x.GetTypeKind().(*Type_ListType_); ok {
+ return x.ListType
}
return nil
}
func (x *Type) GetMapType() *Type_MapType {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_MapType_); ok {
- return x.MapType
- }
+ if x, ok := x.GetTypeKind().(*Type_MapType_); ok {
+ return x.MapType
}
return nil
}
func (x *Type) GetFunction() *Type_FunctionType {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_Function); ok {
- return x.Function
- }
+ if x, ok := x.GetTypeKind().(*Type_Function); ok {
+ return x.Function
}
return nil
}
func (x *Type) GetMessageType() string {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_MessageType); ok {
- return x.MessageType
- }
+ if x, ok := x.GetTypeKind().(*Type_MessageType); ok {
+ return x.MessageType
}
return ""
}
func (x *Type) GetTypeParam() string {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_TypeParam); ok {
- return x.TypeParam
- }
+ if x, ok := x.GetTypeKind().(*Type_TypeParam); ok {
+ return x.TypeParam
}
return ""
}
func (x *Type) GetType() *Type {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_Type); ok {
- return x.Type
- }
+ if x, ok := x.GetTypeKind().(*Type_Type); ok {
+ return x.Type
}
return nil
}
func (x *Type) GetError() *emptypb.Empty {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_Error); ok {
- return x.Error
- }
+ if x, ok := x.GetTypeKind().(*Type_Error); ok {
+ return x.Error
}
return nil
}
func (x *Type) GetAbstractType() *Type_AbstractType {
- if x != nil {
- if x, ok := x.TypeKind.(*Type_AbstractType_); ok {
- return x.AbstractType
- }
+ if x, ok := x.GetTypeKind().(*Type_AbstractType_); ok {
+ return x.AbstractType
}
return nil
}
@@ -471,22 +450,25 @@ func (*Type_Error) isType_TypeKind() {}
func (*Type_AbstractType_) isType_TypeKind() {}
type Decl struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
- // Types that are valid to be assigned to DeclKind:
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+ // Types that are assignable to DeclKind:
//
// *Decl_Ident
// *Decl_Function
- DeclKind isDecl_DeclKind `protobuf_oneof:"decl_kind"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ DeclKind isDecl_DeclKind `protobuf_oneof:"decl_kind"`
}
func (x *Decl) Reset() {
*x = Decl{}
- mi := &file_cel_expr_checked_proto_msgTypes[2]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Decl) String() string {
@@ -497,7 +479,7 @@ func (*Decl) ProtoMessage() {}
func (x *Decl) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[2]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -519,27 +501,23 @@ func (x *Decl) GetName() string {
return ""
}
-func (x *Decl) GetDeclKind() isDecl_DeclKind {
- if x != nil {
- return x.DeclKind
+func (m *Decl) GetDeclKind() isDecl_DeclKind {
+ if m != nil {
+ return m.DeclKind
}
return nil
}
func (x *Decl) GetIdent() *Decl_IdentDecl {
- if x != nil {
- if x, ok := x.DeclKind.(*Decl_Ident); ok {
- return x.Ident
- }
+ if x, ok := x.GetDeclKind().(*Decl_Ident); ok {
+ return x.Ident
}
return nil
}
func (x *Decl) GetFunction() *Decl_FunctionDecl {
- if x != nil {
- if x, ok := x.DeclKind.(*Decl_Function); ok {
- return x.Function
- }
+ if x, ok := x.GetDeclKind().(*Decl_Function); ok {
+ return x.Function
}
return nil
}
@@ -561,19 +539,22 @@ func (*Decl_Ident) isDecl_DeclKind() {}
func (*Decl_Function) isDecl_DeclKind() {}
type Reference struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
- OverloadId []string `protobuf:"bytes,3,rep,name=overload_id,json=overloadId,proto3" json:"overload_id,omitempty"`
- Value *Constant `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+ OverloadId []string `protobuf:"bytes,3,rep,name=overload_id,json=overloadId,proto3" json:"overload_id,omitempty"`
+ Value *Constant `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
}
func (x *Reference) Reset() {
*x = Reference{}
- mi := &file_cel_expr_checked_proto_msgTypes[3]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Reference) String() string {
@@ -584,7 +565,7 @@ func (*Reference) ProtoMessage() {}
func (x *Reference) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[3]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -621,17 +602,20 @@ func (x *Reference) GetValue() *Constant {
}
type Type_ListType struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- ElemType *Type `protobuf:"bytes,1,opt,name=elem_type,json=elemType,proto3" json:"elem_type,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ ElemType *Type `protobuf:"bytes,1,opt,name=elem_type,json=elemType,proto3" json:"elem_type,omitempty"`
}
func (x *Type_ListType) Reset() {
*x = Type_ListType{}
- mi := &file_cel_expr_checked_proto_msgTypes[6]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[6]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Type_ListType) String() string {
@@ -642,7 +626,7 @@ func (*Type_ListType) ProtoMessage() {}
func (x *Type_ListType) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[6]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -665,18 +649,21 @@ func (x *Type_ListType) GetElemType() *Type {
}
type Type_MapType struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- KeyType *Type `protobuf:"bytes,1,opt,name=key_type,json=keyType,proto3" json:"key_type,omitempty"`
- ValueType *Type `protobuf:"bytes,2,opt,name=value_type,json=valueType,proto3" json:"value_type,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ KeyType *Type `protobuf:"bytes,1,opt,name=key_type,json=keyType,proto3" json:"key_type,omitempty"`
+ ValueType *Type `protobuf:"bytes,2,opt,name=value_type,json=valueType,proto3" json:"value_type,omitempty"`
}
func (x *Type_MapType) Reset() {
*x = Type_MapType{}
- mi := &file_cel_expr_checked_proto_msgTypes[7]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[7]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Type_MapType) String() string {
@@ -687,7 +674,7 @@ func (*Type_MapType) ProtoMessage() {}
func (x *Type_MapType) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[7]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -717,18 +704,21 @@ func (x *Type_MapType) GetValueType() *Type {
}
type Type_FunctionType struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- ResultType *Type `protobuf:"bytes,1,opt,name=result_type,json=resultType,proto3" json:"result_type,omitempty"`
- ArgTypes []*Type `protobuf:"bytes,2,rep,name=arg_types,json=argTypes,proto3" json:"arg_types,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ ResultType *Type `protobuf:"bytes,1,opt,name=result_type,json=resultType,proto3" json:"result_type,omitempty"`
+ ArgTypes []*Type `protobuf:"bytes,2,rep,name=arg_types,json=argTypes,proto3" json:"arg_types,omitempty"`
}
func (x *Type_FunctionType) Reset() {
*x = Type_FunctionType{}
- mi := &file_cel_expr_checked_proto_msgTypes[8]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[8]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Type_FunctionType) String() string {
@@ -739,7 +729,7 @@ func (*Type_FunctionType) ProtoMessage() {}
func (x *Type_FunctionType) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[8]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -769,18 +759,21 @@ func (x *Type_FunctionType) GetArgTypes() []*Type {
}
type Type_AbstractType struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
- ParameterTypes []*Type `protobuf:"bytes,2,rep,name=parameter_types,json=parameterTypes,proto3" json:"parameter_types,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+ ParameterTypes []*Type `protobuf:"bytes,2,rep,name=parameter_types,json=parameterTypes,proto3" json:"parameter_types,omitempty"`
}
func (x *Type_AbstractType) Reset() {
*x = Type_AbstractType{}
- mi := &file_cel_expr_checked_proto_msgTypes[9]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[9]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Type_AbstractType) String() string {
@@ -791,7 +784,7 @@ func (*Type_AbstractType) ProtoMessage() {}
func (x *Type_AbstractType) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[9]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -821,19 +814,22 @@ func (x *Type_AbstractType) GetParameterTypes() []*Type {
}
type Decl_IdentDecl struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Type *Type `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
- Value *Constant `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
- Doc string `protobuf:"bytes,3,opt,name=doc,proto3" json:"doc,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Type *Type `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+ Value *Constant `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
+ Doc string `protobuf:"bytes,3,opt,name=doc,proto3" json:"doc,omitempty"`
}
func (x *Decl_IdentDecl) Reset() {
*x = Decl_IdentDecl{}
- mi := &file_cel_expr_checked_proto_msgTypes[10]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[10]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Decl_IdentDecl) String() string {
@@ -844,7 +840,7 @@ func (*Decl_IdentDecl) ProtoMessage() {}
func (x *Decl_IdentDecl) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[10]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -881,18 +877,20 @@ func (x *Decl_IdentDecl) GetDoc() string {
}
type Decl_FunctionDecl struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Overloads []*Decl_FunctionDecl_Overload `protobuf:"bytes,1,rep,name=overloads,proto3" json:"overloads,omitempty"`
- Doc string `protobuf:"bytes,2,opt,name=doc,proto3" json:"doc,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Overloads []*Decl_FunctionDecl_Overload `protobuf:"bytes,1,rep,name=overloads,proto3" json:"overloads,omitempty"`
}
func (x *Decl_FunctionDecl) Reset() {
*x = Decl_FunctionDecl{}
- mi := &file_cel_expr_checked_proto_msgTypes[11]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[11]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Decl_FunctionDecl) String() string {
@@ -903,7 +901,7 @@ func (*Decl_FunctionDecl) ProtoMessage() {}
func (x *Decl_FunctionDecl) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[11]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -925,30 +923,26 @@ func (x *Decl_FunctionDecl) GetOverloads() []*Decl_FunctionDecl_Overload {
return nil
}
-func (x *Decl_FunctionDecl) GetDoc() string {
- if x != nil {
- return x.Doc
- }
- return ""
-}
-
type Decl_FunctionDecl_Overload struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- OverloadId string `protobuf:"bytes,1,opt,name=overload_id,json=overloadId,proto3" json:"overload_id,omitempty"`
- Params []*Type `protobuf:"bytes,2,rep,name=params,proto3" json:"params,omitempty"`
- TypeParams []string `protobuf:"bytes,3,rep,name=type_params,json=typeParams,proto3" json:"type_params,omitempty"`
- ResultType *Type `protobuf:"bytes,4,opt,name=result_type,json=resultType,proto3" json:"result_type,omitempty"`
- IsInstanceFunction bool `protobuf:"varint,5,opt,name=is_instance_function,json=isInstanceFunction,proto3" json:"is_instance_function,omitempty"`
- Doc string `protobuf:"bytes,6,opt,name=doc,proto3" json:"doc,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ OverloadId string `protobuf:"bytes,1,opt,name=overload_id,json=overloadId,proto3" json:"overload_id,omitempty"`
+ Params []*Type `protobuf:"bytes,2,rep,name=params,proto3" json:"params,omitempty"`
+ TypeParams []string `protobuf:"bytes,3,rep,name=type_params,json=typeParams,proto3" json:"type_params,omitempty"`
+ ResultType *Type `protobuf:"bytes,4,opt,name=result_type,json=resultType,proto3" json:"result_type,omitempty"`
+ IsInstanceFunction bool `protobuf:"varint,5,opt,name=is_instance_function,json=isInstanceFunction,proto3" json:"is_instance_function,omitempty"`
+ Doc string `protobuf:"bytes,6,opt,name=doc,proto3" json:"doc,omitempty"`
}
func (x *Decl_FunctionDecl_Overload) Reset() {
*x = Decl_FunctionDecl_Overload{}
- mi := &file_cel_expr_checked_proto_msgTypes[12]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_checked_proto_msgTypes[12]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Decl_FunctionDecl_Overload) String() string {
@@ -959,7 +953,7 @@ func (*Decl_FunctionDecl_Overload) ProtoMessage() {}
func (x *Decl_FunctionDecl_Overload) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_checked_proto_msgTypes[12]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -1018,113 +1012,185 @@ func (x *Decl_FunctionDecl_Overload) GetDoc() string {
var File_cel_expr_checked_proto protoreflect.FileDescriptor
-const file_cel_expr_checked_proto_rawDesc = "" +
- "\n" +
- "\x16cel/expr/checked.proto\x12\bcel.expr\x1a\x15cel/expr/syntax.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1cgoogle/protobuf/struct.proto\"\xba\x03\n" +
- "\vCheckedExpr\x12L\n" +
- "\rreference_map\x18\x02 \x03(\v2'.cel.expr.CheckedExpr.ReferenceMapEntryR\freferenceMap\x12=\n" +
- "\btype_map\x18\x03 \x03(\v2\".cel.expr.CheckedExpr.TypeMapEntryR\atypeMap\x125\n" +
- "\vsource_info\x18\x05 \x01(\v2\x14.cel.expr.SourceInfoR\n" +
- "sourceInfo\x12!\n" +
- "\fexpr_version\x18\x06 \x01(\tR\vexprVersion\x12\"\n" +
- "\x04expr\x18\x04 \x01(\v2\x0e.cel.expr.ExprR\x04expr\x1aT\n" +
- "\x11ReferenceMapEntry\x12\x10\n" +
- "\x03key\x18\x01 \x01(\x03R\x03key\x12)\n" +
- "\x05value\x18\x02 \x01(\v2\x13.cel.expr.ReferenceR\x05value:\x028\x01\x1aJ\n" +
- "\fTypeMapEntry\x12\x10\n" +
- "\x03key\x18\x01 \x01(\x03R\x03key\x12$\n" +
- "\x05value\x18\x02 \x01(\v2\x0e.cel.expr.TypeR\x05value:\x028\x01\"\xe6\t\n" +
- "\x04Type\x12*\n" +
- "\x03dyn\x18\x01 \x01(\v2\x16.google.protobuf.EmptyH\x00R\x03dyn\x120\n" +
- "\x04null\x18\x02 \x01(\x0e2\x1a.google.protobuf.NullValueH\x00R\x04null\x12<\n" +
- "\tprimitive\x18\x03 \x01(\x0e2\x1c.cel.expr.Type.PrimitiveTypeH\x00R\tprimitive\x128\n" +
- "\awrapper\x18\x04 \x01(\x0e2\x1c.cel.expr.Type.PrimitiveTypeH\x00R\awrapper\x12=\n" +
- "\n" +
- "well_known\x18\x05 \x01(\x0e2\x1c.cel.expr.Type.WellKnownTypeH\x00R\twellKnown\x126\n" +
- "\tlist_type\x18\x06 \x01(\v2\x17.cel.expr.Type.ListTypeH\x00R\blistType\x123\n" +
- "\bmap_type\x18\a \x01(\v2\x16.cel.expr.Type.MapTypeH\x00R\amapType\x129\n" +
- "\bfunction\x18\b \x01(\v2\x1b.cel.expr.Type.FunctionTypeH\x00R\bfunction\x12#\n" +
- "\fmessage_type\x18\t \x01(\tH\x00R\vmessageType\x12\x1f\n" +
- "\n" +
- "type_param\x18\n" +
- " \x01(\tH\x00R\ttypeParam\x12$\n" +
- "\x04type\x18\v \x01(\v2\x0e.cel.expr.TypeH\x00R\x04type\x12.\n" +
- "\x05error\x18\f \x01(\v2\x16.google.protobuf.EmptyH\x00R\x05error\x12B\n" +
- "\rabstract_type\x18\x0e \x01(\v2\x1b.cel.expr.Type.AbstractTypeH\x00R\fabstractType\x1a7\n" +
- "\bListType\x12+\n" +
- "\telem_type\x18\x01 \x01(\v2\x0e.cel.expr.TypeR\belemType\x1ac\n" +
- "\aMapType\x12)\n" +
- "\bkey_type\x18\x01 \x01(\v2\x0e.cel.expr.TypeR\akeyType\x12-\n" +
- "\n" +
- "value_type\x18\x02 \x01(\v2\x0e.cel.expr.TypeR\tvalueType\x1al\n" +
- "\fFunctionType\x12/\n" +
- "\vresult_type\x18\x01 \x01(\v2\x0e.cel.expr.TypeR\n" +
- "resultType\x12+\n" +
- "\targ_types\x18\x02 \x03(\v2\x0e.cel.expr.TypeR\bargTypes\x1a[\n" +
- "\fAbstractType\x12\x12\n" +
- "\x04name\x18\x01 \x01(\tR\x04name\x127\n" +
- "\x0fparameter_types\x18\x02 \x03(\v2\x0e.cel.expr.TypeR\x0eparameterTypes\"s\n" +
- "\rPrimitiveType\x12\x1e\n" +
- "\x1aPRIMITIVE_TYPE_UNSPECIFIED\x10\x00\x12\b\n" +
- "\x04BOOL\x10\x01\x12\t\n" +
- "\x05INT64\x10\x02\x12\n" +
- "\n" +
- "\x06UINT64\x10\x03\x12\n" +
- "\n" +
- "\x06DOUBLE\x10\x04\x12\n" +
- "\n" +
- "\x06STRING\x10\x05\x12\t\n" +
- "\x05BYTES\x10\x06\"V\n" +
- "\rWellKnownType\x12\x1f\n" +
- "\x1bWELL_KNOWN_TYPE_UNSPECIFIED\x10\x00\x12\a\n" +
- "\x03ANY\x10\x01\x12\r\n" +
- "\tTIMESTAMP\x10\x02\x12\f\n" +
- "\bDURATION\x10\x03B\v\n" +
- "\ttype_kind\"\xd4\x04\n" +
- "\x04Decl\x12\x12\n" +
- "\x04name\x18\x01 \x01(\tR\x04name\x120\n" +
- "\x05ident\x18\x02 \x01(\v2\x18.cel.expr.Decl.IdentDeclH\x00R\x05ident\x129\n" +
- "\bfunction\x18\x03 \x01(\v2\x1b.cel.expr.Decl.FunctionDeclH\x00R\bfunction\x1ak\n" +
- "\tIdentDecl\x12\"\n" +
- "\x04type\x18\x01 \x01(\v2\x0e.cel.expr.TypeR\x04type\x12(\n" +
- "\x05value\x18\x02 \x01(\v2\x12.cel.expr.ConstantR\x05value\x12\x10\n" +
- "\x03doc\x18\x03 \x01(\tR\x03doc\x1a\xd0\x02\n" +
- "\fFunctionDecl\x12B\n" +
- "\toverloads\x18\x01 \x03(\v2$.cel.expr.Decl.FunctionDecl.OverloadR\toverloads\x12\x10\n" +
- "\x03doc\x18\x02 \x01(\tR\x03doc\x1a\xe9\x01\n" +
- "\bOverload\x12\x1f\n" +
- "\voverload_id\x18\x01 \x01(\tR\n" +
- "overloadId\x12&\n" +
- "\x06params\x18\x02 \x03(\v2\x0e.cel.expr.TypeR\x06params\x12\x1f\n" +
- "\vtype_params\x18\x03 \x03(\tR\n" +
- "typeParams\x12/\n" +
- "\vresult_type\x18\x04 \x01(\v2\x0e.cel.expr.TypeR\n" +
- "resultType\x120\n" +
- "\x14is_instance_function\x18\x05 \x01(\bR\x12isInstanceFunction\x12\x10\n" +
- "\x03doc\x18\x06 \x01(\tR\x03docB\v\n" +
- "\tdecl_kind\"j\n" +
- "\tReference\x12\x12\n" +
- "\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n" +
- "\voverload_id\x18\x03 \x03(\tR\n" +
- "overloadId\x12(\n" +
- "\x05value\x18\x04 \x01(\v2\x12.cel.expr.ConstantR\x05valueB,\n" +
- "\fdev.cel.exprB\tDeclProtoP\x01Z\fcel.dev/expr\xf8\x01\x01b\x06proto3"
+var file_cel_expr_checked_proto_rawDesc = []byte{
+ 0x0a, 0x16, 0x63, 0x65, 0x6c, 0x2f, 0x65, 0x78, 0x70, 0x72, 0x2f, 0x63, 0x68, 0x65, 0x63, 0x6b,
+ 0x65, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78,
+ 0x70, 0x72, 0x1a, 0x15, 0x63, 0x65, 0x6c, 0x2f, 0x65, 0x78, 0x70, 0x72, 0x2f, 0x73, 0x79, 0x6e,
+ 0x74, 0x61, 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+ 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70,
+ 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xba, 0x03, 0x0a, 0x0b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64,
+ 0x45, 0x78, 0x70, 0x72, 0x12, 0x4c, 0x0a, 0x0d, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
+ 0x65, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x63, 0x65,
+ 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78,
+ 0x70, 0x72, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x4d, 0x61, 0x70, 0x45,
+ 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x4d,
+ 0x61, 0x70, 0x12, 0x3d, 0x0a, 0x08, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x6d, 0x61, 0x70, 0x18, 0x03,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e,
+ 0x43, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x45, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65,
+ 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x74, 0x79, 0x70, 0x65, 0x4d, 0x61,
+ 0x70, 0x12, 0x35, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f,
+ 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70,
+ 0x72, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x73, 0x6f,
+ 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x21, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x72,
+ 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
+ 0x65, 0x78, 0x70, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x04, 0x65,
+ 0x78, 0x70, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e,
+ 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x52, 0x04, 0x65, 0x78, 0x70, 0x72, 0x1a,
+ 0x54, 0x0a, 0x11, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x4d, 0x61, 0x70, 0x45,
+ 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72,
+ 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4a, 0x0a, 0x0c, 0x54, 0x79, 0x70, 0x65, 0x4d, 0x61, 0x70,
+ 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70,
+ 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
+ 0x01, 0x22, 0xe6, 0x09, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2a, 0x0a, 0x03, 0x64, 0x79,
+ 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x48,
+ 0x00, 0x52, 0x03, 0x64, 0x79, 0x6e, 0x12, 0x30, 0x0a, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
+ 0x48, 0x00, 0x52, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x12, 0x3c, 0x0a, 0x09, 0x70, 0x72, 0x69, 0x6d,
+ 0x69, 0x74, 0x69, 0x76, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x63, 0x65,
+ 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x50, 0x72, 0x69, 0x6d,
+ 0x69, 0x74, 0x69, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x09, 0x70, 0x72, 0x69,
+ 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x12, 0x38, 0x0a, 0x07, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65,
+ 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78,
+ 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76,
+ 0x65, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x07, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72,
+ 0x12, 0x3d, 0x0a, 0x0a, 0x77, 0x65, 0x6c, 0x6c, 0x5f, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x18, 0x05,
+ 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e,
+ 0x54, 0x79, 0x70, 0x65, 0x2e, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x54, 0x79,
+ 0x70, 0x65, 0x48, 0x00, 0x52, 0x09, 0x77, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x12,
+ 0x36, 0x0a, 0x09, 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79,
+ 0x70, 0x65, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x08, 0x6c,
+ 0x69, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x33, 0x0a, 0x08, 0x6d, 0x61, 0x70, 0x5f, 0x74,
+ 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x65, 0x6c, 0x2e,
+ 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x4d, 0x61, 0x70, 0x54, 0x79, 0x70,
+ 0x65, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x61, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x39, 0x0a, 0x08,
+ 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b,
+ 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x46,
+ 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x08, 0x66,
+ 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0c, 0x6d, 0x65, 0x73, 0x73, 0x61,
+ 0x67, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
+ 0x0b, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0a,
+ 0x74, 0x79, 0x70, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09,
+ 0x48, 0x00, 0x52, 0x09, 0x74, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x24, 0x0a,
+ 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65,
+ 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x04, 0x74,
+ 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x0c, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x48, 0x00, 0x52, 0x05, 0x65, 0x72,
+ 0x72, 0x6f, 0x72, 0x12, 0x42, 0x0a, 0x0d, 0x61, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x5f,
+ 0x74, 0x79, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x65, 0x6c,
+ 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x41, 0x62, 0x73, 0x74, 0x72,
+ 0x61, 0x63, 0x74, 0x54, 0x79, 0x70, 0x65, 0x48, 0x00, 0x52, 0x0c, 0x61, 0x62, 0x73, 0x74, 0x72,
+ 0x61, 0x63, 0x74, 0x54, 0x79, 0x70, 0x65, 0x1a, 0x37, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x54,
+ 0x79, 0x70, 0x65, 0x12, 0x2b, 0x0a, 0x09, 0x65, 0x6c, 0x65, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70,
+ 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x65, 0x6c, 0x65, 0x6d, 0x54, 0x79, 0x70, 0x65,
+ 0x1a, 0x63, 0x0a, 0x07, 0x4d, 0x61, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x29, 0x0a, 0x08, 0x6b,
+ 0x65, 0x79, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+ 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x07, 0x6b,
+ 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2d, 0x0a, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f,
+ 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c,
+ 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x09, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x54, 0x79, 0x70, 0x65, 0x1a, 0x6c, 0x0a, 0x0c, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
+ 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2f, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f,
+ 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c,
+ 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x75,
+ 0x6c, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x2b, 0x0a, 0x09, 0x61, 0x72, 0x67, 0x5f, 0x74, 0x79,
+ 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e,
+ 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x61, 0x72, 0x67, 0x54, 0x79,
+ 0x70, 0x65, 0x73, 0x1a, 0x5b, 0x0a, 0x0c, 0x41, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63, 0x74, 0x54,
+ 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x0f, 0x70, 0x61, 0x72, 0x61, 0x6d,
+ 0x65, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65,
+ 0x52, 0x0e, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x73,
+ 0x22, 0x73, 0x0a, 0x0d, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76, 0x65, 0x54, 0x79, 0x70,
+ 0x65, 0x12, 0x1e, 0x0a, 0x1a, 0x50, 0x52, 0x49, 0x4d, 0x49, 0x54, 0x49, 0x56, 0x45, 0x5f, 0x54,
+ 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10,
+ 0x00, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x4f, 0x4f, 0x4c, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x49,
+ 0x4e, 0x54, 0x36, 0x34, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x49, 0x4e, 0x54, 0x36, 0x34,
+ 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x44, 0x4f, 0x55, 0x42, 0x4c, 0x45, 0x10, 0x04, 0x12, 0x0a,
+ 0x0a, 0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x05, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x59,
+ 0x54, 0x45, 0x53, 0x10, 0x06, 0x22, 0x56, 0x0a, 0x0d, 0x57, 0x65, 0x6c, 0x6c, 0x4b, 0x6e, 0x6f,
+ 0x77, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x1b, 0x57, 0x45, 0x4c, 0x4c, 0x5f, 0x4b,
+ 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43,
+ 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4e, 0x59, 0x10, 0x01,
+ 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x49, 0x4d, 0x45, 0x53, 0x54, 0x41, 0x4d, 0x50, 0x10, 0x02, 0x12,
+ 0x0c, 0x0a, 0x08, 0x44, 0x55, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x03, 0x42, 0x0b, 0x0a,
+ 0x09, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0xc2, 0x04, 0x0a, 0x04, 0x44,
+ 0x65, 0x63, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x30, 0x0a, 0x05, 0x69, 0x64, 0x65, 0x6e, 0x74,
+ 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70,
+ 0x72, 0x2e, 0x44, 0x65, 0x63, 0x6c, 0x2e, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x63, 0x6c,
+ 0x48, 0x00, 0x52, 0x05, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x08, 0x66, 0x75, 0x6e,
+ 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x65,
+ 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x44, 0x65, 0x63, 0x6c, 0x2e, 0x46, 0x75, 0x6e, 0x63,
+ 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x63, 0x6c, 0x48, 0x00, 0x52, 0x08, 0x66, 0x75, 0x6e, 0x63,
+ 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x6b, 0x0a, 0x09, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x63,
+ 0x6c, 0x12, 0x22, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x52,
+ 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e,
+ 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12,
+ 0x10, 0x0a, 0x03, 0x64, 0x6f, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64, 0x6f,
+ 0x63, 0x1a, 0xbe, 0x02, 0x0a, 0x0c, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65,
+ 0x63, 0x6c, 0x12, 0x42, 0x0a, 0x09, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x18,
+ 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72,
+ 0x2e, 0x44, 0x65, 0x63, 0x6c, 0x2e, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65,
+ 0x63, 0x6c, 0x2e, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x09, 0x6f, 0x76, 0x65,
+ 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x73, 0x1a, 0xe9, 0x01, 0x0a, 0x08, 0x4f, 0x76, 0x65, 0x72, 0x6c,
+ 0x6f, 0x61, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x5f,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f,
+ 0x61, 0x64, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e,
+ 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1f, 0x0a, 0x0b,
+ 0x74, 0x79, 0x70, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
+ 0x09, 0x52, 0x0a, 0x74, 0x79, 0x70, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x2f, 0x0a,
+ 0x0b, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x54, 0x79,
+ 0x70, 0x65, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x30,
+ 0x0a, 0x14, 0x69, 0x73, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x66, 0x75,
+ 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x12, 0x69, 0x73,
+ 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+ 0x12, 0x10, 0x0a, 0x03, 0x64, 0x6f, 0x63, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x64,
+ 0x6f, 0x63, 0x42, 0x0b, 0x0a, 0x09, 0x64, 0x65, 0x63, 0x6c, 0x5f, 0x6b, 0x69, 0x6e, 0x64, 0x22,
+ 0x6a, 0x0a, 0x09, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04,
+ 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+ 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x69, 0x64, 0x18,
+ 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x6f, 0x61, 0x64, 0x49,
+ 0x64, 0x12, 0x28, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x12, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x73,
+ 0x74, 0x61, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x2c, 0x0a, 0x0c, 0x64,
+ 0x65, 0x76, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x42, 0x09, 0x44, 0x65, 0x63,
+ 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x0c, 0x63, 0x65, 0x6c, 0x2e, 0x64, 0x65,
+ 0x76, 0x2f, 0x65, 0x78, 0x70, 0x72, 0xf8, 0x01, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x33,
+}
var (
file_cel_expr_checked_proto_rawDescOnce sync.Once
- file_cel_expr_checked_proto_rawDescData []byte
+ file_cel_expr_checked_proto_rawDescData = file_cel_expr_checked_proto_rawDesc
)
func file_cel_expr_checked_proto_rawDescGZIP() []byte {
file_cel_expr_checked_proto_rawDescOnce.Do(func() {
- file_cel_expr_checked_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_cel_expr_checked_proto_rawDesc), len(file_cel_expr_checked_proto_rawDesc)))
+ file_cel_expr_checked_proto_rawDescData = protoimpl.X.CompressGZIP(file_cel_expr_checked_proto_rawDescData)
})
return file_cel_expr_checked_proto_rawDescData
}
var file_cel_expr_checked_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
var file_cel_expr_checked_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
-var file_cel_expr_checked_proto_goTypes = []any{
+var file_cel_expr_checked_proto_goTypes = []interface{}{
(Type_PrimitiveType)(0), // 0: cel.expr.Type.PrimitiveType
(Type_WellKnownType)(0), // 1: cel.expr.Type.WellKnownType
(*CheckedExpr)(nil), // 2: cel.expr.CheckedExpr
@@ -1191,7 +1257,141 @@ func file_cel_expr_checked_proto_init() {
return
}
file_cel_expr_syntax_proto_init()
- file_cel_expr_checked_proto_msgTypes[1].OneofWrappers = []any{
+ if !protoimpl.UnsafeEnabled {
+ file_cel_expr_checked_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*CheckedExpr); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Type); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Decl); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Reference); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Type_ListType); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Type_MapType); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Type_FunctionType); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Type_AbstractType); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Decl_IdentDecl); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Decl_FunctionDecl); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Decl_FunctionDecl_Overload); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
+ file_cel_expr_checked_proto_msgTypes[1].OneofWrappers = []interface{}{
(*Type_Dyn)(nil),
(*Type_Null)(nil),
(*Type_Primitive)(nil),
@@ -1206,7 +1406,7 @@ func file_cel_expr_checked_proto_init() {
(*Type_Error)(nil),
(*Type_AbstractType_)(nil),
}
- file_cel_expr_checked_proto_msgTypes[2].OneofWrappers = []any{
+ file_cel_expr_checked_proto_msgTypes[2].OneofWrappers = []interface{}{
(*Decl_Ident)(nil),
(*Decl_Function)(nil),
}
@@ -1214,7 +1414,7 @@ func file_cel_expr_checked_proto_init() {
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
- RawDescriptor: unsafe.Slice(unsafe.StringData(file_cel_expr_checked_proto_rawDesc), len(file_cel_expr_checked_proto_rawDesc)),
+ RawDescriptor: file_cel_expr_checked_proto_rawDesc,
NumEnums: 2,
NumMessages: 13,
NumExtensions: 0,
@@ -1226,6 +1426,7 @@ func file_cel_expr_checked_proto_init() {
MessageInfos: file_cel_expr_checked_proto_msgTypes,
}.Build()
File_cel_expr_checked_proto = out.File
+ file_cel_expr_checked_proto_rawDesc = nil
file_cel_expr_checked_proto_goTypes = nil
file_cel_expr_checked_proto_depIdxs = nil
}
diff --git a/vendor/cel.dev/expr/eval.pb.go b/vendor/cel.dev/expr/eval.pb.go
index 83acb8935b..a7aae0900c 100644
--- a/vendor/cel.dev/expr/eval.pb.go
+++ b/vendor/cel.dev/expr/eval.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.3
// protoc v5.27.1
// source: cel/expr/eval.proto
@@ -12,7 +12,6 @@ import (
anypb "google.golang.org/protobuf/types/known/anypb"
reflect "reflect"
sync "sync"
- unsafe "unsafe"
)
const (
@@ -374,39 +373,58 @@ func (x *EvalState_Result) GetValue() int64 {
var File_cel_expr_eval_proto protoreflect.FileDescriptor
-const file_cel_expr_eval_proto_rawDesc = "" +
- "\n" +
- "\x13cel/expr/eval.proto\x12\bcel.expr\x1a\x19google/protobuf/any.proto\x1a\x14cel/expr/value.proto\"\xa2\x01\n" +
- "\tEvalState\x12+\n" +
- "\x06values\x18\x01 \x03(\v2\x13.cel.expr.ExprValueR\x06values\x124\n" +
- "\aresults\x18\x03 \x03(\v2\x1a.cel.expr.EvalState.ResultR\aresults\x1a2\n" +
- "\x06Result\x12\x12\n" +
- "\x04expr\x18\x01 \x01(\x03R\x04expr\x12\x14\n" +
- "\x05value\x18\x02 \x01(\x03R\x05value\"\x9a\x01\n" +
- "\tExprValue\x12'\n" +
- "\x05value\x18\x01 \x01(\v2\x0f.cel.expr.ValueH\x00R\x05value\x12*\n" +
- "\x05error\x18\x02 \x01(\v2\x12.cel.expr.ErrorSetH\x00R\x05error\x120\n" +
- "\aunknown\x18\x03 \x01(\v2\x14.cel.expr.UnknownSetH\x00R\aunknownB\x06\n" +
- "\x04kind\"4\n" +
- "\bErrorSet\x12(\n" +
- "\x06errors\x18\x01 \x03(\v2\x10.cel.expr.StatusR\x06errors\"f\n" +
- "\x06Status\x12\x12\n" +
- "\x04code\x18\x01 \x01(\x05R\x04code\x12\x18\n" +
- "\amessage\x18\x02 \x01(\tR\amessage\x12.\n" +
- "\adetails\x18\x03 \x03(\v2\x14.google.protobuf.AnyR\adetails\"\"\n" +
- "\n" +
- "UnknownSet\x12\x14\n" +
- "\x05exprs\x18\x01 \x03(\x03R\x05exprsB,\n" +
- "\fdev.cel.exprB\tEvalProtoP\x01Z\fcel.dev/expr\xf8\x01\x01b\x06proto3"
+var file_cel_expr_eval_proto_rawDesc = []byte{
+ 0x0a, 0x13, 0x63, 0x65, 0x6c, 0x2f, 0x65, 0x78, 0x70, 0x72, 0x2f, 0x65, 0x76, 0x61, 0x6c, 0x2e,
+ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x1a,
+ 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+ 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x63, 0x65, 0x6c, 0x2f,
+ 0x65, 0x78, 0x70, 0x72, 0x2f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x22, 0xa2, 0x01, 0x0a, 0x09, 0x45, 0x76, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x2b,
+ 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13,
+ 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x07, 0x72,
+ 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63,
+ 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x76, 0x61, 0x6c, 0x53, 0x74, 0x61, 0x74,
+ 0x65, 0x2e, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x07, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
+ 0x73, 0x1a, 0x32, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x65,
+ 0x78, 0x70, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x65, 0x78, 0x70, 0x72, 0x12,
+ 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x9a, 0x01, 0x0a, 0x09, 0x45, 0x78, 0x70, 0x72, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x12, 0x27, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2a, 0x0a, 0x05,
+ 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x63, 0x65,
+ 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x53, 0x65, 0x74, 0x48,
+ 0x00, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x30, 0x0a, 0x07, 0x75, 0x6e, 0x6b, 0x6e,
+ 0x6f, 0x77, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x65, 0x6c, 0x2e,
+ 0x65, 0x78, 0x70, 0x72, 0x2e, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x53, 0x65, 0x74, 0x48,
+ 0x00, 0x52, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x42, 0x06, 0x0a, 0x04, 0x6b, 0x69,
+ 0x6e, 0x64, 0x22, 0x34, 0x0a, 0x08, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x53, 0x65, 0x74, 0x12, 0x28,
+ 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10,
+ 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
+ 0x52, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x22, 0x66, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74,
+ 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+ 0x12, 0x2e, 0x0a, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x07, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73,
+ 0x22, 0x22, 0x0a, 0x0a, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x53, 0x65, 0x74, 0x12, 0x14,
+ 0x0a, 0x05, 0x65, 0x78, 0x70, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x03, 0x52, 0x05, 0x65,
+ 0x78, 0x70, 0x72, 0x73, 0x42, 0x2c, 0x0a, 0x0c, 0x64, 0x65, 0x76, 0x2e, 0x63, 0x65, 0x6c, 0x2e,
+ 0x65, 0x78, 0x70, 0x72, 0x42, 0x09, 0x45, 0x76, 0x61, 0x6c, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
+ 0x01, 0x5a, 0x0c, 0x63, 0x65, 0x6c, 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x65, 0x78, 0x70, 0x72, 0xf8,
+ 0x01, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
var (
file_cel_expr_eval_proto_rawDescOnce sync.Once
- file_cel_expr_eval_proto_rawDescData []byte
+ file_cel_expr_eval_proto_rawDescData = file_cel_expr_eval_proto_rawDesc
)
func file_cel_expr_eval_proto_rawDescGZIP() []byte {
file_cel_expr_eval_proto_rawDescOnce.Do(func() {
- file_cel_expr_eval_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_cel_expr_eval_proto_rawDesc), len(file_cel_expr_eval_proto_rawDesc)))
+ file_cel_expr_eval_proto_rawDescData = protoimpl.X.CompressGZIP(file_cel_expr_eval_proto_rawDescData)
})
return file_cel_expr_eval_proto_rawDescData
}
@@ -452,7 +470,7 @@ func file_cel_expr_eval_proto_init() {
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
- RawDescriptor: unsafe.Slice(unsafe.StringData(file_cel_expr_eval_proto_rawDesc), len(file_cel_expr_eval_proto_rawDesc)),
+ RawDescriptor: file_cel_expr_eval_proto_rawDesc,
NumEnums: 0,
NumMessages: 6,
NumExtensions: 0,
@@ -463,6 +481,7 @@ func file_cel_expr_eval_proto_init() {
MessageInfos: file_cel_expr_eval_proto_msgTypes,
}.Build()
File_cel_expr_eval_proto = out.File
+ file_cel_expr_eval_proto_rawDesc = nil
file_cel_expr_eval_proto_goTypes = nil
file_cel_expr_eval_proto_depIdxs = nil
}
diff --git a/vendor/cel.dev/expr/explain.pb.go b/vendor/cel.dev/expr/explain.pb.go
index 4239933978..79fd5443b9 100644
--- a/vendor/cel.dev/expr/explain.pb.go
+++ b/vendor/cel.dev/expr/explain.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
-// protoc v5.27.1
+// protoc-gen-go v1.28.1
+// protoc v3.21.5
// source: cel/expr/explain.proto
package expr
@@ -11,7 +11,6 @@ import (
protoimpl "google.golang.org/protobuf/runtime/protoimpl"
reflect "reflect"
sync "sync"
- unsafe "unsafe"
)
const (
@@ -21,20 +20,23 @@ const (
_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
)
-// Deprecated: Marked as deprecated in cel/expr/explain.proto.
+// Deprecated: Do not use.
type Explain struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Values []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
- ExprSteps []*Explain_ExprStep `protobuf:"bytes,2,rep,name=expr_steps,json=exprSteps,proto3" json:"expr_steps,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Values []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
+ ExprSteps []*Explain_ExprStep `protobuf:"bytes,2,rep,name=expr_steps,json=exprSteps,proto3" json:"expr_steps,omitempty"`
}
func (x *Explain) Reset() {
*x = Explain{}
- mi := &file_cel_expr_explain_proto_msgTypes[0]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_explain_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Explain) String() string {
@@ -45,7 +47,7 @@ func (*Explain) ProtoMessage() {}
func (x *Explain) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_explain_proto_msgTypes[0]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -75,18 +77,21 @@ func (x *Explain) GetExprSteps() []*Explain_ExprStep {
}
type Explain_ExprStep struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
- ValueIndex int32 `protobuf:"varint,2,opt,name=value_index,json=valueIndex,proto3" json:"value_index,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+ ValueIndex int32 `protobuf:"varint,2,opt,name=value_index,json=valueIndex,proto3" json:"value_index,omitempty"`
}
func (x *Explain_ExprStep) Reset() {
*x = Explain_ExprStep{}
- mi := &file_cel_expr_explain_proto_msgTypes[1]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_explain_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Explain_ExprStep) String() string {
@@ -97,7 +102,7 @@ func (*Explain_ExprStep) ProtoMessage() {}
func (x *Explain_ExprStep) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_explain_proto_msgTypes[1]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -128,33 +133,42 @@ func (x *Explain_ExprStep) GetValueIndex() int32 {
var File_cel_expr_explain_proto protoreflect.FileDescriptor
-const file_cel_expr_explain_proto_rawDesc = "" +
- "\n" +
- "\x16cel/expr/explain.proto\x12\bcel.expr\x1a\x14cel/expr/value.proto\"\xae\x01\n" +
- "\aExplain\x12'\n" +
- "\x06values\x18\x01 \x03(\v2\x0f.cel.expr.ValueR\x06values\x129\n" +
- "\n" +
- "expr_steps\x18\x02 \x03(\v2\x1a.cel.expr.Explain.ExprStepR\texprSteps\x1a;\n" +
- "\bExprStep\x12\x0e\n" +
- "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1f\n" +
- "\vvalue_index\x18\x02 \x01(\x05R\n" +
- "valueIndex:\x02\x18\x01B/\n" +
- "\fdev.cel.exprB\fExplainProtoP\x01Z\fcel.dev/expr\xf8\x01\x01b\x06proto3"
+var file_cel_expr_explain_proto_rawDesc = []byte{
+ 0x0a, 0x16, 0x63, 0x65, 0x6c, 0x2f, 0x65, 0x78, 0x70, 0x72, 0x2f, 0x65, 0x78, 0x70, 0x6c, 0x61,
+ 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78,
+ 0x70, 0x72, 0x1a, 0x14, 0x63, 0x65, 0x6c, 0x2f, 0x65, 0x78, 0x70, 0x72, 0x2f, 0x76, 0x61, 0x6c,
+ 0x75, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xae, 0x01, 0x0a, 0x07, 0x45, 0x78, 0x70,
+ 0x6c, 0x61, 0x69, 0x6e, 0x12, 0x27, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e,
+ 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x12, 0x39, 0x0a,
+ 0x0a, 0x65, 0x78, 0x70, 0x72, 0x5f, 0x73, 0x74, 0x65, 0x70, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70,
+ 0x6c, 0x61, 0x69, 0x6e, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x53, 0x74, 0x65, 0x70, 0x52, 0x09, 0x65,
+ 0x78, 0x70, 0x72, 0x53, 0x74, 0x65, 0x70, 0x73, 0x1a, 0x3b, 0x0a, 0x08, 0x45, 0x78, 0x70, 0x72,
+ 0x53, 0x74, 0x65, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03,
+ 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x69, 0x6e,
+ 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x49, 0x6e, 0x64, 0x65, 0x78, 0x3a, 0x02, 0x18, 0x01, 0x42, 0x2f, 0x0a, 0x0c, 0x64, 0x65, 0x76,
+ 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x42, 0x0c, 0x45, 0x78, 0x70, 0x6c, 0x61,
+ 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x0c, 0x63, 0x65, 0x6c, 0x2e, 0x64,
+ 0x65, 0x76, 0x2f, 0x65, 0x78, 0x70, 0x72, 0xf8, 0x01, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x33,
+}
var (
file_cel_expr_explain_proto_rawDescOnce sync.Once
- file_cel_expr_explain_proto_rawDescData []byte
+ file_cel_expr_explain_proto_rawDescData = file_cel_expr_explain_proto_rawDesc
)
func file_cel_expr_explain_proto_rawDescGZIP() []byte {
file_cel_expr_explain_proto_rawDescOnce.Do(func() {
- file_cel_expr_explain_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_cel_expr_explain_proto_rawDesc), len(file_cel_expr_explain_proto_rawDesc)))
+ file_cel_expr_explain_proto_rawDescData = protoimpl.X.CompressGZIP(file_cel_expr_explain_proto_rawDescData)
})
return file_cel_expr_explain_proto_rawDescData
}
var file_cel_expr_explain_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_cel_expr_explain_proto_goTypes = []any{
+var file_cel_expr_explain_proto_goTypes = []interface{}{
(*Explain)(nil), // 0: cel.expr.Explain
(*Explain_ExprStep)(nil), // 1: cel.expr.Explain.ExprStep
(*Value)(nil), // 2: cel.expr.Value
@@ -175,11 +189,37 @@ func file_cel_expr_explain_proto_init() {
return
}
file_cel_expr_value_proto_init()
+ if !protoimpl.UnsafeEnabled {
+ file_cel_expr_explain_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Explain); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_explain_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Explain_ExprStep); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
- RawDescriptor: unsafe.Slice(unsafe.StringData(file_cel_expr_explain_proto_rawDesc), len(file_cel_expr_explain_proto_rawDesc)),
+ RawDescriptor: file_cel_expr_explain_proto_rawDesc,
NumEnums: 0,
NumMessages: 2,
NumExtensions: 0,
@@ -190,6 +230,7 @@ func file_cel_expr_explain_proto_init() {
MessageInfos: file_cel_expr_explain_proto_msgTypes,
}.Build()
File_cel_expr_explain_proto = out.File
+ file_cel_expr_explain_proto_rawDesc = nil
file_cel_expr_explain_proto_goTypes = nil
file_cel_expr_explain_proto_depIdxs = nil
}
diff --git a/vendor/cel.dev/expr/syntax.pb.go b/vendor/cel.dev/expr/syntax.pb.go
index 72d19b20d4..48a952872e 100644
--- a/vendor/cel.dev/expr/syntax.pb.go
+++ b/vendor/cel.dev/expr/syntax.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
-// protoc v5.27.1
+// protoc-gen-go v1.28.1
+// protoc v3.21.5
// source: cel/expr/syntax.proto
package expr
@@ -14,7 +14,6 @@ import (
timestamppb "google.golang.org/protobuf/types/known/timestamppb"
reflect "reflect"
sync "sync"
- unsafe "unsafe"
)
const (
@@ -77,18 +76,21 @@ func (SourceInfo_Extension_Component) EnumDescriptor() ([]byte, []int) {
}
type ParsedExpr struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Expr *Expr `protobuf:"bytes,2,opt,name=expr,proto3" json:"expr,omitempty"`
- SourceInfo *SourceInfo `protobuf:"bytes,3,opt,name=source_info,json=sourceInfo,proto3" json:"source_info,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Expr *Expr `protobuf:"bytes,2,opt,name=expr,proto3" json:"expr,omitempty"`
+ SourceInfo *SourceInfo `protobuf:"bytes,3,opt,name=source_info,json=sourceInfo,proto3" json:"source_info,omitempty"`
}
func (x *ParsedExpr) Reset() {
*x = ParsedExpr{}
- mi := &file_cel_expr_syntax_proto_msgTypes[0]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *ParsedExpr) String() string {
@@ -99,7 +101,7 @@ func (*ParsedExpr) ProtoMessage() {}
func (x *ParsedExpr) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[0]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -129,9 +131,12 @@ func (x *ParsedExpr) GetSourceInfo() *SourceInfo {
}
type Expr struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Id int64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
- // Types that are valid to be assigned to ExprKind:
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id int64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
+ // Types that are assignable to ExprKind:
//
// *Expr_ConstExpr
// *Expr_IdentExpr
@@ -140,16 +145,16 @@ type Expr struct {
// *Expr_ListExpr
// *Expr_StructExpr
// *Expr_ComprehensionExpr
- ExprKind isExpr_ExprKind `protobuf_oneof:"expr_kind"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ ExprKind isExpr_ExprKind `protobuf_oneof:"expr_kind"`
}
func (x *Expr) Reset() {
*x = Expr{}
- mi := &file_cel_expr_syntax_proto_msgTypes[1]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Expr) String() string {
@@ -160,7 +165,7 @@ func (*Expr) ProtoMessage() {}
func (x *Expr) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[1]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -182,72 +187,58 @@ func (x *Expr) GetId() int64 {
return 0
}
-func (x *Expr) GetExprKind() isExpr_ExprKind {
- if x != nil {
- return x.ExprKind
+func (m *Expr) GetExprKind() isExpr_ExprKind {
+ if m != nil {
+ return m.ExprKind
}
return nil
}
func (x *Expr) GetConstExpr() *Constant {
- if x != nil {
- if x, ok := x.ExprKind.(*Expr_ConstExpr); ok {
- return x.ConstExpr
- }
+ if x, ok := x.GetExprKind().(*Expr_ConstExpr); ok {
+ return x.ConstExpr
}
return nil
}
func (x *Expr) GetIdentExpr() *Expr_Ident {
- if x != nil {
- if x, ok := x.ExprKind.(*Expr_IdentExpr); ok {
- return x.IdentExpr
- }
+ if x, ok := x.GetExprKind().(*Expr_IdentExpr); ok {
+ return x.IdentExpr
}
return nil
}
func (x *Expr) GetSelectExpr() *Expr_Select {
- if x != nil {
- if x, ok := x.ExprKind.(*Expr_SelectExpr); ok {
- return x.SelectExpr
- }
+ if x, ok := x.GetExprKind().(*Expr_SelectExpr); ok {
+ return x.SelectExpr
}
return nil
}
func (x *Expr) GetCallExpr() *Expr_Call {
- if x != nil {
- if x, ok := x.ExprKind.(*Expr_CallExpr); ok {
- return x.CallExpr
- }
+ if x, ok := x.GetExprKind().(*Expr_CallExpr); ok {
+ return x.CallExpr
}
return nil
}
func (x *Expr) GetListExpr() *Expr_CreateList {
- if x != nil {
- if x, ok := x.ExprKind.(*Expr_ListExpr); ok {
- return x.ListExpr
- }
+ if x, ok := x.GetExprKind().(*Expr_ListExpr); ok {
+ return x.ListExpr
}
return nil
}
func (x *Expr) GetStructExpr() *Expr_CreateStruct {
- if x != nil {
- if x, ok := x.ExprKind.(*Expr_StructExpr); ok {
- return x.StructExpr
- }
+ if x, ok := x.GetExprKind().(*Expr_StructExpr); ok {
+ return x.StructExpr
}
return nil
}
func (x *Expr) GetComprehensionExpr() *Expr_Comprehension {
- if x != nil {
- if x, ok := x.ExprKind.(*Expr_ComprehensionExpr); ok {
- return x.ComprehensionExpr
- }
+ if x, ok := x.GetExprKind().(*Expr_ComprehensionExpr); ok {
+ return x.ComprehensionExpr
}
return nil
}
@@ -299,8 +290,11 @@ func (*Expr_StructExpr) isExpr_ExprKind() {}
func (*Expr_ComprehensionExpr) isExpr_ExprKind() {}
type Constant struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // Types that are valid to be assigned to ConstantKind:
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ // Types that are assignable to ConstantKind:
//
// *Constant_NullValue
// *Constant_BoolValue
@@ -311,16 +305,16 @@ type Constant struct {
// *Constant_BytesValue
// *Constant_DurationValue
// *Constant_TimestampValue
- ConstantKind isConstant_ConstantKind `protobuf_oneof:"constant_kind"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ ConstantKind isConstant_ConstantKind `protobuf_oneof:"constant_kind"`
}
func (x *Constant) Reset() {
*x = Constant{}
- mi := &file_cel_expr_syntax_proto_msgTypes[2]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Constant) String() string {
@@ -331,7 +325,7 @@ func (*Constant) ProtoMessage() {}
func (x *Constant) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[2]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -346,92 +340,74 @@ func (*Constant) Descriptor() ([]byte, []int) {
return file_cel_expr_syntax_proto_rawDescGZIP(), []int{2}
}
-func (x *Constant) GetConstantKind() isConstant_ConstantKind {
- if x != nil {
- return x.ConstantKind
+func (m *Constant) GetConstantKind() isConstant_ConstantKind {
+ if m != nil {
+ return m.ConstantKind
}
return nil
}
func (x *Constant) GetNullValue() structpb.NullValue {
- if x != nil {
- if x, ok := x.ConstantKind.(*Constant_NullValue); ok {
- return x.NullValue
- }
+ if x, ok := x.GetConstantKind().(*Constant_NullValue); ok {
+ return x.NullValue
}
return structpb.NullValue(0)
}
func (x *Constant) GetBoolValue() bool {
- if x != nil {
- if x, ok := x.ConstantKind.(*Constant_BoolValue); ok {
- return x.BoolValue
- }
+ if x, ok := x.GetConstantKind().(*Constant_BoolValue); ok {
+ return x.BoolValue
}
return false
}
func (x *Constant) GetInt64Value() int64 {
- if x != nil {
- if x, ok := x.ConstantKind.(*Constant_Int64Value); ok {
- return x.Int64Value
- }
+ if x, ok := x.GetConstantKind().(*Constant_Int64Value); ok {
+ return x.Int64Value
}
return 0
}
func (x *Constant) GetUint64Value() uint64 {
- if x != nil {
- if x, ok := x.ConstantKind.(*Constant_Uint64Value); ok {
- return x.Uint64Value
- }
+ if x, ok := x.GetConstantKind().(*Constant_Uint64Value); ok {
+ return x.Uint64Value
}
return 0
}
func (x *Constant) GetDoubleValue() float64 {
- if x != nil {
- if x, ok := x.ConstantKind.(*Constant_DoubleValue); ok {
- return x.DoubleValue
- }
+ if x, ok := x.GetConstantKind().(*Constant_DoubleValue); ok {
+ return x.DoubleValue
}
return 0
}
func (x *Constant) GetStringValue() string {
- if x != nil {
- if x, ok := x.ConstantKind.(*Constant_StringValue); ok {
- return x.StringValue
- }
+ if x, ok := x.GetConstantKind().(*Constant_StringValue); ok {
+ return x.StringValue
}
return ""
}
func (x *Constant) GetBytesValue() []byte {
- if x != nil {
- if x, ok := x.ConstantKind.(*Constant_BytesValue); ok {
- return x.BytesValue
- }
+ if x, ok := x.GetConstantKind().(*Constant_BytesValue); ok {
+ return x.BytesValue
}
return nil
}
-// Deprecated: Marked as deprecated in cel/expr/syntax.proto.
+// Deprecated: Do not use.
func (x *Constant) GetDurationValue() *durationpb.Duration {
- if x != nil {
- if x, ok := x.ConstantKind.(*Constant_DurationValue); ok {
- return x.DurationValue
- }
+ if x, ok := x.GetConstantKind().(*Constant_DurationValue); ok {
+ return x.DurationValue
}
return nil
}
-// Deprecated: Marked as deprecated in cel/expr/syntax.proto.
+// Deprecated: Do not use.
func (x *Constant) GetTimestampValue() *timestamppb.Timestamp {
- if x != nil {
- if x, ok := x.ConstantKind.(*Constant_TimestampValue); ok {
- return x.TimestampValue
- }
+ if x, ok := x.GetConstantKind().(*Constant_TimestampValue); ok {
+ return x.TimestampValue
}
return nil
}
@@ -469,12 +445,12 @@ type Constant_BytesValue struct {
}
type Constant_DurationValue struct {
- // Deprecated: Marked as deprecated in cel/expr/syntax.proto.
+ // Deprecated: Do not use.
DurationValue *durationpb.Duration `protobuf:"bytes,8,opt,name=duration_value,json=durationValue,proto3,oneof"`
}
type Constant_TimestampValue struct {
- // Deprecated: Marked as deprecated in cel/expr/syntax.proto.
+ // Deprecated: Do not use.
TimestampValue *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=timestamp_value,json=timestampValue,proto3,oneof"`
}
@@ -497,22 +473,25 @@ func (*Constant_DurationValue) isConstant_ConstantKind() {}
func (*Constant_TimestampValue) isConstant_ConstantKind() {}
type SourceInfo struct {
- state protoimpl.MessageState `protogen:"open.v1"`
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
SyntaxVersion string `protobuf:"bytes,1,opt,name=syntax_version,json=syntaxVersion,proto3" json:"syntax_version,omitempty"`
Location string `protobuf:"bytes,2,opt,name=location,proto3" json:"location,omitempty"`
LineOffsets []int32 `protobuf:"varint,3,rep,packed,name=line_offsets,json=lineOffsets,proto3" json:"line_offsets,omitempty"`
- Positions map[int64]int32 `protobuf:"bytes,4,rep,name=positions,proto3" json:"positions,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
- MacroCalls map[int64]*Expr `protobuf:"bytes,5,rep,name=macro_calls,json=macroCalls,proto3" json:"macro_calls,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+ Positions map[int64]int32 `protobuf:"bytes,4,rep,name=positions,proto3" json:"positions,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
+ MacroCalls map[int64]*Expr `protobuf:"bytes,5,rep,name=macro_calls,json=macroCalls,proto3" json:"macro_calls,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
Extensions []*SourceInfo_Extension `protobuf:"bytes,6,rep,name=extensions,proto3" json:"extensions,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
}
func (x *SourceInfo) Reset() {
*x = SourceInfo{}
- mi := &file_cel_expr_syntax_proto_msgTypes[3]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *SourceInfo) String() string {
@@ -523,7 +502,7 @@ func (*SourceInfo) ProtoMessage() {}
func (x *SourceInfo) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[3]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -581,17 +560,20 @@ func (x *SourceInfo) GetExtensions() []*SourceInfo_Extension {
}
type Expr_Ident struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
}
func (x *Expr_Ident) Reset() {
*x = Expr_Ident{}
- mi := &file_cel_expr_syntax_proto_msgTypes[4]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Expr_Ident) String() string {
@@ -602,7 +584,7 @@ func (*Expr_Ident) ProtoMessage() {}
func (x *Expr_Ident) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[4]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -625,19 +607,22 @@ func (x *Expr_Ident) GetName() string {
}
type Expr_Select struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Operand *Expr `protobuf:"bytes,1,opt,name=operand,proto3" json:"operand,omitempty"`
- Field string `protobuf:"bytes,2,opt,name=field,proto3" json:"field,omitempty"`
- TestOnly bool `protobuf:"varint,3,opt,name=test_only,json=testOnly,proto3" json:"test_only,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Operand *Expr `protobuf:"bytes,1,opt,name=operand,proto3" json:"operand,omitempty"`
+ Field string `protobuf:"bytes,2,opt,name=field,proto3" json:"field,omitempty"`
+ TestOnly bool `protobuf:"varint,3,opt,name=test_only,json=testOnly,proto3" json:"test_only,omitempty"`
}
func (x *Expr_Select) Reset() {
*x = Expr_Select{}
- mi := &file_cel_expr_syntax_proto_msgTypes[5]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[5]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Expr_Select) String() string {
@@ -648,7 +633,7 @@ func (*Expr_Select) ProtoMessage() {}
func (x *Expr_Select) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[5]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -685,19 +670,22 @@ func (x *Expr_Select) GetTestOnly() bool {
}
type Expr_Call struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Target *Expr `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
- Function string `protobuf:"bytes,2,opt,name=function,proto3" json:"function,omitempty"`
- Args []*Expr `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Target *Expr `protobuf:"bytes,1,opt,name=target,proto3" json:"target,omitempty"`
+ Function string `protobuf:"bytes,2,opt,name=function,proto3" json:"function,omitempty"`
+ Args []*Expr `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"`
}
func (x *Expr_Call) Reset() {
*x = Expr_Call{}
- mi := &file_cel_expr_syntax_proto_msgTypes[6]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[6]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Expr_Call) String() string {
@@ -708,7 +696,7 @@ func (*Expr_Call) ProtoMessage() {}
func (x *Expr_Call) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[6]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -745,18 +733,21 @@ func (x *Expr_Call) GetArgs() []*Expr {
}
type Expr_CreateList struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Elements []*Expr `protobuf:"bytes,1,rep,name=elements,proto3" json:"elements,omitempty"`
- OptionalIndices []int32 `protobuf:"varint,2,rep,packed,name=optional_indices,json=optionalIndices,proto3" json:"optional_indices,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Elements []*Expr `protobuf:"bytes,1,rep,name=elements,proto3" json:"elements,omitempty"`
+ OptionalIndices []int32 `protobuf:"varint,2,rep,packed,name=optional_indices,json=optionalIndices,proto3" json:"optional_indices,omitempty"`
}
func (x *Expr_CreateList) Reset() {
*x = Expr_CreateList{}
- mi := &file_cel_expr_syntax_proto_msgTypes[7]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[7]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Expr_CreateList) String() string {
@@ -767,7 +758,7 @@ func (*Expr_CreateList) ProtoMessage() {}
func (x *Expr_CreateList) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[7]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -797,18 +788,21 @@ func (x *Expr_CreateList) GetOptionalIndices() []int32 {
}
type Expr_CreateStruct struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- MessageName string `protobuf:"bytes,1,opt,name=message_name,json=messageName,proto3" json:"message_name,omitempty"`
- Entries []*Expr_CreateStruct_Entry `protobuf:"bytes,2,rep,name=entries,proto3" json:"entries,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ MessageName string `protobuf:"bytes,1,opt,name=message_name,json=messageName,proto3" json:"message_name,omitempty"`
+ Entries []*Expr_CreateStruct_Entry `protobuf:"bytes,2,rep,name=entries,proto3" json:"entries,omitempty"`
}
func (x *Expr_CreateStruct) Reset() {
*x = Expr_CreateStruct{}
- mi := &file_cel_expr_syntax_proto_msgTypes[8]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[8]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Expr_CreateStruct) String() string {
@@ -819,7 +813,7 @@ func (*Expr_CreateStruct) ProtoMessage() {}
func (x *Expr_CreateStruct) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[8]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -849,24 +843,26 @@ func (x *Expr_CreateStruct) GetEntries() []*Expr_CreateStruct_Entry {
}
type Expr_Comprehension struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- IterVar string `protobuf:"bytes,1,opt,name=iter_var,json=iterVar,proto3" json:"iter_var,omitempty"`
- IterVar2 string `protobuf:"bytes,8,opt,name=iter_var2,json=iterVar2,proto3" json:"iter_var2,omitempty"`
- IterRange *Expr `protobuf:"bytes,2,opt,name=iter_range,json=iterRange,proto3" json:"iter_range,omitempty"`
- AccuVar string `protobuf:"bytes,3,opt,name=accu_var,json=accuVar,proto3" json:"accu_var,omitempty"`
- AccuInit *Expr `protobuf:"bytes,4,opt,name=accu_init,json=accuInit,proto3" json:"accu_init,omitempty"`
- LoopCondition *Expr `protobuf:"bytes,5,opt,name=loop_condition,json=loopCondition,proto3" json:"loop_condition,omitempty"`
- LoopStep *Expr `protobuf:"bytes,6,opt,name=loop_step,json=loopStep,proto3" json:"loop_step,omitempty"`
- Result *Expr `protobuf:"bytes,7,opt,name=result,proto3" json:"result,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ IterVar string `protobuf:"bytes,1,opt,name=iter_var,json=iterVar,proto3" json:"iter_var,omitempty"`
+ IterRange *Expr `protobuf:"bytes,2,opt,name=iter_range,json=iterRange,proto3" json:"iter_range,omitempty"`
+ AccuVar string `protobuf:"bytes,3,opt,name=accu_var,json=accuVar,proto3" json:"accu_var,omitempty"`
+ AccuInit *Expr `protobuf:"bytes,4,opt,name=accu_init,json=accuInit,proto3" json:"accu_init,omitempty"`
+ LoopCondition *Expr `protobuf:"bytes,5,opt,name=loop_condition,json=loopCondition,proto3" json:"loop_condition,omitempty"`
+ LoopStep *Expr `protobuf:"bytes,6,opt,name=loop_step,json=loopStep,proto3" json:"loop_step,omitempty"`
+ Result *Expr `protobuf:"bytes,7,opt,name=result,proto3" json:"result,omitempty"`
}
func (x *Expr_Comprehension) Reset() {
*x = Expr_Comprehension{}
- mi := &file_cel_expr_syntax_proto_msgTypes[9]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[9]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Expr_Comprehension) String() string {
@@ -877,7 +873,7 @@ func (*Expr_Comprehension) ProtoMessage() {}
func (x *Expr_Comprehension) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[9]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -899,13 +895,6 @@ func (x *Expr_Comprehension) GetIterVar() string {
return ""
}
-func (x *Expr_Comprehension) GetIterVar2() string {
- if x != nil {
- return x.IterVar2
- }
- return ""
-}
-
func (x *Expr_Comprehension) GetIterRange() *Expr {
if x != nil {
return x.IterRange
@@ -949,24 +938,27 @@ func (x *Expr_Comprehension) GetResult() *Expr {
}
type Expr_CreateStruct_Entry struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
- // Types that are valid to be assigned to KeyKind:
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Id int64 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+ // Types that are assignable to KeyKind:
//
// *Expr_CreateStruct_Entry_FieldKey
// *Expr_CreateStruct_Entry_MapKey
KeyKind isExpr_CreateStruct_Entry_KeyKind `protobuf_oneof:"key_kind"`
Value *Expr `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
OptionalEntry bool `protobuf:"varint,5,opt,name=optional_entry,json=optionalEntry,proto3" json:"optional_entry,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
}
func (x *Expr_CreateStruct_Entry) Reset() {
*x = Expr_CreateStruct_Entry{}
- mi := &file_cel_expr_syntax_proto_msgTypes[10]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[10]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Expr_CreateStruct_Entry) String() string {
@@ -977,7 +969,7 @@ func (*Expr_CreateStruct_Entry) ProtoMessage() {}
func (x *Expr_CreateStruct_Entry) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[10]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -999,27 +991,23 @@ func (x *Expr_CreateStruct_Entry) GetId() int64 {
return 0
}
-func (x *Expr_CreateStruct_Entry) GetKeyKind() isExpr_CreateStruct_Entry_KeyKind {
- if x != nil {
- return x.KeyKind
+func (m *Expr_CreateStruct_Entry) GetKeyKind() isExpr_CreateStruct_Entry_KeyKind {
+ if m != nil {
+ return m.KeyKind
}
return nil
}
func (x *Expr_CreateStruct_Entry) GetFieldKey() string {
- if x != nil {
- if x, ok := x.KeyKind.(*Expr_CreateStruct_Entry_FieldKey); ok {
- return x.FieldKey
- }
+ if x, ok := x.GetKeyKind().(*Expr_CreateStruct_Entry_FieldKey); ok {
+ return x.FieldKey
}
return ""
}
func (x *Expr_CreateStruct_Entry) GetMapKey() *Expr {
- if x != nil {
- if x, ok := x.KeyKind.(*Expr_CreateStruct_Entry_MapKey); ok {
- return x.MapKey
- }
+ if x, ok := x.GetKeyKind().(*Expr_CreateStruct_Entry_MapKey); ok {
+ return x.MapKey
}
return nil
}
@@ -1055,19 +1043,22 @@ func (*Expr_CreateStruct_Entry_FieldKey) isExpr_CreateStruct_Entry_KeyKind() {}
func (*Expr_CreateStruct_Entry_MapKey) isExpr_CreateStruct_Entry_KeyKind() {}
type SourceInfo_Extension struct {
- state protoimpl.MessageState `protogen:"open.v1"`
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
AffectedComponents []SourceInfo_Extension_Component `protobuf:"varint,2,rep,packed,name=affected_components,json=affectedComponents,proto3,enum=cel.expr.SourceInfo_Extension_Component" json:"affected_components,omitempty"`
Version *SourceInfo_Extension_Version `protobuf:"bytes,3,opt,name=version,proto3" json:"version,omitempty"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
}
func (x *SourceInfo_Extension) Reset() {
*x = SourceInfo_Extension{}
- mi := &file_cel_expr_syntax_proto_msgTypes[13]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[13]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *SourceInfo_Extension) String() string {
@@ -1078,7 +1069,7 @@ func (*SourceInfo_Extension) ProtoMessage() {}
func (x *SourceInfo_Extension) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[13]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -1115,18 +1106,21 @@ func (x *SourceInfo_Extension) GetVersion() *SourceInfo_Extension_Version {
}
type SourceInfo_Extension_Version struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Major int64 `protobuf:"varint,1,opt,name=major,proto3" json:"major,omitempty"`
- Minor int64 `protobuf:"varint,2,opt,name=minor,proto3" json:"minor,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Major int64 `protobuf:"varint,1,opt,name=major,proto3" json:"major,omitempty"`
+ Minor int64 `protobuf:"varint,2,opt,name=minor,proto3" json:"minor,omitempty"`
}
func (x *SourceInfo_Extension_Version) Reset() {
*x = SourceInfo_Extension_Version{}
- mi := &file_cel_expr_syntax_proto_msgTypes[14]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_syntax_proto_msgTypes[14]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *SourceInfo_Extension_Version) String() string {
@@ -1137,7 +1131,7 @@ func (*SourceInfo_Extension_Version) ProtoMessage() {}
func (x *SourceInfo_Extension_Version) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_syntax_proto_msgTypes[14]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -1168,124 +1162,210 @@ func (x *SourceInfo_Extension_Version) GetMinor() int64 {
var File_cel_expr_syntax_proto protoreflect.FileDescriptor
-const file_cel_expr_syntax_proto_rawDesc = "" +
- "\n" +
- "\x15cel/expr/syntax.proto\x12\bcel.expr\x1a\x1egoogle/protobuf/duration.proto\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"g\n" +
- "\n" +
- "ParsedExpr\x12\"\n" +
- "\x04expr\x18\x02 \x01(\v2\x0e.cel.expr.ExprR\x04expr\x125\n" +
- "\vsource_info\x18\x03 \x01(\v2\x14.cel.expr.SourceInfoR\n" +
- "sourceInfo\"\x9a\v\n" +
- "\x04Expr\x12\x0e\n" +
- "\x02id\x18\x02 \x01(\x03R\x02id\x123\n" +
- "\n" +
- "const_expr\x18\x03 \x01(\v2\x12.cel.expr.ConstantH\x00R\tconstExpr\x125\n" +
- "\n" +
- "ident_expr\x18\x04 \x01(\v2\x14.cel.expr.Expr.IdentH\x00R\tidentExpr\x128\n" +
- "\vselect_expr\x18\x05 \x01(\v2\x15.cel.expr.Expr.SelectH\x00R\n" +
- "selectExpr\x122\n" +
- "\tcall_expr\x18\x06 \x01(\v2\x13.cel.expr.Expr.CallH\x00R\bcallExpr\x128\n" +
- "\tlist_expr\x18\a \x01(\v2\x19.cel.expr.Expr.CreateListH\x00R\blistExpr\x12>\n" +
- "\vstruct_expr\x18\b \x01(\v2\x1b.cel.expr.Expr.CreateStructH\x00R\n" +
- "structExpr\x12M\n" +
- "\x12comprehension_expr\x18\t \x01(\v2\x1c.cel.expr.Expr.ComprehensionH\x00R\x11comprehensionExpr\x1a\x1b\n" +
- "\x05Ident\x12\x12\n" +
- "\x04name\x18\x01 \x01(\tR\x04name\x1ae\n" +
- "\x06Select\x12(\n" +
- "\aoperand\x18\x01 \x01(\v2\x0e.cel.expr.ExprR\aoperand\x12\x14\n" +
- "\x05field\x18\x02 \x01(\tR\x05field\x12\x1b\n" +
- "\ttest_only\x18\x03 \x01(\bR\btestOnly\x1an\n" +
- "\x04Call\x12&\n" +
- "\x06target\x18\x01 \x01(\v2\x0e.cel.expr.ExprR\x06target\x12\x1a\n" +
- "\bfunction\x18\x02 \x01(\tR\bfunction\x12\"\n" +
- "\x04args\x18\x03 \x03(\v2\x0e.cel.expr.ExprR\x04args\x1ac\n" +
- "\n" +
- "CreateList\x12*\n" +
- "\belements\x18\x01 \x03(\v2\x0e.cel.expr.ExprR\belements\x12)\n" +
- "\x10optional_indices\x18\x02 \x03(\x05R\x0foptionalIndices\x1a\xab\x02\n" +
- "\fCreateStruct\x12!\n" +
- "\fmessage_name\x18\x01 \x01(\tR\vmessageName\x12;\n" +
- "\aentries\x18\x02 \x03(\v2!.cel.expr.Expr.CreateStruct.EntryR\aentries\x1a\xba\x01\n" +
- "\x05Entry\x12\x0e\n" +
- "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1d\n" +
- "\tfield_key\x18\x02 \x01(\tH\x00R\bfieldKey\x12)\n" +
- "\amap_key\x18\x03 \x01(\v2\x0e.cel.expr.ExprH\x00R\x06mapKey\x12$\n" +
- "\x05value\x18\x04 \x01(\v2\x0e.cel.expr.ExprR\x05value\x12%\n" +
- "\x0eoptional_entry\x18\x05 \x01(\bR\roptionalEntryB\n" +
- "\n" +
- "\bkey_kind\x1a\xca\x02\n" +
- "\rComprehension\x12\x19\n" +
- "\biter_var\x18\x01 \x01(\tR\aiterVar\x12\x1b\n" +
- "\titer_var2\x18\b \x01(\tR\biterVar2\x12-\n" +
- "\n" +
- "iter_range\x18\x02 \x01(\v2\x0e.cel.expr.ExprR\titerRange\x12\x19\n" +
- "\baccu_var\x18\x03 \x01(\tR\aaccuVar\x12+\n" +
- "\taccu_init\x18\x04 \x01(\v2\x0e.cel.expr.ExprR\baccuInit\x125\n" +
- "\x0eloop_condition\x18\x05 \x01(\v2\x0e.cel.expr.ExprR\rloopCondition\x12+\n" +
- "\tloop_step\x18\x06 \x01(\v2\x0e.cel.expr.ExprR\bloopStep\x12&\n" +
- "\x06result\x18\a \x01(\v2\x0e.cel.expr.ExprR\x06resultB\v\n" +
- "\texpr_kind\"\xc1\x03\n" +
- "\bConstant\x12;\n" +
- "\n" +
- "null_value\x18\x01 \x01(\x0e2\x1a.google.protobuf.NullValueH\x00R\tnullValue\x12\x1f\n" +
- "\n" +
- "bool_value\x18\x02 \x01(\bH\x00R\tboolValue\x12!\n" +
- "\vint64_value\x18\x03 \x01(\x03H\x00R\n" +
- "int64Value\x12#\n" +
- "\fuint64_value\x18\x04 \x01(\x04H\x00R\vuint64Value\x12#\n" +
- "\fdouble_value\x18\x05 \x01(\x01H\x00R\vdoubleValue\x12#\n" +
- "\fstring_value\x18\x06 \x01(\tH\x00R\vstringValue\x12!\n" +
- "\vbytes_value\x18\a \x01(\fH\x00R\n" +
- "bytesValue\x12F\n" +
- "\x0eduration_value\x18\b \x01(\v2\x19.google.protobuf.DurationB\x02\x18\x01H\x00R\rdurationValue\x12I\n" +
- "\x0ftimestamp_value\x18\t \x01(\v2\x1a.google.protobuf.TimestampB\x02\x18\x01H\x00R\x0etimestampValueB\x0f\n" +
- "\rconstant_kind\"\xac\x06\n" +
- "\n" +
- "SourceInfo\x12%\n" +
- "\x0esyntax_version\x18\x01 \x01(\tR\rsyntaxVersion\x12\x1a\n" +
- "\blocation\x18\x02 \x01(\tR\blocation\x12!\n" +
- "\fline_offsets\x18\x03 \x03(\x05R\vlineOffsets\x12A\n" +
- "\tpositions\x18\x04 \x03(\v2#.cel.expr.SourceInfo.PositionsEntryR\tpositions\x12E\n" +
- "\vmacro_calls\x18\x05 \x03(\v2$.cel.expr.SourceInfo.MacroCallsEntryR\n" +
- "macroCalls\x12>\n" +
- "\n" +
- "extensions\x18\x06 \x03(\v2\x1e.cel.expr.SourceInfo.ExtensionR\n" +
- "extensions\x1a<\n" +
- "\x0ePositionsEntry\x12\x10\n" +
- "\x03key\x18\x01 \x01(\x03R\x03key\x12\x14\n" +
- "\x05value\x18\x02 \x01(\x05R\x05value:\x028\x01\x1aM\n" +
- "\x0fMacroCallsEntry\x12\x10\n" +
- "\x03key\x18\x01 \x01(\x03R\x03key\x12$\n" +
- "\x05value\x18\x02 \x01(\v2\x0e.cel.expr.ExprR\x05value:\x028\x01\x1a\xe0\x02\n" +
- "\tExtension\x12\x0e\n" +
- "\x02id\x18\x01 \x01(\tR\x02id\x12Y\n" +
- "\x13affected_components\x18\x02 \x03(\x0e2(.cel.expr.SourceInfo.Extension.ComponentR\x12affectedComponents\x12@\n" +
- "\aversion\x18\x03 \x01(\v2&.cel.expr.SourceInfo.Extension.VersionR\aversion\x1a5\n" +
- "\aVersion\x12\x14\n" +
- "\x05major\x18\x01 \x01(\x03R\x05major\x12\x14\n" +
- "\x05minor\x18\x02 \x01(\x03R\x05minor\"o\n" +
- "\tComponent\x12\x19\n" +
- "\x15COMPONENT_UNSPECIFIED\x10\x00\x12\x14\n" +
- "\x10COMPONENT_PARSER\x10\x01\x12\x1a\n" +
- "\x16COMPONENT_TYPE_CHECKER\x10\x02\x12\x15\n" +
- "\x11COMPONENT_RUNTIME\x10\x03B.\n" +
- "\fdev.cel.exprB\vSyntaxProtoP\x01Z\fcel.dev/expr\xf8\x01\x01b\x06proto3"
+var file_cel_expr_syntax_proto_rawDesc = []byte{
+ 0x0a, 0x15, 0x63, 0x65, 0x6c, 0x2f, 0x65, 0x78, 0x70, 0x72, 0x2f, 0x73, 0x79, 0x6e, 0x74, 0x61,
+ 0x78, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70,
+ 0x72, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+ 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+ 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a,
+ 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+ 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x22, 0x67, 0x0a, 0x0a, 0x50, 0x61, 0x72, 0x73, 0x65, 0x64, 0x45, 0x78, 0x70, 0x72, 0x12, 0x22,
+ 0x0a, 0x04, 0x65, 0x78, 0x70, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63,
+ 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x52, 0x04, 0x65, 0x78,
+ 0x70, 0x72, 0x12, 0x35, 0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x6e, 0x66,
+ 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78,
+ 0x70, 0x72, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x73,
+ 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xfd, 0x0a, 0x0a, 0x04, 0x45, 0x78,
+ 0x70, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02,
+ 0x69, 0x64, 0x12, 0x33, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x72,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70,
+ 0x72, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x48, 0x00, 0x52, 0x09, 0x63, 0x6f,
+ 0x6e, 0x73, 0x74, 0x45, 0x78, 0x70, 0x72, 0x12, 0x35, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74,
+ 0x5f, 0x65, 0x78, 0x70, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x65,
+ 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x2e, 0x49, 0x64, 0x65, 0x6e,
+ 0x74, 0x48, 0x00, 0x52, 0x09, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x45, 0x78, 0x70, 0x72, 0x12, 0x38,
+ 0x0a, 0x0b, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x72, 0x18, 0x05, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45,
+ 0x78, 0x70, 0x72, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x65,
+ 0x6c, 0x65, 0x63, 0x74, 0x45, 0x78, 0x70, 0x72, 0x12, 0x32, 0x0a, 0x09, 0x63, 0x61, 0x6c, 0x6c,
+ 0x5f, 0x65, 0x78, 0x70, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x65,
+ 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x2e, 0x43, 0x61, 0x6c, 0x6c,
+ 0x48, 0x00, 0x52, 0x08, 0x63, 0x61, 0x6c, 0x6c, 0x45, 0x78, 0x70, 0x72, 0x12, 0x38, 0x0a, 0x09,
+ 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x65, 0x78, 0x70, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32,
+ 0x19, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x2e,
+ 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x48, 0x00, 0x52, 0x08, 0x6c, 0x69,
+ 0x73, 0x74, 0x45, 0x78, 0x70, 0x72, 0x12, 0x3e, 0x0a, 0x0b, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74,
+ 0x5f, 0x65, 0x78, 0x70, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x65,
+ 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x2e, 0x43, 0x72, 0x65, 0x61,
+ 0x74, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x74, 0x72, 0x75,
+ 0x63, 0x74, 0x45, 0x78, 0x70, 0x72, 0x12, 0x4d, 0x0a, 0x12, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65,
+ 0x68, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x65, 0x78, 0x70, 0x72, 0x18, 0x09, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78,
+ 0x70, 0x72, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x68, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+ 0x48, 0x00, 0x52, 0x11, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x68, 0x65, 0x6e, 0x73, 0x69, 0x6f,
+ 0x6e, 0x45, 0x78, 0x70, 0x72, 0x1a, 0x1b, 0x0a, 0x05, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x12, 0x12,
+ 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+ 0x6d, 0x65, 0x1a, 0x65, 0x0a, 0x06, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x28, 0x0a, 0x07,
+ 0x6f, 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+ 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x52, 0x07, 0x6f,
+ 0x70, 0x65, 0x72, 0x61, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x12, 0x1b, 0x0a, 0x09,
+ 0x74, 0x65, 0x73, 0x74, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
+ 0x08, 0x74, 0x65, 0x73, 0x74, 0x4f, 0x6e, 0x6c, 0x79, 0x1a, 0x6e, 0x0a, 0x04, 0x43, 0x61, 0x6c,
+ 0x6c, 0x12, 0x26, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70,
+ 0x72, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x75, 0x6e,
+ 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x75, 0x6e,
+ 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x04, 0x61, 0x72, 0x67, 0x73, 0x18, 0x03, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45,
+ 0x78, 0x70, 0x72, 0x52, 0x04, 0x61, 0x72, 0x67, 0x73, 0x1a, 0x63, 0x0a, 0x0a, 0x43, 0x72, 0x65,
+ 0x61, 0x74, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2a, 0x0a, 0x08, 0x65, 0x6c, 0x65, 0x6d, 0x65,
+ 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e,
+ 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x52, 0x08, 0x65, 0x6c, 0x65, 0x6d, 0x65,
+ 0x6e, 0x74, 0x73, 0x12, 0x29, 0x0a, 0x10, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f,
+ 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f, 0x6f,
+ 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x1a, 0xab,
+ 0x02, 0x0a, 0x0c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x12,
+ 0x21, 0x0a, 0x0c, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4e, 0x61,
+ 0x6d, 0x65, 0x12, 0x3b, 0x0a, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x02, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45,
+ 0x78, 0x70, 0x72, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
+ 0x2e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x1a,
+ 0xba, 0x01, 0x0a, 0x05, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1d, 0x0a, 0x09, 0x66, 0x69, 0x65,
+ 0x6c, 0x64, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x08,
+ 0x66, 0x69, 0x65, 0x6c, 0x64, 0x4b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x07, 0x6d, 0x61, 0x70, 0x5f,
+ 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e,
+ 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x61, 0x70,
+ 0x4b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78,
+ 0x70, 0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x6f, 0x70, 0x74,
+ 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28,
+ 0x08, 0x52, 0x0d, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x42, 0x0a, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x6b, 0x69, 0x6e, 0x64, 0x1a, 0xad, 0x02, 0x0a,
+ 0x0d, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x68, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x19,
+ 0x0a, 0x08, 0x69, 0x74, 0x65, 0x72, 0x5f, 0x76, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x07, 0x69, 0x74, 0x65, 0x72, 0x56, 0x61, 0x72, 0x12, 0x2d, 0x0a, 0x0a, 0x69, 0x74, 0x65,
+ 0x72, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e,
+ 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x52, 0x09, 0x69,
+ 0x74, 0x65, 0x72, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x63, 0x63, 0x75,
+ 0x5f, 0x76, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x75,
+ 0x56, 0x61, 0x72, 0x12, 0x2b, 0x0a, 0x09, 0x61, 0x63, 0x63, 0x75, 0x5f, 0x69, 0x6e, 0x69, 0x74,
+ 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70,
+ 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x52, 0x08, 0x61, 0x63, 0x63, 0x75, 0x49, 0x6e, 0x69, 0x74,
+ 0x12, 0x35, 0x0a, 0x0e, 0x6c, 0x6f, 0x6f, 0x70, 0x5f, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
+ 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65,
+ 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x52, 0x0d, 0x6c, 0x6f, 0x6f, 0x70, 0x43, 0x6f,
+ 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x0a, 0x09, 0x6c, 0x6f, 0x6f, 0x70, 0x5f,
+ 0x73, 0x74, 0x65, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c,
+ 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x52, 0x08, 0x6c, 0x6f, 0x6f, 0x70,
+ 0x53, 0x74, 0x65, 0x70, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x07,
+ 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e,
+ 0x45, 0x78, 0x70, 0x72, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x42, 0x0b, 0x0a, 0x09,
+ 0x65, 0x78, 0x70, 0x72, 0x5f, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0xc1, 0x03, 0x0a, 0x08, 0x43, 0x6f,
+ 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x12, 0x3b, 0x0a, 0x0a, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x76,
+ 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4e, 0x75, 0x6c,
+ 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x09, 0x6e, 0x75, 0x6c, 0x6c, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6c, 0x56,
+ 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x76, 0x61,
+ 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x6e, 0x74,
+ 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x75, 0x69, 0x6e, 0x74, 0x36,
+ 0x34, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52,
+ 0x0b, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c,
+ 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01,
+ 0x28, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75,
+ 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e,
+ 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0a, 0x62,
+ 0x79, 0x74, 0x65, 0x73, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x46, 0x0a, 0x0e, 0x64, 0x75, 0x72,
+ 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28,
+ 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x02, 0x18, 0x01,
+ 0x48, 0x00, 0x52, 0x0d, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x56, 0x61, 0x6c, 0x75,
+ 0x65, 0x12, 0x49, 0x0a, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x76,
+ 0x61, 0x6c, 0x75, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d,
+ 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x42, 0x02, 0x18, 0x01, 0x48, 0x00, 0x52, 0x0e, 0x74, 0x69,
+ 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x0f, 0x0a, 0x0d,
+ 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x5f, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0xac, 0x06,
+ 0x0a, 0x0a, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x25, 0x0a, 0x0e,
+ 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x79, 0x6e, 0x74, 0x61, 0x78, 0x56, 0x65, 0x72, 0x73,
+ 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+ 0x21, 0x0a, 0x0c, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x73, 0x18,
+ 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x6c, 0x69, 0x6e, 0x65, 0x4f, 0x66, 0x66, 0x73, 0x65,
+ 0x74, 0x73, 0x12, 0x41, 0x0a, 0x09, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
+ 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72,
+ 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x50, 0x6f, 0x73, 0x69,
+ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x70, 0x6f, 0x73, 0x69,
+ 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x45, 0x0a, 0x0b, 0x6d, 0x61, 0x63, 0x72, 0x6f, 0x5f, 0x63,
+ 0x61, 0x6c, 0x6c, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x65, 0x6c,
+ 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f,
+ 0x2e, 0x4d, 0x61, 0x63, 0x72, 0x6f, 0x43, 0x61, 0x6c, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x52, 0x0a, 0x6d, 0x61, 0x63, 0x72, 0x6f, 0x43, 0x61, 0x6c, 0x6c, 0x73, 0x12, 0x3e, 0x0a, 0x0a,
+ 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x1e, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x53, 0x6f, 0x75, 0x72,
+ 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+ 0x52, 0x0a, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x3c, 0x0a, 0x0e,
+ 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+ 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79,
+ 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x4d, 0x0a, 0x0f, 0x4d, 0x61,
+ 0x63, 0x72, 0x6f, 0x43, 0x61, 0x6c, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+ 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+ 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e,
+ 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x78, 0x70, 0x72, 0x52, 0x05,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0xe0, 0x02, 0x0a, 0x09, 0x45, 0x78,
+ 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x59, 0x0a, 0x13, 0x61, 0x66, 0x66, 0x65, 0x63,
+ 0x74, 0x65, 0x64, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x02,
+ 0x20, 0x03, 0x28, 0x0e, 0x32, 0x28, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e,
+ 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e,
+ 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x52, 0x12,
+ 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e,
+ 0x74, 0x73, 0x12, 0x40, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20,
+ 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x53,
+ 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73,
+ 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x76, 0x65, 0x72,
+ 0x73, 0x69, 0x6f, 0x6e, 0x1a, 0x35, 0x0a, 0x07, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12,
+ 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+ 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x22, 0x6f, 0x0a, 0x09, 0x43,
+ 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x12, 0x19, 0x0a, 0x15, 0x43, 0x4f, 0x4d, 0x50,
+ 0x4f, 0x4e, 0x45, 0x4e, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
+ 0x44, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x43, 0x4f, 0x4d, 0x50, 0x4f, 0x4e, 0x45, 0x4e, 0x54,
+ 0x5f, 0x50, 0x41, 0x52, 0x53, 0x45, 0x52, 0x10, 0x01, 0x12, 0x1a, 0x0a, 0x16, 0x43, 0x4f, 0x4d,
+ 0x50, 0x4f, 0x4e, 0x45, 0x4e, 0x54, 0x5f, 0x54, 0x59, 0x50, 0x45, 0x5f, 0x43, 0x48, 0x45, 0x43,
+ 0x4b, 0x45, 0x52, 0x10, 0x02, 0x12, 0x15, 0x0a, 0x11, 0x43, 0x4f, 0x4d, 0x50, 0x4f, 0x4e, 0x45,
+ 0x4e, 0x54, 0x5f, 0x52, 0x55, 0x4e, 0x54, 0x49, 0x4d, 0x45, 0x10, 0x03, 0x42, 0x2e, 0x0a, 0x0c,
+ 0x64, 0x65, 0x76, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x42, 0x0b, 0x53, 0x79,
+ 0x6e, 0x74, 0x61, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x0c, 0x63, 0x65, 0x6c,
+ 0x2e, 0x64, 0x65, 0x76, 0x2f, 0x65, 0x78, 0x70, 0x72, 0xf8, 0x01, 0x01, 0x62, 0x06, 0x70, 0x72,
+ 0x6f, 0x74, 0x6f, 0x33,
+}
var (
file_cel_expr_syntax_proto_rawDescOnce sync.Once
- file_cel_expr_syntax_proto_rawDescData []byte
+ file_cel_expr_syntax_proto_rawDescData = file_cel_expr_syntax_proto_rawDesc
)
func file_cel_expr_syntax_proto_rawDescGZIP() []byte {
file_cel_expr_syntax_proto_rawDescOnce.Do(func() {
- file_cel_expr_syntax_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_cel_expr_syntax_proto_rawDesc), len(file_cel_expr_syntax_proto_rawDesc)))
+ file_cel_expr_syntax_proto_rawDescData = protoimpl.X.CompressGZIP(file_cel_expr_syntax_proto_rawDescData)
})
return file_cel_expr_syntax_proto_rawDescData
}
var file_cel_expr_syntax_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_cel_expr_syntax_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
-var file_cel_expr_syntax_proto_goTypes = []any{
+var file_cel_expr_syntax_proto_goTypes = []interface{}{
(SourceInfo_Extension_Component)(0), // 0: cel.expr.SourceInfo.Extension.Component
(*ParsedExpr)(nil), // 1: cel.expr.ParsedExpr
(*Expr)(nil), // 2: cel.expr.Expr
@@ -1349,7 +1429,165 @@ func file_cel_expr_syntax_proto_init() {
if File_cel_expr_syntax_proto != nil {
return
}
- file_cel_expr_syntax_proto_msgTypes[1].OneofWrappers = []any{
+ if !protoimpl.UnsafeEnabled {
+ file_cel_expr_syntax_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ParsedExpr); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Expr); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Constant); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SourceInfo); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Expr_Ident); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Expr_Select); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Expr_Call); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Expr_CreateList); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Expr_CreateStruct); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Expr_Comprehension); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Expr_CreateStruct_Entry); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SourceInfo_Extension); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*SourceInfo_Extension_Version); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
+ file_cel_expr_syntax_proto_msgTypes[1].OneofWrappers = []interface{}{
(*Expr_ConstExpr)(nil),
(*Expr_IdentExpr)(nil),
(*Expr_SelectExpr)(nil),
@@ -1358,7 +1596,7 @@ func file_cel_expr_syntax_proto_init() {
(*Expr_StructExpr)(nil),
(*Expr_ComprehensionExpr)(nil),
}
- file_cel_expr_syntax_proto_msgTypes[2].OneofWrappers = []any{
+ file_cel_expr_syntax_proto_msgTypes[2].OneofWrappers = []interface{}{
(*Constant_NullValue)(nil),
(*Constant_BoolValue)(nil),
(*Constant_Int64Value)(nil),
@@ -1369,7 +1607,7 @@ func file_cel_expr_syntax_proto_init() {
(*Constant_DurationValue)(nil),
(*Constant_TimestampValue)(nil),
}
- file_cel_expr_syntax_proto_msgTypes[10].OneofWrappers = []any{
+ file_cel_expr_syntax_proto_msgTypes[10].OneofWrappers = []interface{}{
(*Expr_CreateStruct_Entry_FieldKey)(nil),
(*Expr_CreateStruct_Entry_MapKey)(nil),
}
@@ -1377,7 +1615,7 @@ func file_cel_expr_syntax_proto_init() {
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
- RawDescriptor: unsafe.Slice(unsafe.StringData(file_cel_expr_syntax_proto_rawDesc), len(file_cel_expr_syntax_proto_rawDesc)),
+ RawDescriptor: file_cel_expr_syntax_proto_rawDesc,
NumEnums: 1,
NumMessages: 15,
NumExtensions: 0,
@@ -1389,6 +1627,7 @@ func file_cel_expr_syntax_proto_init() {
MessageInfos: file_cel_expr_syntax_proto_msgTypes,
}.Build()
File_cel_expr_syntax_proto = out.File
+ file_cel_expr_syntax_proto_rawDesc = nil
file_cel_expr_syntax_proto_goTypes = nil
file_cel_expr_syntax_proto_depIdxs = nil
}
diff --git a/vendor/cel.dev/expr/value.pb.go b/vendor/cel.dev/expr/value.pb.go
index 1f53a6a296..e5e29228c2 100644
--- a/vendor/cel.dev/expr/value.pb.go
+++ b/vendor/cel.dev/expr/value.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
-// protoc v5.27.1
+// protoc-gen-go v1.28.1
+// protoc v3.21.5
// source: cel/expr/value.proto
package expr
@@ -13,7 +13,6 @@ import (
structpb "google.golang.org/protobuf/types/known/structpb"
reflect "reflect"
sync "sync"
- unsafe "unsafe"
)
const (
@@ -24,8 +23,11 @@ const (
)
type Value struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- // Types that are valid to be assigned to Kind:
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ // Types that are assignable to Kind:
//
// *Value_NullValue
// *Value_BoolValue
@@ -39,16 +41,16 @@ type Value struct {
// *Value_MapValue
// *Value_ListValue
// *Value_TypeValue
- Kind isValue_Kind `protobuf_oneof:"kind"`
- unknownFields protoimpl.UnknownFields
- sizeCache protoimpl.SizeCache
+ Kind isValue_Kind `protobuf_oneof:"kind"`
}
func (x *Value) Reset() {
*x = Value{}
- mi := &file_cel_expr_value_proto_msgTypes[0]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_value_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *Value) String() string {
@@ -59,7 +61,7 @@ func (*Value) ProtoMessage() {}
func (x *Value) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_value_proto_msgTypes[0]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -74,117 +76,93 @@ func (*Value) Descriptor() ([]byte, []int) {
return file_cel_expr_value_proto_rawDescGZIP(), []int{0}
}
-func (x *Value) GetKind() isValue_Kind {
- if x != nil {
- return x.Kind
+func (m *Value) GetKind() isValue_Kind {
+ if m != nil {
+ return m.Kind
}
return nil
}
func (x *Value) GetNullValue() structpb.NullValue {
- if x != nil {
- if x, ok := x.Kind.(*Value_NullValue); ok {
- return x.NullValue
- }
+ if x, ok := x.GetKind().(*Value_NullValue); ok {
+ return x.NullValue
}
return structpb.NullValue(0)
}
func (x *Value) GetBoolValue() bool {
- if x != nil {
- if x, ok := x.Kind.(*Value_BoolValue); ok {
- return x.BoolValue
- }
+ if x, ok := x.GetKind().(*Value_BoolValue); ok {
+ return x.BoolValue
}
return false
}
func (x *Value) GetInt64Value() int64 {
- if x != nil {
- if x, ok := x.Kind.(*Value_Int64Value); ok {
- return x.Int64Value
- }
+ if x, ok := x.GetKind().(*Value_Int64Value); ok {
+ return x.Int64Value
}
return 0
}
func (x *Value) GetUint64Value() uint64 {
- if x != nil {
- if x, ok := x.Kind.(*Value_Uint64Value); ok {
- return x.Uint64Value
- }
+ if x, ok := x.GetKind().(*Value_Uint64Value); ok {
+ return x.Uint64Value
}
return 0
}
func (x *Value) GetDoubleValue() float64 {
- if x != nil {
- if x, ok := x.Kind.(*Value_DoubleValue); ok {
- return x.DoubleValue
- }
+ if x, ok := x.GetKind().(*Value_DoubleValue); ok {
+ return x.DoubleValue
}
return 0
}
func (x *Value) GetStringValue() string {
- if x != nil {
- if x, ok := x.Kind.(*Value_StringValue); ok {
- return x.StringValue
- }
+ if x, ok := x.GetKind().(*Value_StringValue); ok {
+ return x.StringValue
}
return ""
}
func (x *Value) GetBytesValue() []byte {
- if x != nil {
- if x, ok := x.Kind.(*Value_BytesValue); ok {
- return x.BytesValue
- }
+ if x, ok := x.GetKind().(*Value_BytesValue); ok {
+ return x.BytesValue
}
return nil
}
func (x *Value) GetEnumValue() *EnumValue {
- if x != nil {
- if x, ok := x.Kind.(*Value_EnumValue); ok {
- return x.EnumValue
- }
+ if x, ok := x.GetKind().(*Value_EnumValue); ok {
+ return x.EnumValue
}
return nil
}
func (x *Value) GetObjectValue() *anypb.Any {
- if x != nil {
- if x, ok := x.Kind.(*Value_ObjectValue); ok {
- return x.ObjectValue
- }
+ if x, ok := x.GetKind().(*Value_ObjectValue); ok {
+ return x.ObjectValue
}
return nil
}
func (x *Value) GetMapValue() *MapValue {
- if x != nil {
- if x, ok := x.Kind.(*Value_MapValue); ok {
- return x.MapValue
- }
+ if x, ok := x.GetKind().(*Value_MapValue); ok {
+ return x.MapValue
}
return nil
}
func (x *Value) GetListValue() *ListValue {
- if x != nil {
- if x, ok := x.Kind.(*Value_ListValue); ok {
- return x.ListValue
- }
+ if x, ok := x.GetKind().(*Value_ListValue); ok {
+ return x.ListValue
}
return nil
}
func (x *Value) GetTypeValue() string {
- if x != nil {
- if x, ok := x.Kind.(*Value_TypeValue); ok {
- return x.TypeValue
- }
+ if x, ok := x.GetKind().(*Value_TypeValue); ok {
+ return x.TypeValue
}
return ""
}
@@ -266,18 +244,21 @@ func (*Value_ListValue) isValue_Kind() {}
func (*Value_TypeValue) isValue_Kind() {}
type EnumValue struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
- Value int32 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"`
+ Value int32 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"`
}
func (x *EnumValue) Reset() {
*x = EnumValue{}
- mi := &file_cel_expr_value_proto_msgTypes[1]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_value_proto_msgTypes[1]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *EnumValue) String() string {
@@ -288,7 +269,7 @@ func (*EnumValue) ProtoMessage() {}
func (x *EnumValue) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_value_proto_msgTypes[1]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -318,17 +299,20 @@ func (x *EnumValue) GetValue() int32 {
}
type ListValue struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Values []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Values []*Value `protobuf:"bytes,1,rep,name=values,proto3" json:"values,omitempty"`
}
func (x *ListValue) Reset() {
*x = ListValue{}
- mi := &file_cel_expr_value_proto_msgTypes[2]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_value_proto_msgTypes[2]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *ListValue) String() string {
@@ -339,7 +323,7 @@ func (*ListValue) ProtoMessage() {}
func (x *ListValue) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_value_proto_msgTypes[2]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -362,17 +346,20 @@ func (x *ListValue) GetValues() []*Value {
}
type MapValue struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Entries []*MapValue_Entry `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Entries []*MapValue_Entry `protobuf:"bytes,1,rep,name=entries,proto3" json:"entries,omitempty"`
}
func (x *MapValue) Reset() {
*x = MapValue{}
- mi := &file_cel_expr_value_proto_msgTypes[3]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_value_proto_msgTypes[3]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *MapValue) String() string {
@@ -383,7 +370,7 @@ func (*MapValue) ProtoMessage() {}
func (x *MapValue) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_value_proto_msgTypes[3]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -406,18 +393,21 @@ func (x *MapValue) GetEntries() []*MapValue_Entry {
}
type MapValue_Entry struct {
- state protoimpl.MessageState `protogen:"open.v1"`
- Key *Value `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
- Value *Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
- unknownFields protoimpl.UnknownFields
+ state protoimpl.MessageState
sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Key *Value `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+ Value *Value `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
}
func (x *MapValue_Entry) Reset() {
*x = MapValue_Entry{}
- mi := &file_cel_expr_value_proto_msgTypes[4]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
+ if protoimpl.UnsafeEnabled {
+ mi := &file_cel_expr_value_proto_msgTypes[4]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
}
func (x *MapValue_Entry) String() string {
@@ -428,7 +418,7 @@ func (*MapValue_Entry) ProtoMessage() {}
func (x *MapValue_Entry) ProtoReflect() protoreflect.Message {
mi := &file_cel_expr_value_proto_msgTypes[4]
- if x != nil {
+ if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
@@ -459,58 +449,83 @@ func (x *MapValue_Entry) GetValue() *Value {
var File_cel_expr_value_proto protoreflect.FileDescriptor
-const file_cel_expr_value_proto_rawDesc = "" +
- "\n" +
- "\x14cel/expr/value.proto\x12\bcel.expr\x1a\x19google/protobuf/any.proto\x1a\x1cgoogle/protobuf/struct.proto\"\x9d\x04\n" +
- "\x05Value\x12;\n" +
- "\n" +
- "null_value\x18\x01 \x01(\x0e2\x1a.google.protobuf.NullValueH\x00R\tnullValue\x12\x1f\n" +
- "\n" +
- "bool_value\x18\x02 \x01(\bH\x00R\tboolValue\x12!\n" +
- "\vint64_value\x18\x03 \x01(\x03H\x00R\n" +
- "int64Value\x12#\n" +
- "\fuint64_value\x18\x04 \x01(\x04H\x00R\vuint64Value\x12#\n" +
- "\fdouble_value\x18\x05 \x01(\x01H\x00R\vdoubleValue\x12#\n" +
- "\fstring_value\x18\x06 \x01(\tH\x00R\vstringValue\x12!\n" +
- "\vbytes_value\x18\a \x01(\fH\x00R\n" +
- "bytesValue\x124\n" +
- "\n" +
- "enum_value\x18\t \x01(\v2\x13.cel.expr.EnumValueH\x00R\tenumValue\x129\n" +
- "\fobject_value\x18\n" +
- " \x01(\v2\x14.google.protobuf.AnyH\x00R\vobjectValue\x121\n" +
- "\tmap_value\x18\v \x01(\v2\x12.cel.expr.MapValueH\x00R\bmapValue\x124\n" +
- "\n" +
- "list_value\x18\f \x01(\v2\x13.cel.expr.ListValueH\x00R\tlistValue\x12\x1f\n" +
- "\n" +
- "type_value\x18\x0f \x01(\tH\x00R\ttypeValueB\x06\n" +
- "\x04kind\"5\n" +
- "\tEnumValue\x12\x12\n" +
- "\x04type\x18\x01 \x01(\tR\x04type\x12\x14\n" +
- "\x05value\x18\x02 \x01(\x05R\x05value\"4\n" +
- "\tListValue\x12'\n" +
- "\x06values\x18\x01 \x03(\v2\x0f.cel.expr.ValueR\x06values\"\x91\x01\n" +
- "\bMapValue\x122\n" +
- "\aentries\x18\x01 \x03(\v2\x18.cel.expr.MapValue.EntryR\aentries\x1aQ\n" +
- "\x05Entry\x12!\n" +
- "\x03key\x18\x01 \x01(\v2\x0f.cel.expr.ValueR\x03key\x12%\n" +
- "\x05value\x18\x02 \x01(\v2\x0f.cel.expr.ValueR\x05valueB-\n" +
- "\fdev.cel.exprB\n" +
- "ValueProtoP\x01Z\fcel.dev/expr\xf8\x01\x01b\x06proto3"
+var file_cel_expr_value_proto_rawDesc = []byte{
+ 0x0a, 0x14, 0x63, 0x65, 0x6c, 0x2f, 0x65, 0x78, 0x70, 0x72, 0x2f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72,
+ 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+ 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x67, 0x6f, 0x6f,
+ 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72,
+ 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9d, 0x04, 0x0a, 0x05, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x12, 0x3b, 0x0a, 0x0a, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75,
+ 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x4e, 0x75, 0x6c, 0x6c, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x09, 0x6e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
+ 0x12, 0x1f, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75,
+ 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x56,
+ 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x75, 0x69, 0x6e, 0x74, 0x36, 0x34, 0x5f, 0x76,
+ 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0b, 0x75, 0x69,
+ 0x6e, 0x74, 0x36, 0x34, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x64, 0x6f, 0x75,
+ 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x48,
+ 0x00, 0x52, 0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23,
+ 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06,
+ 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x62, 0x79, 0x74, 0x65, 0x73, 0x5f, 0x76, 0x61, 0x6c,
+ 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x0a, 0x62, 0x79, 0x74, 0x65,
+ 0x73, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x34, 0x0a, 0x0a, 0x65, 0x6e, 0x75, 0x6d, 0x5f, 0x76,
+ 0x61, 0x6c, 0x75, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x65, 0x6c,
+ 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x45, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48,
+ 0x00, 0x52, 0x09, 0x65, 0x6e, 0x75, 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x39, 0x0a, 0x0c,
+ 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0a, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x6f, 0x62, 0x6a, 0x65,
+ 0x63, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x31, 0x0a, 0x09, 0x6d, 0x61, 0x70, 0x5f, 0x76,
+ 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x63, 0x65, 0x6c,
+ 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x4d, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00,
+ 0x52, 0x08, 0x6d, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x34, 0x0a, 0x0a, 0x6c, 0x69,
+ 0x73, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13,
+ 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52, 0x09, 0x6c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65,
+ 0x12, 0x1f, 0x0a, 0x0a, 0x74, 0x79, 0x70, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0f,
+ 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x74, 0x79, 0x70, 0x65, 0x56, 0x61, 0x6c, 0x75,
+ 0x65, 0x42, 0x06, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x22, 0x35, 0x0a, 0x09, 0x45, 0x6e, 0x75,
+ 0x6d, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+ 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+ 0x22, 0x34, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x27, 0x0a,
+ 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
+ 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06,
+ 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x22, 0x91, 0x01, 0x0a, 0x08, 0x4d, 0x61, 0x70, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x12, 0x32, 0x0a, 0x07, 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x18, 0x01,
+ 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e,
+ 0x4d, 0x61, 0x70, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07,
+ 0x65, 0x6e, 0x74, 0x72, 0x69, 0x65, 0x73, 0x1a, 0x51, 0x0a, 0x05, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x12, 0x21, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
+ 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x03,
+ 0x6b, 0x65, 0x79, 0x12, 0x25, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x2e, 0x56, 0x61,
+ 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x2d, 0x0a, 0x0c, 0x64, 0x65,
+ 0x76, 0x2e, 0x63, 0x65, 0x6c, 0x2e, 0x65, 0x78, 0x70, 0x72, 0x42, 0x0a, 0x56, 0x61, 0x6c, 0x75,
+ 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x0c, 0x63, 0x65, 0x6c, 0x2e, 0x64, 0x65,
+ 0x76, 0x2f, 0x65, 0x78, 0x70, 0x72, 0xf8, 0x01, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+ 0x33,
+}
var (
file_cel_expr_value_proto_rawDescOnce sync.Once
- file_cel_expr_value_proto_rawDescData []byte
+ file_cel_expr_value_proto_rawDescData = file_cel_expr_value_proto_rawDesc
)
func file_cel_expr_value_proto_rawDescGZIP() []byte {
file_cel_expr_value_proto_rawDescOnce.Do(func() {
- file_cel_expr_value_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_cel_expr_value_proto_rawDesc), len(file_cel_expr_value_proto_rawDesc)))
+ file_cel_expr_value_proto_rawDescData = protoimpl.X.CompressGZIP(file_cel_expr_value_proto_rawDescData)
})
return file_cel_expr_value_proto_rawDescData
}
var file_cel_expr_value_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_cel_expr_value_proto_goTypes = []any{
+var file_cel_expr_value_proto_goTypes = []interface{}{
(*Value)(nil), // 0: cel.expr.Value
(*EnumValue)(nil), // 1: cel.expr.EnumValue
(*ListValue)(nil), // 2: cel.expr.ListValue
@@ -541,7 +556,69 @@ func file_cel_expr_value_proto_init() {
if File_cel_expr_value_proto != nil {
return
}
- file_cel_expr_value_proto_msgTypes[0].OneofWrappers = []any{
+ if !protoimpl.UnsafeEnabled {
+ file_cel_expr_value_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*Value); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_value_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*EnumValue); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_value_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*ListValue); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_value_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MapValue); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_cel_expr_value_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*MapValue_Entry); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ }
+ file_cel_expr_value_proto_msgTypes[0].OneofWrappers = []interface{}{
(*Value_NullValue)(nil),
(*Value_BoolValue)(nil),
(*Value_Int64Value)(nil),
@@ -559,7 +636,7 @@ func file_cel_expr_value_proto_init() {
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
- RawDescriptor: unsafe.Slice(unsafe.StringData(file_cel_expr_value_proto_rawDesc), len(file_cel_expr_value_proto_rawDesc)),
+ RawDescriptor: file_cel_expr_value_proto_rawDesc,
NumEnums: 0,
NumMessages: 5,
NumExtensions: 0,
@@ -570,6 +647,7 @@ func file_cel_expr_value_proto_init() {
MessageInfos: file_cel_expr_value_proto_msgTypes,
}.Build()
File_cel_expr_value_proto = out.File
+ file_cel_expr_value_proto_rawDesc = nil
file_cel_expr_value_proto_goTypes = nil
file_cel_expr_value_proto_depIdxs = nil
}
diff --git a/vendor/github.com/gophercloud/gophercloud/.gitignore b/vendor/github.com/gophercloud/gophercloud/.gitignore
new file mode 100644
index 0000000000..d7a5e5293a
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/.gitignore
@@ -0,0 +1,4 @@
+**/*.swp
+.idea
+.vscode
+testing_*.coverprofile
diff --git a/vendor/github.com/gophercloud/gophercloud/CHANGELOG.md b/vendor/github.com/gophercloud/gophercloud/CHANGELOG.md
new file mode 100644
index 0000000000..b19b5e7753
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/CHANGELOG.md
@@ -0,0 +1,956 @@
+## v1.14.1 (2024-09-18)
+
+* [GH-3162](https://github.com/gophercloud/gophercloud/pull/3162) Fix security group rule "any protocol"
+
+## v1.14.0 (2024-07-24)
+
+* [GH-3095](https://github.com/gophercloud/gophercloud/pull/3095) [neutron]: introduce Description argument for the portforwarding
+* [GH-3098](https://github.com/gophercloud/gophercloud/pull/3098) [neutron]: introduce Stateful argument for the security groups
+* [GH-3099](https://github.com/gophercloud/gophercloud/pull/3099) [networking]: subnet add field dns_publish_fixed_ip
+
+## v1.13.0 (2024-07-08)
+
+* [GH-3044](https://github.com/gophercloud/gophercloud/pull/3044) [v1] Add ci jobs for openstack caracal
+* [GH-3073](https://github.com/gophercloud/gophercloud/pull/3073) [v1] Adding missing QoS field for router
+* [GH-3080](https://github.com/gophercloud/gophercloud/pull/3080) [networking]: add BGP VPNs support (backport to 1.x)
+
+## v1.12.0 (2024-05-27)
+
+* [GH-2979](https://github.com/gophercloud/gophercloud/pull/2979) [v1] CI backports
+* [GH-2985](https://github.com/gophercloud/gophercloud/pull/2985) [v1] baremetal: fix handling of the "fields" query argument
+* [GH-2989](https://github.com/gophercloud/gophercloud/pull/2989) [v1] [CI] Fix portbiding tests
+* [GH-2992](https://github.com/gophercloud/gophercloud/pull/2992) [v1] [CI] Fix portbiding tests
+* [GH-2993](https://github.com/gophercloud/gophercloud/pull/2993) [v1] build(deps): bump EmilienM/devstack-action from 0.14 to 0.15
+* [GH-2998](https://github.com/gophercloud/gophercloud/pull/2998) [v1] testhelper: mark all helpers with t.Helper
+* [GH-3043](https://github.com/gophercloud/gophercloud/pull/3043) [v1] CI: remove Zed from testing coverage
+
+## v1.11.0 (2024-03-07)
+
+This version reverts the inclusion of Context in the v1 branch. This inclusion
+didn't add much value because no packages were using it; on the other hand, it
+introduced a bug when using the Context property of the Provider client.
+
+## v1.10.0 (2024-02-27) **RETRACTED**: see https://github.com/gophercloud/gophercloud/issues/2969
+
+* [GH-2893](https://github.com/gophercloud/gophercloud/pull/2893) [v1] authentication: Add WithContext functions
+* [GH-2894](https://github.com/gophercloud/gophercloud/pull/2894) [v1] pager: Add WithContext functions
+* [GH-2899](https://github.com/gophercloud/gophercloud/pull/2899) [v1] Authenticate with a clouds.yaml
+* [GH-2917](https://github.com/gophercloud/gophercloud/pull/2917) [v1] Add ParseOption type to made clouds.Parse() more usable for optional With* funcs
+* [GH-2924](https://github.com/gophercloud/gophercloud/pull/2924) [v1] build(deps): bump EmilienM/devstack-action from 0.11 to 0.14
+* [GH-2933](https://github.com/gophercloud/gophercloud/pull/2933) [v1] Fix AllowReauth reauthentication
+* [GH-2950](https://github.com/gophercloud/gophercloud/pull/2950) [v1] compute: Use volumeID, not attachmentID for volume attachments
+
+## v1.9.0 (2024-02-02) **RETRACTED**: see https://github.com/gophercloud/gophercloud/issues/2969
+
+New features and improvements:
+
+* [GH-2884](https://github.com/gophercloud/gophercloud/pull/2884) [v1] Context-aware methods to ProviderClient and ServiceClient
+* [GH-2887](https://github.com/gophercloud/gophercloud/pull/2887) [v1] Add support of Flavors and FlavorProfiles for Octavia
+* [GH-2875](https://github.com/gophercloud/gophercloud/pull/2875) [v1] [db/v1/instance]: adding support for availability_zone for a db instance
+
+CI changes:
+
+* [GH-2856](https://github.com/gophercloud/gophercloud/pull/2856) [v1] Fix devstack install on EOL magnum branches
+* [GH-2857](https://github.com/gophercloud/gophercloud/pull/2857) [v1] Fix networking acceptance tests
+* [GH-2858](https://github.com/gophercloud/gophercloud/pull/2858) [v1] build(deps): bump actions/upload-artifact from 3 to 4
+* [GH-2859](https://github.com/gophercloud/gophercloud/pull/2859) [v1] build(deps): bump github/codeql-action from 2 to 3
+
+## v1.8.0 (2023-11-30)
+
+New features and improvements:
+
+* [GH-2800](https://github.com/gophercloud/gophercloud/pull/2800) [v1] Fix options initialization in ServiceClient.Request (fixes #2798)
+* [GH-2823](https://github.com/gophercloud/gophercloud/pull/2823) [v1] Add more godoc to GuestFormat
+* [GH-2826](https://github.com/gophercloud/gophercloud/pull/2826) Allow objects.CreateTempURL with names containing /v1/
+
+CI changes:
+
+* [GH-2802](https://github.com/gophercloud/gophercloud/pull/2802) [v1] Add job for bobcat stable/2023.2
+* [GH-2819](https://github.com/gophercloud/gophercloud/pull/2819) [v1] Test files alongside code
+* [GH-2814](https://github.com/gophercloud/gophercloud/pull/2814) Make fixtures part of tests
+* [GH-2796](https://github.com/gophercloud/gophercloud/pull/2796) [v1] ci/unit: switch to coverallsapp/github-action
+* [GH-2840](https://github.com/gophercloud/gophercloud/pull/2840) unit tests: Fix the installation of tools
+
+## v1.7.0 (2023-09-22)
+
+New features and improvements:
+
+* [GH-2782](https://github.com/gophercloud/gophercloud/pull/2782) [v1] (manual clean backport) Add tag field to compute block_device_v2
+
+CI changes:
+
+* [GH-2760](https://github.com/gophercloud/gophercloud/pull/2760) [v1 backports] semver auto labels
+* [GH-2775](https://github.com/gophercloud/gophercloud/pull/2775) [v1] Fix typos in comments
+* [GH-2783](https://github.com/gophercloud/gophercloud/pull/2783) [v1] (clean manual backport) ci/functional: fix ubuntu version & add antelope
+* [GH-2785](https://github.com/gophercloud/gophercloud/pull/2785) [v1] Acceptance: Handle numerical version names in version comparison helpers
+* [GH-2787](https://github.com/gophercloud/gophercloud/pull/2787) backport-v1: fixes to semver label
+* [GH-2788](https://github.com/gophercloud/gophercloud/pull/2788) [v1] Make acceptance tests internal
+
+
+## v1.6.0 (2023-08-30)
+
+New features and improvements:
+
+* [GH-2712](https://github.com/gophercloud/gophercloud/pull/2712) [v1] README: minor change to test backport workflow
+* [GH-2713](https://github.com/gophercloud/gophercloud/pull/2713) [v1] tests: run MultiAttach with a capable Cinder Type
+* [GH-2714](https://github.com/gophercloud/gophercloud/pull/2714) [v1] Add CRUD support for encryption in volume v3 types
+* [GH-2715](https://github.com/gophercloud/gophercloud/pull/2715) [v1] Add projectID to fwaas_v2 policy CreateOpts and ListOpts
+* [GH-2716](https://github.com/gophercloud/gophercloud/pull/2716) [v1] Add projectID to fwaas_v2 CreateOpts
+* [GH-2717](https://github.com/gophercloud/gophercloud/pull/2717) [v1] [manila]: add reset and force delete actions to a snapshot
+* [GH-2718](https://github.com/gophercloud/gophercloud/pull/2718) [v1] [cinder]: add reset and force delete actions to volumes and snapshots
+* [GH-2721](https://github.com/gophercloud/gophercloud/pull/2721) [v1] orchestration: Explicit error in optionsmap creation
+* [GH-2723](https://github.com/gophercloud/gophercloud/pull/2723) [v1] Add conductor API to Baremetal V1
+* [GH-2729](https://github.com/gophercloud/gophercloud/pull/2729) [v1] networking/v2/ports: allow list filter by security group
+
+CI changes:
+
+* [GH-2675](https://github.com/gophercloud/gophercloud/pull/2675) [v1][CI] Drop periodic jobs from stable branch
+* [GH-2683](https://github.com/gophercloud/gophercloud/pull/2683) [v1] CI tweaks
+
+
+## v1.5.0 (2023-06-21)
+
+New features and improvements:
+
+* [GH-2634](https://github.com/gophercloud/gophercloud/pull/2634) baremetal: update inspection inventory with recent additions
+* [GH-2635](https://github.com/gophercloud/gophercloud/pull/2635) [manila]: Add Share Replicas support
+* [GH-2637](https://github.com/gophercloud/gophercloud/pull/2637) [FWaaS_v2]: Add FWaaS_V2 workflow and enable tests
+* [GH-2639](https://github.com/gophercloud/gophercloud/pull/2639) Implement errors.Unwrap() on unexpected status code errors
+* [GH-2648](https://github.com/gophercloud/gophercloud/pull/2648) [manila]: implement share transfer API
+
+
+## v1.4.0 (2023-05-25)
+
+New features and improvements:
+
+* [GH-2465](https://github.com/gophercloud/gophercloud/pull/2465) keystone: add v3 limits update operation
+* [GH-2596](https://github.com/gophercloud/gophercloud/pull/2596) keystone: add v3 limits get operation
+* [GH-2618](https://github.com/gophercloud/gophercloud/pull/2618) keystone: add v3 limits delete operation
+* [GH-2616](https://github.com/gophercloud/gophercloud/pull/2616) Add CRUD support for register limit APIs
+* [GH-2610](https://github.com/gophercloud/gophercloud/pull/2610) Add PUT/HEAD/DELETE for identity/v3/OS-INHERIT
+* [GH-2597](https://github.com/gophercloud/gophercloud/pull/2597) Add validation and optimise objects.BulkDelete
+* [GH-2602](https://github.com/gophercloud/gophercloud/pull/2602) [swift v1]: introduce a TempURLKey argument for objects.CreateTempURLOpts struct
+* [GH-2623](https://github.com/gophercloud/gophercloud/pull/2623) Add the ability to remove ingress/egress policies from fwaas_v2 groups
+* [GH-2625](https://github.com/gophercloud/gophercloud/pull/2625) neutron: Support trunk_details extension
+
+CI changes:
+
+* [GH-2608](https://github.com/gophercloud/gophercloud/pull/2608) Drop train and ussuri jobs
+* [GH-2589](https://github.com/gophercloud/gophercloud/pull/2589) Bump EmilienM/devstack-action from 0.10 to 0.11
+* [GH-2604](https://github.com/gophercloud/gophercloud/pull/2604) Bump mheap/github-action-required-labels from 3 to 4
+* [GH-2620](https://github.com/gophercloud/gophercloud/pull/2620) Pin goimport dep to a version that works with go 1.14
+* [GH-2619](https://github.com/gophercloud/gophercloud/pull/2619) Fix version comparison for acceptance tests
+* [GH-2627](https://github.com/gophercloud/gophercloud/pull/2627) Limits: Fix ToDo to create registered limit and use it
+* [GH-2629](https://github.com/gophercloud/gophercloud/pull/2629) [manila]: Add share from snapshot restore functional test
+
+
+## v1.3.0 (2023-03-28)
+
+* [GH-2464](https://github.com/gophercloud/gophercloud/pull/2464) keystone: add v3 limits create operation
+* [GH-2512](https://github.com/gophercloud/gophercloud/pull/2512) Manila: add List for share-access-rules API
+* [GH-2529](https://github.com/gophercloud/gophercloud/pull/2529) Added target state "rebuild" for Ironic nodes
+* [GH-2539](https://github.com/gophercloud/gophercloud/pull/2539) Add release instructions
+* [GH-2540](https://github.com/gophercloud/gophercloud/pull/2540) [all] IsEmpty to check for HTTP status 204
+* [GH-2543](https://github.com/gophercloud/gophercloud/pull/2543) keystone: add v3 OS-FEDERATION mappings get operation
+* [GH-2545](https://github.com/gophercloud/gophercloud/pull/2545) baremetal: add inspection_{started,finished}_at to Node
+* [GH-2546](https://github.com/gophercloud/gophercloud/pull/2546) Drop train job for baremetal
+* [GH-2549](https://github.com/gophercloud/gophercloud/pull/2549) objects: Clarify ExtractContent usage
+* [GH-2550](https://github.com/gophercloud/gophercloud/pull/2550) keystone: add v3 OS-FEDERATION mappings update operation
+* [GH-2552](https://github.com/gophercloud/gophercloud/pull/2552) objectstorage: Reject container names with a slash
+* [GH-2555](https://github.com/gophercloud/gophercloud/pull/2555) nova: introduce servers.ListSimple along with the more detailed servers.List
+* [GH-2558](https://github.com/gophercloud/gophercloud/pull/2558) Expand docs on 'clientconfig' usage
+* [GH-2563](https://github.com/gophercloud/gophercloud/pull/2563) Support propagate_uplink_status for Ports
+* [GH-2567](https://github.com/gophercloud/gophercloud/pull/2567) Fix invalid baremetal-introspection service type
+* [GH-2568](https://github.com/gophercloud/gophercloud/pull/2568) Prefer github mirrors over opendev repos
+* [GH-2571](https://github.com/gophercloud/gophercloud/pull/2571) Swift V1: support object versioning
+* [GH-2572](https://github.com/gophercloud/gophercloud/pull/2572) networking v2: add extraroutes Add and Remove methods
+* [GH-2573](https://github.com/gophercloud/gophercloud/pull/2573) Enable tests for object versioning
+* [GH-2576](https://github.com/gophercloud/gophercloud/pull/2576) keystone: add v3 OS-FEDERATION mappings delete operation
+* [GH-2578](https://github.com/gophercloud/gophercloud/pull/2578) Add periodic jobs for OpenStack zed release and reduce periodic jobs frequency
+* [GH-2580](https://github.com/gophercloud/gophercloud/pull/2580) [neutron v2]: Add support for network segments update
+* [GH-2583](https://github.com/gophercloud/gophercloud/pull/2583) Add missing rule protocol constants for IPIP
+* [GH-2584](https://github.com/gophercloud/gophercloud/pull/2584) CI: workaround mongodb dependency for messaging and clustering master jobs
+* [GH-2587](https://github.com/gophercloud/gophercloud/pull/2587) fix: Incorrect Documentation
+* [GH-2593](https://github.com/gophercloud/gophercloud/pull/2593) Make TestMTUNetworkCRUDL deterministic
+* [GH-2594](https://github.com/gophercloud/gophercloud/pull/2594) Bump actions/setup-go from 3 to 4
+
+
+## v1.2.0 (2023-01-27)
+
+Starting with this version, Gophercloud sends its actual version in the
+user-agent string in the format `gophercloud/v1.2.0`. It no longer sends the
+hardcoded string `gophercloud/2.0.0`.
+
+* [GH-2542](https://github.com/gophercloud/gophercloud/pull/2542) Add field hidden in containerinfra/v1/clustertemplates
+* [GH-2537](https://github.com/gophercloud/gophercloud/pull/2537) Support value_specs for Ports
+* [GH-2530](https://github.com/gophercloud/gophercloud/pull/2530) keystone: add v3 OS-FEDERATION mappings create operation
+* [GH-2519](https://github.com/gophercloud/gophercloud/pull/2519) Modify user-agent header to ensure current gophercloud version is provided
+
+## v1.1.1 (2022-12-07)
+
+The GOPROXY cache for v1.1.0 was corrupted with a tag pointing to the wrong commit. This release fixes the problem by exposing a new release with the same content.
+
+Please use `v1.1.1` instead of `v1.1.0` to avoid cache issues.
+
+## v1.1.0 (2022-11-24)
+
+* [GH-2513](https://github.com/gophercloud/gophercloud/pull/2513) objectstorage: Do not parse NoContent responses
+* [GH-2503](https://github.com/gophercloud/gophercloud/pull/2503) Bump golang.org/x/crypto
+* [GH-2501](https://github.com/gophercloud/gophercloud/pull/2501) Staskraev/l3 agent scheduler
+* [GH-2496](https://github.com/gophercloud/gophercloud/pull/2496) Manila: add Get for share-access-rules API
+* [GH-2491](https://github.com/gophercloud/gophercloud/pull/2491) Add VipQosPolicyID to loadbalancer Create and Update
+* [GH-2488](https://github.com/gophercloud/gophercloud/pull/2488) Add Persistance for octavia pools.UpdateOpts
+* [GH-2487](https://github.com/gophercloud/gophercloud/pull/2487) Add Prometheus protocol for octavia listeners
+* [GH-2482](https://github.com/gophercloud/gophercloud/pull/2482) Add createdAt, updatedAt and provisionUpdatedAt fields in Baremetal V1 nodes
+* [GH-2479](https://github.com/gophercloud/gophercloud/pull/2479) Add service_types support for neutron subnet
+* [GH-2477](https://github.com/gophercloud/gophercloud/pull/2477) Port CreatedAt and UpdatedAt: add back JSON tags
+* [GH-2475](https://github.com/gophercloud/gophercloud/pull/2475) Support old time format for port CreatedAt and UpdatedAt
+* [GH-2474](https://github.com/gophercloud/gophercloud/pull/2474) Implementing re-image volumeaction
+* [GH-2470](https://github.com/gophercloud/gophercloud/pull/2470) keystone: add v3 limits GetEnforcementModel operation
+* [GH-2468](https://github.com/gophercloud/gophercloud/pull/2468) keystone: add v3 OS-FEDERATION extension List Mappings
+* [GH-2458](https://github.com/gophercloud/gophercloud/pull/2458) Fix typo in blockstorage/v3/attachments docs
+* [GH-2456](https://github.com/gophercloud/gophercloud/pull/2456) Add support for Update for flavors
+* [GH-2453](https://github.com/gophercloud/gophercloud/pull/2453) Add description to flavor
+* [GH-2417](https://github.com/gophercloud/gophercloud/pull/2417) Neutron v2: ScheduleBGPSpeakerOpts, RemoveBGPSpeaker, Lis…
+
+## 1.0.0 (2022-08-29)
+
+UPGRADE NOTES + PROMISE OF COMPATIBILITY
+
+* Introducing Gophercloud v1! Like for every other release so far, all clients will upgrade automatically with `go get -d github.com/gophercloud/gophercloud` unless the dependency is pinned in `go.mod`.
+* Gophercloud v1 comes with a promise of compatibility: no breaking changes are expected to merge before v2.0.0.
+
+IMPROVEMENTS
+
+* Added `compute.v2/extensions/services.Delete` [GH-2427](https://github.com/gophercloud/gophercloud/pull/2427)
+* Added support for `standard-attr-revisions` to `networking/v2/networks`, `networking/v2/ports`, and `networking/v2/subnets` [GH-2437](https://github.com/gophercloud/gophercloud/pull/2437)
+* Added `updated_at` and `created_at` fields to `networking/v2/ports.Port` [GH-2445](https://github.com/gophercloud/gophercloud/pull/2445)
+
+## 0.25.0 (May 30, 2022)
+
+BREAKING CHANGES
+
+* Replaced `blockstorage/noauth.NewBlockStorageNoAuth` with `NewBlockStorageNoAuthV2` and `NewBlockStorageNoAuthV3` [GH-2343](https://github.com/gophercloud/gophercloud/pull/2343)
+* Renamed `blockstorage/extensions/schedulerstats.Capabilities`'s `GoodnessFuction` field to `GoodnessFunction` [GH-2346](https://github.com/gophercloud/gophercloud/pull/2346)
+
+IMPROVEMENTS
+
+* Added `RequestOpts.OmitHeaders` to provider client [GH-2315](https://github.com/gophercloud/gophercloud/pull/2315)
+* Added `identity/v3/extensions/projectendpoints.List` [GH-2304](https://github.com/gophercloud/gophercloud/pull/2304)
+* Added `identity/v3/extensions/projectendpoints.Create` [GH-2304](https://github.com/gophercloud/gophercloud/pull/2304)
+* Added `identity/v3/extensions/projectendpoints.Delete` [GH-2304](https://github.com/gophercloud/gophercloud/pull/2304)
+* Added protocol `any` to `networking/v2/extensions/security/rules.Create` [GH-2310](https://github.com/gophercloud/gophercloud/pull/2310)
+* Added `REDIRECT_PREFIX` and `REDIRECT_HTTP_CODE` to `loadbalancer/v2/l7policies.Create` [GH-2324](https://github.com/gophercloud/gophercloud/pull/2324)
+* Added `SOURCE_IP_PORT` LB method to `loadbalancer/v2/pools.Create` [GH-2300](https://github.com/gophercloud/gophercloud/pull/2300)
+* Added `AllocatedCapacityGB` capability to `blockstorage/extensions/schedulerstats.Capabilities` [GH-2348](https://github.com/gophercloud/gophercloud/pull/2348)
+* Added `Metadata` to `dns/v2/recordset.RecordSet` [GH-2353](https://github.com/gophercloud/gophercloud/pull/2353)
+* Added missing fields to `compute/v2/extensions/servergroups.List` [GH-2355](https://github.com/gophercloud/gophercloud/pull/2355)
+* Added missing labels fields to `containerinfra/v1/nodegroups` [GH-2377](https://github.com/gophercloud/gophercloud/pull/2377)
+* Added missing fields to `loadbalancer/v2/listeners.Listener` [GH-2407](https://github.com/gophercloud/gophercloud/pull/2407)
+* Added `identity/v3/limits.List` [GH-2360](https://github.com/gophercloud/gophercloud/pull/2360)
+* Added `ParentProviderUUID` to `placement/v1/resourceproviders.Create` [GH-2356](https://github.com/gophercloud/gophercloud/pull/2356)
+* Added `placement/v1/resourceproviders.Delete` [GH-2357](https://github.com/gophercloud/gophercloud/pull/2357)
+* Added `placement/v1/resourceproviders.Get` [GH-2358](https://github.com/gophercloud/gophercloud/pull/2358)
+* Added `placement/v1/resourceproviders.Update` [GH-2359](https://github.com/gophercloud/gophercloud/pull/2359)
+* Added `networking/v2/extensions/bgp/peers.List` [GH-2241](https://github.com/gophercloud/gophercloud/pull/2241)
+* Added `networking/v2/extensions/bgp/peers.Get` [GH-2241](https://github.com/gophercloud/gophercloud/pull/2241)
+* Added `networking/v2/extensions/bgp/peers.Create` [GH-2388](https://github.com/gophercloud/gophercloud/pull/2388)
+* Added `networking/v2/extensions/bgp/peers.Delete` [GH-2388](https://github.com/gophercloud/gophercloud/pull/2388)
+* Added `networking/v2/extensions/bgp/peers.Update` [GH-2396](https://github.com/gophercloud/gophercloud/pull/2396)
+* Added `networking/v2/extensions/bgp/speakers.Create` [GH-2395](https://github.com/gophercloud/gophercloud/pull/2395)
+* Added `networking/v2/extensions/bgp/speakers.Delete` [GH-2395](https://github.com/gophercloud/gophercloud/pull/2395)
+* Added `networking/v2/extensions/bgp/speakers.Update` [GH-2400](https://github.com/gophercloud/gophercloud/pull/2400)
+* Added `networking/v2/extensions/bgp/speakers.AddBGPPeer` [GH-2400](https://github.com/gophercloud/gophercloud/pull/2400)
+* Added `networking/v2/extensions/bgp/speakers.RemoveBGPPeer` [GH-2400](https://github.com/gophercloud/gophercloud/pull/2400)
+* Added `networking/v2/extensions/bgp/speakers.GetAdvertisedRoutes` [GH-2406](https://github.com/gophercloud/gophercloud/pull/2406)
+* Added `networking/v2/extensions/bgp/speakers.AddGatewayNetwork` [GH-2406](https://github.com/gophercloud/gophercloud/pull/2406)
+* Added `networking/v2/extensions/bgp/speakers.RemoveGatewayNetwork` [GH-2406](https://github.com/gophercloud/gophercloud/pull/2406)
+* Added `baremetal/v1/nodes.SetMaintenance` and `baremetal/v1/nodes.UnsetMaintenance` [GH-2384](https://github.com/gophercloud/gophercloud/pull/2384)
+* Added `sharedfilesystems/v2/services.List` [GH-2350](https://github.com/gophercloud/gophercloud/pull/2350)
+* Added `sharedfilesystems/v2/schedulerstats.List` [GH-2350](https://github.com/gophercloud/gophercloud/pull/2350)
+* Added `sharedfilesystems/v2/schedulerstats.ListDetail` [GH-2350](https://github.com/gophercloud/gophercloud/pull/2350)
+* Added ability to handle 502 and 504 errors [GH-2245](https://github.com/gophercloud/gophercloud/pull/2245)
+* Added `IncludeSubtree` to `identity/v3/roles.ListAssignments` [GH-2411](https://github.com/gophercloud/gophercloud/pull/2411)
+
+## 0.24.0 (December 13, 2021)
+
+UPGRADE NOTES
+
+* Set Go minimum version to 1.14 [GH-2294](https://github.com/gophercloud/gophercloud/pull/2294)
+
+IMPROVEMENTS
+
+* Added `blockstorage/v3/qos.Get` [GH-2283](https://github.com/gophercloud/gophercloud/pull/2283)
+* Added `blockstorage/v3/qos.Update` [GH-2283](https://github.com/gophercloud/gophercloud/pull/2283)
+* Added `blockstorage/v3/qos.DeleteKeys` [GH-2283](https://github.com/gophercloud/gophercloud/pull/2283)
+* Added `blockstorage/v3/qos.Associate` [GH-2284](https://github.com/gophercloud/gophercloud/pull/2284)
+* Added `blockstorage/v3/qos.Disassociate` [GH-2284](https://github.com/gophercloud/gophercloud/pull/2284)
+* Added `blockstorage/v3/qos.DisassociateAll` [GH-2284](https://github.com/gophercloud/gophercloud/pull/2284)
+* Added `blockstorage/v3/qos.ListAssociations` [GH-2284](https://github.com/gophercloud/gophercloud/pull/2284)
+
+## 0.23.0 (November 12, 2021)
+
+IMPROVEMENTS
+
+* Added `networking/v2/extensions/agents.ListBGPSpeakers` [GH-2229](https://github.com/gophercloud/gophercloud/pull/2229)
+* Added `networking/v2/extensions/bgp/speakers.BGPSpeaker` [GH-2229](https://github.com/gophercloud/gophercloud/pull/2229)
+* Added `identity/v3/roles.Project.Domain` [GH-2235](https://github.com/gophercloud/gophercloud/pull/2235)
+* Added `identity/v3/roles.User.Domain` [GH-2235](https://github.com/gophercloud/gophercloud/pull/2235)
+* Added `identity/v3/roles.Group.Domain` [GH-2235](https://github.com/gophercloud/gophercloud/pull/2235)
+* Added `loadbalancer/v2/pools.CreateOpts.Tags` [GH-2237](https://github.com/gophercloud/gophercloud/pull/2237)
+* Added `loadbalancer/v2/pools.UpdateOpts.Tags` [GH-2237](https://github.com/gophercloud/gophercloud/pull/2237)
+* Added `loadbalancer/v2/pools.Pool.Tags` [GH-2237](https://github.com/gophercloud/gophercloud/pull/2237)
+* Added `networking/v2/extensions/bgp/speakers.List` [GH-2238](https://github.com/gophercloud/gophercloud/pull/2238)
+* Added `networking/v2/extensions/bgp/speakers.Get` [GH-2238](https://github.com/gophercloud/gophercloud/pull/2238)
+* Added `compute/v2/extensions/keypairs.CreateOpts.Type` [GH-2231](https://github.com/gophercloud/gophercloud/pull/2231)
+* When doing Keystone re-authentification, keep the error if it failed [GH-2259](https://github.com/gophercloud/gophercloud/pull/2259)
+* Added new loadbalancer pool monitor types (TLS-HELLO, UDP-CONNECT and SCTP) [GH-2237](https://github.com/gophercloud/gophercloud/pull/2261)
+
+## 0.22.0 (October 7, 2021)
+
+BREAKING CHANGES
+
+* The types of several Object Storage Update fields have been changed to pointers in order to allow the value to be unset via the HTTP headers:
+ * `objectstorage/v1/accounts.UpdateOpts.ContentType`
+ * `objectstorage/v1/accounts.UpdateOpts.DetectContentType`
+ * `objectstorage/v1/containers.UpdateOpts.ContainerRead`
+ * `objectstorage/v1/containers.UpdateOpts.ContainerSyncTo`
+ * `objectstorage/v1/containers.UpdateOpts.ContainerSyncKey`
+ * `objectstorage/v1/containers.UpdateOpts.ContainerWrite`
+ * `objectstorage/v1/containers.UpdateOpts.ContentType`
+ * `objectstorage/v1/containers.UpdateOpts.DetectContentType`
+ * `objectstorage/v1/objects.UpdateOpts.ContentDisposition`
+ * `objectstorage/v1/objects.UpdateOpts.ContentEncoding`
+ * `objectstorage/v1/objects.UpdateOpts.ContentType`
+ * `objectstorage/v1/objects.UpdateOpts.DeleteAfter`
+ * `objectstorage/v1/objects.UpdateOpts.DeleteAt`
+ * `objectstorage/v1/objects.UpdateOpts.DetectContentType`
+
+BUG FIXES
+
+* Fixed issue with not being able to unset Object Storage values via HTTP headers [GH-2218](https://github.com/gophercloud/gophercloud/pull/2218)
+
+IMPROVEMENTS
+
+* Added `compute/v2/servers.Server.ServerGroups` [GH-2217](https://github.com/gophercloud/gophercloud/pull/2217)
+* Added `imageservice/v2/images.ReplaceImageProtected` to allow the `protected` field to be updated [GH-2221](https://github.com/gophercloud/gophercloud/pull/2221)
+* More details added to the 404/Not Found error message [GH-2223](https://github.com/gophercloud/gophercloud/pull/2223)
+* Added `openstack/baremetal/v1/nodes.CreateSubscriptionOpts.HttpHeaders` [GH-2224](https://github.com/gophercloud/gophercloud/pull/2224)
+
+## 0.21.0 (September 14, 2021)
+
+IMPROVEMENTS
+
+* Added `blockstorage/extensions/volumehost` [GH-2212](https://github.com/gophercloud/gophercloud/pull/2212)
+* Added `loadbalancer/v2/listeners.CreateOpts.Tags` [GH-2214](https://github.com/gophercloud/gophercloud/pull/2214)
+* Added `loadbalancer/v2/listeners.UpdateOpts.Tags` [GH-2214](https://github.com/gophercloud/gophercloud/pull/2214)
+* Added `loadbalancer/v2/listeners.Listener.Tags` [GH-2214](https://github.com/gophercloud/gophercloud/pull/2214)
+
+## 0.20.0 (August 10, 2021)
+
+IMPROVEMENTS
+
+* Added `RetryFunc` to enable custom retry functions. [GH-2194](https://github.com/gophercloud/gophercloud/pull/2194)
+* Added `openstack/baremetal/v1/nodes.GetVendorPassthruMethods` [GH-2201](https://github.com/gophercloud/gophercloud/pull/2201)
+* Added `openstack/baremetal/v1/nodes.GetAllSubscriptions` [GH-2201](https://github.com/gophercloud/gophercloud/pull/2201)
+* Added `openstack/baremetal/v1/nodes.GetSubscription` [GH-2201](https://github.com/gophercloud/gophercloud/pull/2201)
+* Added `openstack/baremetal/v1/nodes.DeleteSubscription` [GH-2201](https://github.com/gophercloud/gophercloud/pull/2201)
+* Added `openstack/baremetal/v1/nodes.CreateSubscription` [GH-2201](https://github.com/gophercloud/gophercloud/pull/2201)
+
+## 0.19.0 (July 22, 2021)
+
+NOTES / BREAKING CHANGES
+
+* `compute/v2/extensions/keypairs.List` now takes a `ListOptsBuilder` argument [GH-2186](https://github.com/gophercloud/gophercloud/pull/2186)
+* `compute/v2/extensions/keypairs.Get` now takes a `GetOptsBuilder` argument [GH-2186](https://github.com/gophercloud/gophercloud/pull/2186)
+* `compute/v2/extensions/keypairs.Delete` now takes a `DeleteOptsBuilder` argument [GH-2186](https://github.com/gophercloud/gophercloud/pull/2186)
+* `compute/v2/extensions/hypervisors.List` now takes a `ListOptsBuilder` argument [GH-2187](https://github.com/gophercloud/gophercloud/pull/2187)
+
+IMPROVEMENTS
+
+* Added `blockstorage/v3/qos.List` [GH-2167](https://github.com/gophercloud/gophercloud/pull/2167)
+* Added `compute/v2/extensions/volumeattach.CreateOpts.Tag` [GH-2177](https://github.com/gophercloud/gophercloud/pull/2177)
+* Added `compute/v2/extensions/volumeattach.CreateOpts.DeleteOnTermination` [GH-2177](https://github.com/gophercloud/gophercloud/pull/2177)
+* Added `compute/v2/extensions/volumeattach.VolumeAttachment.Tag` [GH-2177](https://github.com/gophercloud/gophercloud/pull/2177)
+* Added `compute/v2/extensions/volumeattach.VolumeAttachment.DeleteOnTermination` [GH-2177](https://github.com/gophercloud/gophercloud/pull/2177)
+* Added `db/v1/instances.Instance.Address` [GH-2179](https://github.com/gophercloud/gophercloud/pull/2179)
+* Added `compute/v2/servers.ListOpts.AvailabilityZone` [GH-2098](https://github.com/gophercloud/gophercloud/pull/2098)
+* Added `compute/v2/extensions/keypairs.ListOpts` [GH-2186](https://github.com/gophercloud/gophercloud/pull/2186)
+* Added `compute/v2/extensions/keypairs.GetOpts` [GH-2186](https://github.com/gophercloud/gophercloud/pull/2186)
+* Added `compute/v2/extensions/keypairs.DeleteOpts` [GH-2186](https://github.com/gophercloud/gophercloud/pull/2186)
+* Added `objectstorage/v2/containers.GetHeader.Timestamp` [GH-2185](https://github.com/gophercloud/gophercloud/pull/2185)
+* Added `compute/v2/extensions.ListOpts` [GH-2187](https://github.com/gophercloud/gophercloud/pull/2187)
+* Added `sharedfilesystems/v2/shares.Share.CreateShareFromSnapshotSupport` [GH-2191](https://github.com/gophercloud/gophercloud/pull/2191)
+* Added `compute/v2/servers.Network.Tag` for use in `CreateOpts` [GH-2193](https://github.com/gophercloud/gophercloud/pull/2193)
+
+## 0.18.0 (June 11, 2021)
+
+NOTES / BREAKING CHANGES
+
+* As of [GH-2160](https://github.com/gophercloud/gophercloud/pull/2160), Gophercloud no longer URL encodes Object Storage containers and object names. You can still encode them yourself before passing the names to the Object Storage functions.
+
+* `baremetal/v1/nodes.ListBIOSSettings` now takes three parameters. The third, new, parameter is `ListBIOSSettingsOptsBuilder` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+
+BUG FIXES
+
+* Fixed expected OK codes to use default codes [GH-2173](https://github.com/gophercloud/gophercloud/pull/2173)
+* Fixed inablity to create sub-containers (objects with `/` in their name) [GH-2160](https://github.com/gophercloud/gophercloud/pull/2160)
+
+IMPROVEMENTS
+
+* Added `orchestration/v1/stacks.ListOpts.ShowHidden` [GH-2104](https://github.com/gophercloud/gophercloud/pull/2104)
+* Added `loadbalancer/v2/listeners.ProtocolSCTP` [GH-2149](https://github.com/gophercloud/gophercloud/pull/2149)
+* Added `loadbalancer/v2/listeners.CreateOpts.TLSVersions` [GH-2150](https://github.com/gophercloud/gophercloud/pull/2150)
+* Added `loadbalancer/v2/listeners.UpdateOpts.TLSVersions` [GH-2150](https://github.com/gophercloud/gophercloud/pull/2150)
+* Added `baremetal/v1/nodes.CreateOpts.NetworkData` [GH-2154](https://github.com/gophercloud/gophercloud/pull/2154)
+* Added `baremetal/v1/nodes.Node.NetworkData` [GH-2154](https://github.com/gophercloud/gophercloud/pull/2154)
+* Added `loadbalancer/v2/pools.ProtocolPROXYV2` [GH-2158](https://github.com/gophercloud/gophercloud/pull/2158)
+* Added `loadbalancer/v2/pools.ProtocolSCTP` [GH-2158](https://github.com/gophercloud/gophercloud/pull/2158)
+* Added `placement/v1/resourceproviders.GetAllocations` [GH-2162](https://github.com/gophercloud/gophercloud/pull/2162)
+* Added `baremetal/v1/nodes.CreateOpts.BIOSInterface` [GH-2164](https://github.com/gophercloud/gophercloud/pull/2164)
+* Added `baremetal/v1/nodes.Node.BIOSInterface` [GH-2164](https://github.com/gophercloud/gophercloud/pull/2164)
+* Added `baremetal/v1/nodes.NodeValidation.BIOS` [GH-2164](https://github.com/gophercloud/gophercloud/pull/2164)
+* Added `baremetal/v1/nodes.ListBIOSSettings` [GH-2171](https://github.com/gophercloud/gophercloud/pull/2171)
+* Added `baremetal/v1/nodes.GetBIOSSetting` [GH-2171](https://github.com/gophercloud/gophercloud/pull/2171)
+* Added `baremetal/v1/nodes.ListBIOSSettingsOpts` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+* Added `baremetal/v1/nodes.BIOSSetting.AttributeType` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+* Added `baremetal/v1/nodes.BIOSSetting.AllowableValues` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+* Added `baremetal/v1/nodes.BIOSSetting.LowerBound` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+* Added `baremetal/v1/nodes.BIOSSetting.UpperBound` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+* Added `baremetal/v1/nodes.BIOSSetting.MinLength` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+* Added `baremetal/v1/nodes.BIOSSetting.MaxLength` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+* Added `baremetal/v1/nodes.BIOSSetting.ReadOnly` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+* Added `baremetal/v1/nodes.BIOSSetting.ResetRequired` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+* Added `baremetal/v1/nodes.BIOSSetting.Unique` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
+
+## 0.17.0 (April 9, 2021)
+
+IMPROVEMENTS
+
+* `networking/v2/extensions/quotas.QuotaDetail.Reserved` can handle both `int` and `string` values [GH-2126](https://github.com/gophercloud/gophercloud/pull/2126)
+* Added `blockstorage/v3/volumetypes.ListExtraSpecs` [GH-2123](https://github.com/gophercloud/gophercloud/pull/2123)
+* Added `blockstorage/v3/volumetypes.GetExtraSpec` [GH-2123](https://github.com/gophercloud/gophercloud/pull/2123)
+* Added `blockstorage/v3/volumetypes.CreateExtraSpecs` [GH-2123](https://github.com/gophercloud/gophercloud/pull/2123)
+* Added `blockstorage/v3/volumetypes.UpdateExtraSpec` [GH-2123](https://github.com/gophercloud/gophercloud/pull/2123)
+* Added `blockstorage/v3/volumetypes.DeleteExtraSpec` [GH-2123](https://github.com/gophercloud/gophercloud/pull/2123)
+* Added `identity/v3/roles.ListAssignmentOpts.IncludeNames` [GH-2133](https://github.com/gophercloud/gophercloud/pull/2133)
+* Added `identity/v3/roles.AssignedRoles.Name` [GH-2133](https://github.com/gophercloud/gophercloud/pull/2133)
+* Added `identity/v3/roles.Domain.Name` [GH-2133](https://github.com/gophercloud/gophercloud/pull/2133)
+* Added `identity/v3/roles.Project.Name` [GH-2133](https://github.com/gophercloud/gophercloud/pull/2133)
+* Added `identity/v3/roles.User.Name` [GH-2133](https://github.com/gophercloud/gophercloud/pull/2133)
+* Added `identity/v3/roles.Group.Name` [GH-2133](https://github.com/gophercloud/gophercloud/pull/2133)
+* Added `blockstorage/extensions/availabilityzones.List` [GH-2135](https://github.com/gophercloud/gophercloud/pull/2135)
+* Added `blockstorage/v3/volumetypes.ListAccesses` [GH-2138](https://github.com/gophercloud/gophercloud/pull/2138)
+* Added `blockstorage/v3/volumetypes.AddAccess` [GH-2138](https://github.com/gophercloud/gophercloud/pull/2138)
+* Added `blockstorage/v3/volumetypes.RemoveAccess` [GH-2138](https://github.com/gophercloud/gophercloud/pull/2138)
+* Added `blockstorage/v3/qos.Create` [GH-2140](https://github.com/gophercloud/gophercloud/pull/2140)
+* Added `blockstorage/v3/qos.Delete` [GH-2140](https://github.com/gophercloud/gophercloud/pull/2140)
+
+## 0.16.0 (February 23, 2021)
+
+UPGRADE NOTES
+
+* `baremetal/v1/nodes.CleanStep.Interface` has changed from `string` to `StepInterface` [GH-2120](https://github.com/gophercloud/gophercloud/pull/2120)
+
+BUG FIXES
+
+* Fixed `xor` logic issues in `loadbalancers/v2/l7policies.CreateOpts` [GH-2087](https://github.com/gophercloud/gophercloud/pull/2087)
+* Fixed `xor` logic issues in `loadbalancers/v2/listeners.CreateOpts` [GH-2087](https://github.com/gophercloud/gophercloud/pull/2087)
+* Fixed `If-Modified-Since` so it's correctly sent in a `objectstorage/v1/objects.Download` request [GH-2108](https://github.com/gophercloud/gophercloud/pull/2108)
+* Fixed `If-Unmodified-Since` so it's correctly sent in a `objectstorage/v1/objects.Download` request [GH-2108](https://github.com/gophercloud/gophercloud/pull/2108)
+
+IMPROVEMENTS
+
+* Added `blockstorage/extensions/limits.Get` [GH-2084](https://github.com/gophercloud/gophercloud/pull/2084)
+* `clustering/v1/clusters.RemoveNodes` now returns an `ActionResult` [GH-2089](https://github.com/gophercloud/gophercloud/pull/2089)
+* Added `identity/v3/projects.ListAvailable` [GH-2090](https://github.com/gophercloud/gophercloud/pull/2090)
+* Added `blockstorage/extensions/backups.ListDetail` [GH-2085](https://github.com/gophercloud/gophercloud/pull/2085)
+* Allow all ports to be removed in `networking/v2/extensions/fwaas_v2/groups.UpdateOpts` [GH-2073]
+* Added `imageservice/v2/images.ListOpts.Hidden` [GH-2094](https://github.com/gophercloud/gophercloud/pull/2094)
+* Added `imageservice/v2/images.CreateOpts.Hidden` [GH-2094](https://github.com/gophercloud/gophercloud/pull/2094)
+* Added `imageservice/v2/images.ReplaceImageHidden` [GH-2094](https://github.com/gophercloud/gophercloud/pull/2094)
+* Added `imageservice/v2/images.Image.Hidden` [GH-2094](https://github.com/gophercloud/gophercloud/pull/2094)
+* Added `containerinfra/v1/clusters.CreateOpts.MasterLBEnabled` [GH-2102](https://github.com/gophercloud/gophercloud/pull/2102)
+* Added the ability to define a custom function to handle "Retry-After" (429) responses [GH-2097](https://github.com/gophercloud/gophercloud/pull/2097)
+* Added `baremetal/v1/nodes.JBOD` constant for the `RAIDLevel` type [GH-2103](https://github.com/gophercloud/gophercloud/pull/2103)
+* Added support for Block Storage quotas of volume typed resources [GH-2109](https://github.com/gophercloud/gophercloud/pull/2109)
+* Added `blockstorage/extensions/volumeactions.ChangeType` [GH-2113](https://github.com/gophercloud/gophercloud/pull/2113)
+* Added `baremetal/v1/nodes.DeployStep` [GH-2120](https://github.com/gophercloud/gophercloud/pull/2120)
+* Added `baremetal/v1/nodes.ProvisionStateOpts.DeploySteps` [GH-2120](https://github.com/gophercloud/gophercloud/pull/2120)
+* Added `baremetal/v1/nodes.CreateOpts.AutomatedClean` [GH-2122](https://github.com/gophercloud/gophercloud/pull/2122)
+
+## 0.15.0 (December 27, 2020)
+
+BREAKING CHANGES
+
+* `compute/v2/extensions/servergroups.List` now takes a `ListOpts` parameter. You can pass `nil` if you don't need to use this.
+
+IMPROVEMENTS
+
+* Added `loadbalancer/v2/pools.CreateMemberOpts.Tags` [GH-2056](https://github.com/gophercloud/gophercloud/pull/2056)
+* Added `loadbalancer/v2/pools.UpdateMemberOpts.Backup` [GH-2056](https://github.com/gophercloud/gophercloud/pull/2056)
+* Added `loadbalancer/v2/pools.UpdateMemberOpts.MonitorAddress` [GH-2056](https://github.com/gophercloud/gophercloud/pull/2056)
+* Added `loadbalancer/v2/pools.UpdateMemberOpts.MonitorPort` [GH-2056](https://github.com/gophercloud/gophercloud/pull/2056)
+* Added `loadbalancer/v2/pools.UpdateMemberOpts.Tags` [GH-2056](https://github.com/gophercloud/gophercloud/pull/2056)
+* Added `loadbalancer/v2/pools.BatchUpdateMemberOpts.Backup` [GH-2056](https://github.com/gophercloud/gophercloud/pull/2056)
+* Added `loadbalancer/v2/pools.BatchUpdateMemberOpts.MonitorAddress` [GH-2056](https://github.com/gophercloud/gophercloud/pull/2056)
+* Added `loadbalancer/v2/pools.BatchUpdateMemberOpts.MonitorPort` [GH-2056](https://github.com/gophercloud/gophercloud/pull/2056)
+* Added `loadbalancer/v2/pools.BatchUpdateMemberOpts.Tags` [GH-2056](https://github.com/gophercloud/gophercloud/pull/2056)
+* Added `networking/v2/extensions/quotas.GetDetail` [GH-2061](https://github.com/gophercloud/gophercloud/pull/2061)
+* Added `networking/v2/extensions/quotas.UpdateOpts.Trunk` [GH-2061](https://github.com/gophercloud/gophercloud/pull/2061)
+* Added `objectstorage/v1/accounts.UpdateOpts.RemoveMetadata` [GH-2063](https://github.com/gophercloud/gophercloud/pull/2063)
+* Added `objectstorage/v1/objects.UpdateOpts.RemoveMetadata` [GH-2063](https://github.com/gophercloud/gophercloud/pull/2063)
+* Added `identity/v3/catalog.List` [GH-2067](https://github.com/gophercloud/gophercloud/pull/2067)
+* Added `networking/v2/extensions/fwaas_v2/policies.List` [GH-2057](https://github.com/gophercloud/gophercloud/pull/2057)
+* Added `networking/v2/extensions/fwaas_v2/policies.Create` [GH-2057](https://github.com/gophercloud/gophercloud/pull/2057)
+* Added `networking/v2/extensions/fwaas_v2/policies.Get` [GH-2057](https://github.com/gophercloud/gophercloud/pull/2057)
+* Added `networking/v2/extensions/fwaas_v2/policies.Update` [GH-2057](https://github.com/gophercloud/gophercloud/pull/2057)
+* Added `networking/v2/extensions/fwaas_v2/policies.Delete` [GH-2057](https://github.com/gophercloud/gophercloud/pull/2057)
+* Added `compute/v2/extensions/servergroups.ListOpts.AllProjects` [GH-2070](https://github.com/gophercloud/gophercloud/pull/2070)
+* Added `objectstorage/v1/containers.CreateOpts.StoragePolicy` [GH-2075](https://github.com/gophercloud/gophercloud/pull/2075)
+* Added `blockstorage/v3/snapshots.Update` [GH-2081](https://github.com/gophercloud/gophercloud/pull/2081)
+* Added `loadbalancer/v2/l7policies.CreateOpts.Rules` [GH-2077](https://github.com/gophercloud/gophercloud/pull/2077)
+* Added `loadbalancer/v2/listeners.CreateOpts.DefaultPool` [GH-2077](https://github.com/gophercloud/gophercloud/pull/2077)
+* Added `loadbalancer/v2/listeners.CreateOpts.L7Policies` [GH-2077](https://github.com/gophercloud/gophercloud/pull/2077)
+* Added `loadbalancer/v2/listeners.Listener.DefaultPool` [GH-2077](https://github.com/gophercloud/gophercloud/pull/2077)
+* Added `loadbalancer/v2/loadbalancers.CreateOpts.Listeners` [GH-2077](https://github.com/gophercloud/gophercloud/pull/2077)
+* Added `loadbalancer/v2/loadbalancers.CreateOpts.Pools` [GH-2077](https://github.com/gophercloud/gophercloud/pull/2077)
+* Added `loadbalancer/v2/pools.CreateOpts.Members` [GH-2077](https://github.com/gophercloud/gophercloud/pull/2077)
+* Added `loadbalancer/v2/pools.CreateOpts.Monitor` [GH-2077](https://github.com/gophercloud/gophercloud/pull/2077)
+
+
+## 0.14.0 (November 11, 2020)
+
+IMPROVEMENTS
+
+* Added `identity/v3/endpoints.Endpoint.Enabled` [GH-2030](https://github.com/gophercloud/gophercloud/pull/2030)
+* Added `containerinfra/v1/clusters.Upgrade` [GH-2032](https://github.com/gophercloud/gophercloud/pull/2032)
+* Added `compute/apiversions.List` [GH-2037](https://github.com/gophercloud/gophercloud/pull/2037)
+* Added `compute/apiversions.Get` [GH-2037](https://github.com/gophercloud/gophercloud/pull/2037)
+* Added `compute/v2/servers.ListOpts.IP` [GH-2038](https://github.com/gophercloud/gophercloud/pull/2038)
+* Added `compute/v2/servers.ListOpts.IP6` [GH-2038](https://github.com/gophercloud/gophercloud/pull/2038)
+* Added `compute/v2/servers.ListOpts.UserID` [GH-2038](https://github.com/gophercloud/gophercloud/pull/2038)
+* Added `dns/v2/transfer/accept.List` [GH-2041](https://github.com/gophercloud/gophercloud/pull/2041)
+* Added `dns/v2/transfer/accept.Get` [GH-2041](https://github.com/gophercloud/gophercloud/pull/2041)
+* Added `dns/v2/transfer/accept.Create` [GH-2041](https://github.com/gophercloud/gophercloud/pull/2041)
+* Added `dns/v2/transfer/requests.List` [GH-2041](https://github.com/gophercloud/gophercloud/pull/2041)
+* Added `dns/v2/transfer/requests.Get` [GH-2041](https://github.com/gophercloud/gophercloud/pull/2041)
+* Added `dns/v2/transfer/requests.Update` [GH-2041](https://github.com/gophercloud/gophercloud/pull/2041)
+* Added `dns/v2/transfer/requests.Delete` [GH-2041](https://github.com/gophercloud/gophercloud/pull/2041)
+* Added `baremetal/v1/nodes.RescueWait` [GH-2052](https://github.com/gophercloud/gophercloud/pull/2052)
+* Added `baremetal/v1/nodes.Unrescuing` [GH-2052](https://github.com/gophercloud/gophercloud/pull/2052)
+* Added `networking/v2/extensions/fwaas_v2/groups.List` [GH-2050](https://github.com/gophercloud/gophercloud/pull/2050)
+* Added `networking/v2/extensions/fwaas_v2/groups.Get` [GH-2050](https://github.com/gophercloud/gophercloud/pull/2050)
+* Added `networking/v2/extensions/fwaas_v2/groups.Create` [GH-2050](https://github.com/gophercloud/gophercloud/pull/2050)
+* Added `networking/v2/extensions/fwaas_v2/groups.Update` [GH-2050](https://github.com/gophercloud/gophercloud/pull/2050)
+* Added `networking/v2/extensions/fwaas_v2/groups.Delete` [GH-2050](https://github.com/gophercloud/gophercloud/pull/2050)
+
+BUG FIXES
+
+* Changed `networking/v2/extensions/layer3/routers.Routes` from `[]Route` to `*[]Route` [GH-2043](https://github.com/gophercloud/gophercloud/pull/2043)
+
+## 0.13.0 (September 27, 2020)
+
+IMPROVEMENTS
+
+* Added `ProtocolTerminatedHTTPS` as a valid listener protocol to `loadbalancer/v2/listeners` [GH-1992](https://github.com/gophercloud/gophercloud/pull/1992)
+* Added `objectstorage/v1/objects.CreateTempURLOpts.Timestamp` [GH-1994](https://github.com/gophercloud/gophercloud/pull/1994)
+* Added `compute/v2/extensions/schedulerhints.SchedulerHints.DifferentCell` [GH-2012](https://github.com/gophercloud/gophercloud/pull/2012)
+* Added `loadbalancer/v2/quotas.Get` [GH-2010](https://github.com/gophercloud/gophercloud/pull/2010)
+* Added `messaging/v2/queues.CreateOpts.EnableEncryptMessages` [GH-2016](https://github.com/gophercloud/gophercloud/pull/2016)
+* Added `messaging/v2/queues.ListOpts.Name` [GH-2018](https://github.com/gophercloud/gophercloud/pull/2018)
+* Added `messaging/v2/queues.ListOpts.WithCount` [GH-2018](https://github.com/gophercloud/gophercloud/pull/2018)
+* Added `loadbalancer/v2/quotas.Update` [GH-2023](https://github.com/gophercloud/gophercloud/pull/2023)
+* Added `loadbalancer/v2/loadbalancers.ListOpts.AvailabilityZone` [GH-2026](https://github.com/gophercloud/gophercloud/pull/2026)
+* Added `loadbalancer/v2/loadbalancers.CreateOpts.AvailabilityZone` [GH-2026](https://github.com/gophercloud/gophercloud/pull/2026)
+* Added `loadbalancer/v2/loadbalancers.LoadBalancer.AvailabilityZone` [GH-2026](https://github.com/gophercloud/gophercloud/pull/2026)
+* Added `networking/v2/extensions/layer3/routers.ListL3Agents` [GH-2025](https://github.com/gophercloud/gophercloud/pull/2025)
+
+BUG FIXES
+
+* Fixed URL escaping in `objectstorage/v1/objects.CreateTempURL` [GH-1994](https://github.com/gophercloud/gophercloud/pull/1994)
+* Remove unused `ServiceClient` from `compute/v2/servers.CreateOpts` [GH-2004](https://github.com/gophercloud/gophercloud/pull/2004)
+* Changed `objectstorage/v1/objects.CreateOpts.DeleteAfter` from `int` to `int64` [GH-2014](https://github.com/gophercloud/gophercloud/pull/2014)
+* Changed `objectstorage/v1/objects.CreateOpts.DeleteAt` from `int` to `int64` [GH-2014](https://github.com/gophercloud/gophercloud/pull/2014)
+* Changed `objectstorage/v1/objects.UpdateOpts.DeleteAfter` from `int` to `int64` [GH-2014](https://github.com/gophercloud/gophercloud/pull/2014)
+* Changed `objectstorage/v1/objects.UpdateOpts.DeleteAt` from `int` to `int64` [GH-2014](https://github.com/gophercloud/gophercloud/pull/2014)
+
+
+## 0.12.0 (June 25, 2020)
+
+UPGRADE NOTES
+
+* The URL used in the `compute/v2/extensions/bootfromvolume` package has been changed from `os-volumes_boot` to `servers`.
+
+IMPROVEMENTS
+
+* The URL used in the `compute/v2/extensions/bootfromvolume` package has been changed from `os-volumes_boot` to `servers` [GH-1973](https://github.com/gophercloud/gophercloud/pull/1973)
+* Modify `baremetal/v1/nodes.LogicalDisk.PhysicalDisks` type to support physical disks hints [GH-1982](https://github.com/gophercloud/gophercloud/pull/1982)
+* Added `baremetalintrospection/httpbasic` which provides an HTTP Basic Auth client [GH-1986](https://github.com/gophercloud/gophercloud/pull/1986)
+* Added `baremetal/httpbasic` which provides an HTTP Basic Auth client [GH-1983](https://github.com/gophercloud/gophercloud/pull/1983)
+* Added `containerinfra/v1/clusters.CreateOpts.MergeLabels` [GH-1985](https://github.com/gophercloud/gophercloud/pull/1985)
+
+BUG FIXES
+
+* Changed `containerinfra/v1/clusters.Cluster.HealthStatusReason` from `string` to `map[string]interface{}` [GH-1968](https://github.com/gophercloud/gophercloud/pull/1968)
+* Fixed marshalling of `blockstorage/extensions/backups.ImportBackup.Metadata` [GH-1967](https://github.com/gophercloud/gophercloud/pull/1967)
+* Fixed typo of "OAUth" to "OAuth" in `identity/v3/extensions/oauth1` [GH-1969](https://github.com/gophercloud/gophercloud/pull/1969)
+* Fixed goroutine leak during reauthentication [GH-1978](https://github.com/gophercloud/gophercloud/pull/1978)
+* Changed `baremetalintrospection/v1/introspection.RootDiskType.Size` from `int` to `int64` [GH-1988](https://github.com/gophercloud/gophercloud/pull/1988)
+
+## 0.11.0 (May 14, 2020)
+
+UPGRADE NOTES
+
+* Object storage container and object names are now URL encoded [GH-1930](https://github.com/gophercloud/gophercloud/pull/1930)
+* All responses now have access to the returned headers. Please report any issues this has caused [GH-1942](https://github.com/gophercloud/gophercloud/pull/1942)
+* Changes have been made to the internal HTTP client to ensure response bodies are handled in a way that enables connections to be re-used more efficiently [GH-1952](https://github.com/gophercloud/gophercloud/pull/1952)
+
+IMPROVEMENTS
+
+* Added `objectstorage/v1/containers.BulkDelete` [GH-1930](https://github.com/gophercloud/gophercloud/pull/1930)
+* Added `objectstorage/v1/objects.BulkDelete` [GH-1930](https://github.com/gophercloud/gophercloud/pull/1930)
+* Object storage container and object names are now URL encoded [GH-1930](https://github.com/gophercloud/gophercloud/pull/1930)
+* All responses now have access to the returned headers [GH-1942](https://github.com/gophercloud/gophercloud/pull/1942)
+* Added `compute/v2/extensions/injectnetworkinfo.InjectNetworkInfo` [GH-1941](https://github.com/gophercloud/gophercloud/pull/1941)
+* Added `compute/v2/extensions/resetnetwork.ResetNetwork` [GH-1941](https://github.com/gophercloud/gophercloud/pull/1941)
+* Added `identity/v3/extensions/trusts.ListRoles` [GH-1939](https://github.com/gophercloud/gophercloud/pull/1939)
+* Added `identity/v3/extensions/trusts.GetRole` [GH-1939](https://github.com/gophercloud/gophercloud/pull/1939)
+* Added `identity/v3/extensions/trusts.CheckRole` [GH-1939](https://github.com/gophercloud/gophercloud/pull/1939)
+* Added `identity/v3/extensions/oauth1.Create` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.CreateConsumer` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.DeleteConsumer` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.ListConsumers` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.GetConsumer` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.UpdateConsumer` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.RequestToken` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.AuthorizeToken` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.CreateAccessToken` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.GetAccessToken` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.RevokeAccessToken` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.ListAccessTokens` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.ListAccessTokenRoles` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `identity/v3/extensions/oauth1.GetAccessTokenRole` [GH-1935](https://github.com/gophercloud/gophercloud/pull/1935)
+* Added `networking/v2/extensions/agents.Update` [GH-1954](https://github.com/gophercloud/gophercloud/pull/1954)
+* Added `networking/v2/extensions/agents.Delete` [GH-1954](https://github.com/gophercloud/gophercloud/pull/1954)
+* Added `networking/v2/extensions/agents.ScheduleDHCPNetwork` [GH-1954](https://github.com/gophercloud/gophercloud/pull/1954)
+* Added `networking/v2/extensions/agents.RemoveDHCPNetwork` [GH-1954](https://github.com/gophercloud/gophercloud/pull/1954)
+* Added `identity/v3/projects.CreateOpts.Extra` [GH-1951](https://github.com/gophercloud/gophercloud/pull/1951)
+* Added `identity/v3/projects.CreateOpts.Options` [GH-1951](https://github.com/gophercloud/gophercloud/pull/1951)
+* Added `identity/v3/projects.UpdateOpts.Extra` [GH-1951](https://github.com/gophercloud/gophercloud/pull/1951)
+* Added `identity/v3/projects.UpdateOpts.Options` [GH-1951](https://github.com/gophercloud/gophercloud/pull/1951)
+* Added `identity/v3/projects.Project.Extra` [GH-1951](https://github.com/gophercloud/gophercloud/pull/1951)
+* Added `identity/v3/projects.Options.Options` [GH-1951](https://github.com/gophercloud/gophercloud/pull/1951)
+* Added `imageservice/v2/images.Image.OpenStackImageImportMethods` [GH-1962](https://github.com/gophercloud/gophercloud/pull/1962)
+* Added `imageservice/v2/images.Image.OpenStackImageStoreIDs` [GH-1962](https://github.com/gophercloud/gophercloud/pull/1962)
+
+BUG FIXES
+
+* Changed`identity/v3/extensions/trusts.Trust.RemainingUses` from `bool` to `int` [GH-1939](https://github.com/gophercloud/gophercloud/pull/1939)
+* Changed `identity/v3/applicationcredentials.CreateOpts.ExpiresAt` from `string` to `*time.Time` [GH-1937](https://github.com/gophercloud/gophercloud/pull/1937)
+* Fixed issue with unmarshalling/decoding slices of composed structs [GH-1964](https://github.com/gophercloud/gophercloud/pull/1964)
+
+## 0.10.0 (April 12, 2020)
+
+UPGRADE NOTES
+
+* The various `IDFromName` convenience functions have been moved to https://github.com/gophercloud/utils [GH-1897](https://github.com/gophercloud/gophercloud/pull/1897)
+* `sharedfilesystems/v2/shares.GetExportLocations` was renamed to `sharedfilesystems/v2/shares.ListExportLocations` [GH-1932](https://github.com/gophercloud/gophercloud/pull/1932)
+
+IMPROVEMENTS
+
+* Added `blockstorage/extensions/volumeactions.SetBootable` [GH-1891](https://github.com/gophercloud/gophercloud/pull/1891)
+* Added `blockstorage/extensions/backups.Export` [GH-1894](https://github.com/gophercloud/gophercloud/pull/1894)
+* Added `blockstorage/extensions/backups.Import` [GH-1894](https://github.com/gophercloud/gophercloud/pull/1894)
+* Added `placement/v1/resourceproviders.GetTraits` [GH-1899](https://github.com/gophercloud/gophercloud/pull/1899)
+* Added the ability to authenticate with Amazon EC2 Credentials [GH-1900](https://github.com/gophercloud/gophercloud/pull/1900)
+* Added ability to list Nova services by binary and host [GH-1904](https://github.com/gophercloud/gophercloud/pull/1904)
+* Added `compute/v2/extensions/services.Update` [GH-1902](https://github.com/gophercloud/gophercloud/pull/1902)
+* Added system scope to v3 authentication [GH-1908](https://github.com/gophercloud/gophercloud/pull/1908)
+* Added `identity/v3/extensions/ec2tokens.ValidateS3Token` [GH-1906](https://github.com/gophercloud/gophercloud/pull/1906)
+* Added `containerinfra/v1/clusters.Cluster.HealthStatus` [GH-1910](https://github.com/gophercloud/gophercloud/pull/1910)
+* Added `containerinfra/v1/clusters.Cluster.HealthStatusReason` [GH-1910](https://github.com/gophercloud/gophercloud/pull/1910)
+* Added `loadbalancer/v2/amphorae.Failover` [GH-1912](https://github.com/gophercloud/gophercloud/pull/1912)
+* Added `identity/v3/extensions/ec2credentials.List` [GH-1916](https://github.com/gophercloud/gophercloud/pull/1916)
+* Added `identity/v3/extensions/ec2credentials.Get` [GH-1916](https://github.com/gophercloud/gophercloud/pull/1916)
+* Added `identity/v3/extensions/ec2credentials.Create` [GH-1916](https://github.com/gophercloud/gophercloud/pull/1916)
+* Added `identity/v3/extensions/ec2credentials.Delete` [GH-1916](https://github.com/gophercloud/gophercloud/pull/1916)
+* Added `ErrUnexpectedResponseCode.ResponseHeader` [GH-1919](https://github.com/gophercloud/gophercloud/pull/1919)
+* Added support for TOTP authentication [GH-1922](https://github.com/gophercloud/gophercloud/pull/1922)
+* `sharedfilesystems/v2/shares.GetExportLocations` was renamed to `sharedfilesystems/v2/shares.ListExportLocations` [GH-1932](https://github.com/gophercloud/gophercloud/pull/1932)
+* Added `sharedfilesystems/v2/shares.GetExportLocation` [GH-1932](https://github.com/gophercloud/gophercloud/pull/1932)
+* Added `sharedfilesystems/v2/shares.Revert` [GH-1931](https://github.com/gophercloud/gophercloud/pull/1931)
+* Added `sharedfilesystems/v2/shares.ResetStatus` [GH-1931](https://github.com/gophercloud/gophercloud/pull/1931)
+* Added `sharedfilesystems/v2/shares.ForceDelete` [GH-1931](https://github.com/gophercloud/gophercloud/pull/1931)
+* Added `sharedfilesystems/v2/shares.Unmanage` [GH-1931](https://github.com/gophercloud/gophercloud/pull/1931)
+* Added `blockstorage/v3/attachments.Create` [GH-1934](https://github.com/gophercloud/gophercloud/pull/1934)
+* Added `blockstorage/v3/attachments.List` [GH-1934](https://github.com/gophercloud/gophercloud/pull/1934)
+* Added `blockstorage/v3/attachments.Get` [GH-1934](https://github.com/gophercloud/gophercloud/pull/1934)
+* Added `blockstorage/v3/attachments.Update` [GH-1934](https://github.com/gophercloud/gophercloud/pull/1934)
+* Added `blockstorage/v3/attachments.Delete` [GH-1934](https://github.com/gophercloud/gophercloud/pull/1934)
+* Added `blockstorage/v3/attachments.Complete` [GH-1934](https://github.com/gophercloud/gophercloud/pull/1934)
+
+BUG FIXES
+
+* Fixed issue with Orchestration `get_file` only being able to read JSON and YAML files [GH-1915](https://github.com/gophercloud/gophercloud/pull/1915)
+
+## 0.9.0 (March 10, 2020)
+
+UPGRADE NOTES
+
+* The way we implement new API result fields added by microversions has changed. Previously, we would declare a dedicated `ExtractFoo` function in a file called `microversions.go`. Now, we are declaring those fields inline of the original result struct as a pointer. [GH-1854](https://github.com/gophercloud/gophercloud/pull/1854)
+
+* `compute/v2/servers.CreateOpts.Networks` has changed from `[]Network` to `interface{}` in order to support creating servers that have no networks. [GH-1884](https://github.com/gophercloud/gophercloud/pull/1884)
+
+IMPROVEMENTS
+
+* Added `compute/v2/extensions/instanceactions.List` [GH-1848](https://github.com/gophercloud/gophercloud/pull/1848)
+* Added `compute/v2/extensions/instanceactions.Get` [GH-1848](https://github.com/gophercloud/gophercloud/pull/1848)
+* Added `networking/v2/ports.List.FixedIPs` [GH-1849](https://github.com/gophercloud/gophercloud/pull/1849)
+* Added `identity/v3/extensions/trusts.List` [GH-1855](https://github.com/gophercloud/gophercloud/pull/1855)
+* Added `identity/v3/extensions/trusts.Get` [GH-1855](https://github.com/gophercloud/gophercloud/pull/1855)
+* Added `identity/v3/extensions/trusts.Trust.ExpiresAt` [GH-1857](https://github.com/gophercloud/gophercloud/pull/1857)
+* Added `identity/v3/extensions/trusts.Trust.DeletedAt` [GH-1857](https://github.com/gophercloud/gophercloud/pull/1857)
+* Added `compute/v2/extensions/instanceactions.InstanceActionDetail` [GH-1851](https://github.com/gophercloud/gophercloud/pull/1851)
+* Added `compute/v2/extensions/instanceactions.Event` [GH-1851](https://github.com/gophercloud/gophercloud/pull/1851)
+* Added `compute/v2/extensions/instanceactions.ListOpts` [GH-1858](https://github.com/gophercloud/gophercloud/pull/1858)
+* Added `objectstorage/v1/containers.UpdateOpts.TempURLKey` [GH-1864](https://github.com/gophercloud/gophercloud/pull/1864)
+* Added `objectstorage/v1/containers.UpdateOpts.TempURLKey2` [GH-1864](https://github.com/gophercloud/gophercloud/pull/1864)
+* Added `placement/v1/resourceproviders.GetUsages` [GH-1862](https://github.com/gophercloud/gophercloud/pull/1862)
+* Added `placement/v1/resourceproviders.GetInventories` [GH-1862](https://github.com/gophercloud/gophercloud/pull/1862)
+* Added `imageservice/v2/images.ReplaceImageMinRam` [GH-1867](https://github.com/gophercloud/gophercloud/pull/1867)
+* Added `objectstorage/v1/containers.UpdateOpts.TempURLKey` [GH-1865](https://github.com/gophercloud/gophercloud/pull/1865)
+* Added `objectstorage/v1/containers.CreateOpts.TempURLKey2` [GH-1865](https://github.com/gophercloud/gophercloud/pull/1865)
+* Added `blockstorage/extensions/volumetransfers.List` [GH-1869](https://github.com/gophercloud/gophercloud/pull/1869)
+* Added `blockstorage/extensions/volumetransfers.Create` [GH-1869](https://github.com/gophercloud/gophercloud/pull/1869)
+* Added `blockstorage/extensions/volumetransfers.Accept` [GH-1869](https://github.com/gophercloud/gophercloud/pull/1869)
+* Added `blockstorage/extensions/volumetransfers.Get` [GH-1869](https://github.com/gophercloud/gophercloud/pull/1869)
+* Added `blockstorage/extensions/volumetransfers.Delete` [GH-1869](https://github.com/gophercloud/gophercloud/pull/1869)
+* Added `blockstorage/extensions/backups.RestoreFromBackup` [GH-1871](https://github.com/gophercloud/gophercloud/pull/1871)
+* Added `blockstorage/v3/volumes.CreateOpts.BackupID` [GH-1871](https://github.com/gophercloud/gophercloud/pull/1871)
+* Added `blockstorage/v3/volumes.Volume.BackupID` [GH-1871](https://github.com/gophercloud/gophercloud/pull/1871)
+* Added `identity/v3/projects.ListOpts.Tags` [GH-1882](https://github.com/gophercloud/gophercloud/pull/1882)
+* Added `identity/v3/projects.ListOpts.TagsAny` [GH-1882](https://github.com/gophercloud/gophercloud/pull/1882)
+* Added `identity/v3/projects.ListOpts.NotTags` [GH-1882](https://github.com/gophercloud/gophercloud/pull/1882)
+* Added `identity/v3/projects.ListOpts.NotTagsAny` [GH-1882](https://github.com/gophercloud/gophercloud/pull/1882)
+* Added `identity/v3/projects.CreateOpts.Tags` [GH-1882](https://github.com/gophercloud/gophercloud/pull/1882)
+* Added `identity/v3/projects.UpdateOpts.Tags` [GH-1882](https://github.com/gophercloud/gophercloud/pull/1882)
+* Added `identity/v3/projects.Project.Tags` [GH-1882](https://github.com/gophercloud/gophercloud/pull/1882)
+* Changed `compute/v2/servers.CreateOpts.Networks` from `[]Network` to `interface{}` to support creating servers with no networks. [GH-1884](https://github.com/gophercloud/gophercloud/pull/1884)
+
+
+BUG FIXES
+
+* Added support for `int64` headers, which were previously being silently dropped [GH-1860](https://github.com/gophercloud/gophercloud/pull/1860)
+* Allow image properties with empty values [GH-1875](https://github.com/gophercloud/gophercloud/pull/1875)
+* Fixed `compute/v2/extensions/extendedserverattributes.ServerAttributesExt.Userdata` JSON tag [GH-1881](https://github.com/gophercloud/gophercloud/pull/1881)
+
+## 0.8.0 (February 8, 2020)
+
+UPGRADE NOTES
+
+* The behavior of `keymanager/v1/acls.SetOpts` has changed. Instead of a struct, it is now `[]SetOpt`. See [GH-1816](https://github.com/gophercloud/gophercloud/pull/1816) for implementation details.
+
+IMPROVEMENTS
+
+* The result of `containerinfra/v1/clusters.Resize` now returns only the UUID when calling `Extract`. This is a backwards-breaking change from the previous struct that was returned [GH-1649](https://github.com/gophercloud/gophercloud/pull/1649)
+* Added `compute/v2/extensions/shelveunshelve.Shelve` [GH-1799](https://github.com/gophercloud/gophercloud/pull/1799)
+* Added `compute/v2/extensions/shelveunshelve.ShelveOffload` [GH-1799](https://github.com/gophercloud/gophercloud/pull/1799)
+* Added `compute/v2/extensions/shelveunshelve.Unshelve` [GH-1799](https://github.com/gophercloud/gophercloud/pull/1799)
+* Added `containerinfra/v1/nodegroups.Get` [GH-1774](https://github.com/gophercloud/gophercloud/pull/1774)
+* Added `containerinfra/v1/nodegroups.List` [GH-1774](https://github.com/gophercloud/gophercloud/pull/1774)
+* Added `orchestration/v1/resourcetypes.List` [GH-1806](https://github.com/gophercloud/gophercloud/pull/1806)
+* Added `orchestration/v1/resourcetypes.GetSchema` [GH-1806](https://github.com/gophercloud/gophercloud/pull/1806)
+* Added `orchestration/v1/resourcetypes.GenerateTemplate` [GH-1806](https://github.com/gophercloud/gophercloud/pull/1806)
+* Added `keymanager/v1/acls.SetOpt` and changed `keymanager/v1/acls.SetOpts` to `[]SetOpt` [GH-1816](https://github.com/gophercloud/gophercloud/pull/1816)
+* Added `blockstorage/apiversions.List` [GH-458](https://github.com/gophercloud/gophercloud/pull/458)
+* Added `blockstorage/apiversions.Get` [GH-458](https://github.com/gophercloud/gophercloud/pull/458)
+* Added `StatusCodeError` interface and `GetStatusCode` convenience method [GH-1820](https://github.com/gophercloud/gophercloud/pull/1820)
+* Added pagination support to `compute/v2/extensions/usage.SingleTenant` [GH-1819](https://github.com/gophercloud/gophercloud/pull/1819)
+* Added pagination support to `compute/v2/extensions/usage.AllTenants` [GH-1819](https://github.com/gophercloud/gophercloud/pull/1819)
+* Added `placement/v1/resourceproviders.List` [GH-1815](https://github.com/gophercloud/gophercloud/pull/1815)
+* Allow `CreateMemberOptsBuilder` to be passed in `loadbalancer/v2/pools.Create` [GH-1822](https://github.com/gophercloud/gophercloud/pull/1822)
+* Added `Backup` to `loadbalancer/v2/pools.CreateMemberOpts` [GH-1824](https://github.com/gophercloud/gophercloud/pull/1824)
+* Added `MonitorAddress` to `loadbalancer/v2/pools.CreateMemberOpts` [GH-1824](https://github.com/gophercloud/gophercloud/pull/1824)
+* Added `MonitorPort` to `loadbalancer/v2/pools.CreateMemberOpts` [GH-1824](https://github.com/gophercloud/gophercloud/pull/1824)
+* Changed `Impersonation` to a non-required field in `identity/v3/extensions/trusts.CreateOpts` [GH-1818](https://github.com/gophercloud/gophercloud/pull/1818)
+* Added `InsertHeaders` to `loadbalancer/v2/listeners.UpdateOpts` [GH-1835](https://github.com/gophercloud/gophercloud/pull/1835)
+* Added `NUMATopology` to `baremetalintrospection/v1/introspection.Data` [GH-1842](https://github.com/gophercloud/gophercloud/pull/1842)
+* Added `placement/v1/resourceproviders.Create` [GH-1841](https://github.com/gophercloud/gophercloud/pull/1841)
+* Added `blockstorage/extensions/volumeactions.UploadImageOpts.Visibility` [GH-1873](https://github.com/gophercloud/gophercloud/pull/1873)
+* Added `blockstorage/extensions/volumeactions.UploadImageOpts.Protected` [GH-1873](https://github.com/gophercloud/gophercloud/pull/1873)
+* Added `blockstorage/extensions/volumeactions.VolumeImage.Visibility` [GH-1873](https://github.com/gophercloud/gophercloud/pull/1873)
+* Added `blockstorage/extensions/volumeactions.VolumeImage.Protected` [GH-1873](https://github.com/gophercloud/gophercloud/pull/1873)
+
+BUG FIXES
+
+* Changed `sort_key` to `sort_keys` in ` workflow/v2/crontriggers.ListOpts` [GH-1809](https://github.com/gophercloud/gophercloud/pull/1809)
+* Allow `blockstorage/extensions/schedulerstats.Capabilities.MaxOverSubscriptionRatio` to accept both string and int/float responses [GH-1817](https://github.com/gophercloud/gophercloud/pull/1817)
+* Fixed bug in `NewLoadBalancerV2` for situations when the LBaaS service was advertised without a `/v2.0` endpoint [GH-1829](https://github.com/gophercloud/gophercloud/pull/1829)
+* Fixed JSON tags in `baremetal/v1/ports.UpdateOperation` [GH-1840](https://github.com/gophercloud/gophercloud/pull/1840)
+* Fixed JSON tags in `networking/v2/extensions/lbaas/vips.commonResult.Extract()` [GH-1840](https://github.com/gophercloud/gophercloud/pull/1840)
+
+## 0.7.0 (December 3, 2019)
+
+IMPROVEMENTS
+
+* Allow a token to be used directly for authentication instead of generating a new token based on a given token [GH-1752](https://github.com/gophercloud/gophercloud/pull/1752)
+* Moved `tags.ServerTagsExt` to servers.TagsExt` [GH-1760](https://github.com/gophercloud/gophercloud/pull/1760)
+* Added `tags`, `tags-any`, `not-tags`, and `not-tags-any` to `compute/v2/servers.ListOpts` [GH-1759](https://github.com/gophercloud/gophercloud/pull/1759)
+* Added `AccessRule` to `identity/v3/applicationcredentials` [GH-1758](https://github.com/gophercloud/gophercloud/pull/1758)
+* Gophercloud no longer returns an error when multiple endpoints are found. Instead, it will choose the first endpoint and discard the others [GH-1766](https://github.com/gophercloud/gophercloud/pull/1766)
+* Added `networking/v2/extensions/fwaas_v2/rules.Create` [GH-1768](https://github.com/gophercloud/gophercloud/pull/1768)
+* Added `networking/v2/extensions/fwaas_v2/rules.Delete` [GH-1771](https://github.com/gophercloud/gophercloud/pull/1771)
+* Added `loadbalancer/v2/providers.List` [GH-1765](https://github.com/gophercloud/gophercloud/pull/1765)
+* Added `networking/v2/extensions/fwaas_v2/rules.Get` [GH-1772](https://github.com/gophercloud/gophercloud/pull/1772)
+* Added `networking/v2/extensions/fwaas_v2/rules.Update` [GH-1776](https://github.com/gophercloud/gophercloud/pull/1776)
+* Added `networking/v2/extensions/fwaas_v2/rules.List` [GH-1783](https://github.com/gophercloud/gophercloud/pull/1783)
+* Added `MaxRetriesDown` into `loadbalancer/v2/monitors.CreateOpts` [GH-1785](https://github.com/gophercloud/gophercloud/pull/1785)
+* Added `MaxRetriesDown` into `loadbalancer/v2/monitors.UpdateOpts` [GH-1786](https://github.com/gophercloud/gophercloud/pull/1786)
+* Added `MaxRetriesDown` into `loadbalancer/v2/monitors.Monitor` [GH-1787](https://github.com/gophercloud/gophercloud/pull/1787)
+* Added `MaxRetriesDown` into `loadbalancer/v2/monitors.ListOpts` [GH-1788](https://github.com/gophercloud/gophercloud/pull/1788)
+* Updated `go.mod` dependencies, specifically to account for CVE-2019-11840 with `golang.org/x/crypto` [GH-1793](https://github.com/gophercloud/gophercloud/pull/1788)
+
+## 0.6.0 (October 17, 2019)
+
+UPGRADE NOTES
+
+* The way reauthentication works has been refactored. This should not cause a problem, but please report bugs if it does. See [GH-1746](https://github.com/gophercloud/gophercloud/pull/1746) for more information.
+
+IMPROVEMENTS
+
+* Added `networking/v2/extensions/quotas.Get` [GH-1742](https://github.com/gophercloud/gophercloud/pull/1742)
+* Added `networking/v2/extensions/quotas.Update` [GH-1747](https://github.com/gophercloud/gophercloud/pull/1747)
+* Refactored the reauthentication implementation to use goroutines and added a check to prevent an infinite loop in certain situations. [GH-1746](https://github.com/gophercloud/gophercloud/pull/1746)
+
+BUG FIXES
+
+* Changed `Flavor` to `FlavorID` in `loadbalancer/v2/loadbalancers` [GH-1744](https://github.com/gophercloud/gophercloud/pull/1744)
+* Changed `Flavor` to `FlavorID` in `networking/v2/extensions/lbaas_v2/loadbalancers` [GH-1744](https://github.com/gophercloud/gophercloud/pull/1744)
+* The `go-yaml` dependency was updated to `v2.2.4` to fix possible DDOS vulnerabilities [GH-1751](https://github.com/gophercloud/gophercloud/pull/1751)
+
+## 0.5.0 (October 13, 2019)
+
+IMPROVEMENTS
+
+* Added `VolumeType` to `compute/v2/extensions/bootfromvolume.BlockDevice`[GH-1690](https://github.com/gophercloud/gophercloud/pull/1690)
+* Added `networking/v2/extensions/layer3/portforwarding.List` [GH-1688](https://github.com/gophercloud/gophercloud/pull/1688)
+* Added `networking/v2/extensions/layer3/portforwarding.Get` [GH-1698](https://github.com/gophercloud/gophercloud/pull/1696)
+* Added `compute/v2/extensions/tags.ReplaceAll` [GH-1696](https://github.com/gophercloud/gophercloud/pull/1696)
+* Added `compute/v2/extensions/tags.Add` [GH-1696](https://github.com/gophercloud/gophercloud/pull/1696)
+* Added `networking/v2/extensions/layer3/portforwarding.Update` [GH-1703](https://github.com/gophercloud/gophercloud/pull/1703)
+* Added `ExtractDomain` method to token results in `identity/v3/tokens` [GH-1712](https://github.com/gophercloud/gophercloud/pull/1712)
+* Added `AllowedCIDRs` to `loadbalancer/v2/listeners.CreateOpts` [GH-1710](https://github.com/gophercloud/gophercloud/pull/1710)
+* Added `AllowedCIDRs` to `loadbalancer/v2/listeners.UpdateOpts` [GH-1710](https://github.com/gophercloud/gophercloud/pull/1710)
+* Added `AllowedCIDRs` to `loadbalancer/v2/listeners.Listener` [GH-1710](https://github.com/gophercloud/gophercloud/pull/1710)
+* Added `compute/v2/extensions/tags.Add` [GH-1695](https://github.com/gophercloud/gophercloud/pull/1695)
+* Added `compute/v2/extensions/tags.ReplaceAll` [GH-1694](https://github.com/gophercloud/gophercloud/pull/1694)
+* Added `compute/v2/extensions/tags.Delete` [GH-1699](https://github.com/gophercloud/gophercloud/pull/1699)
+* Added `compute/v2/extensions/tags.DeleteAll` [GH-1700](https://github.com/gophercloud/gophercloud/pull/1700)
+* Added `ImageStatusImporting` as an image status [GH-1725](https://github.com/gophercloud/gophercloud/pull/1725)
+* Added `ByPath` to `baremetalintrospection/v1/introspection.RootDiskType` [GH-1730](https://github.com/gophercloud/gophercloud/pull/1730)
+* Added `AttachedVolumes` to `compute/v2/servers.Server` [GH-1732](https://github.com/gophercloud/gophercloud/pull/1732)
+* Enable unmarshaling server tags to a `compute/v2/servers.Server` struct [GH-1734]
+* Allow setting an empty members list in `loadbalancer/v2/pools.BatchUpdateMembers` [GH-1736](https://github.com/gophercloud/gophercloud/pull/1736)
+* Allow unsetting members' subnet ID and name in `loadbalancer/v2/pools.BatchUpdateMemberOpts` [GH-1738](https://github.com/gophercloud/gophercloud/pull/1738)
+
+BUG FIXES
+
+* Changed struct type for options in `networking/v2/extensions/lbaas_v2/listeners` to `UpdateOptsBuilder` interface instead of specific UpdateOpts type [GH-1705](https://github.com/gophercloud/gophercloud/pull/1705)
+* Changed struct type for options in `networking/v2/extensions/lbaas_v2/loadbalancers` to `UpdateOptsBuilder` interface instead of specific UpdateOpts type [GH-1706](https://github.com/gophercloud/gophercloud/pull/1706)
+* Fixed issue with `blockstorage/v1/volumes.Create` where the response was expected to be 202 [GH-1720](https://github.com/gophercloud/gophercloud/pull/1720)
+* Changed `DefaultTlsContainerRef` from `string` to `*string` in `loadbalancer/v2/listeners.UpdateOpts` to allow the value to be removed during update. [GH-1723](https://github.com/gophercloud/gophercloud/pull/1723)
+* Changed `SniContainerRefs` from `[]string{}` to `*[]string{}` in `loadbalancer/v2/listeners.UpdateOpts` to allow the value to be removed during update. [GH-1723](https://github.com/gophercloud/gophercloud/pull/1723)
+* Changed `DefaultTlsContainerRef` from `string` to `*string` in `networking/v2/extensions/lbaas_v2/listeners.UpdateOpts` to allow the value to be removed during update. [GH-1723](https://github.com/gophercloud/gophercloud/pull/1723)
+* Changed `SniContainerRefs` from `[]string{}` to `*[]string{}` in `networking/v2/extensions/lbaas_v2/listeners.UpdateOpts` to allow the value to be removed during update. [GH-1723](https://github.com/gophercloud/gophercloud/pull/1723)
+
+
+## 0.4.0 (September 3, 2019)
+
+IMPROVEMENTS
+
+* Added `blockstorage/extensions/quotasets.results.QuotaSet.Groups` [GH-1668](https://github.com/gophercloud/gophercloud/pull/1668)
+* Added `blockstorage/extensions/quotasets.results.QuotaUsageSet.Groups` [GH-1668](https://github.com/gophercloud/gophercloud/pull/1668)
+* Added `containerinfra/v1/clusters.CreateOpts.FixedNetwork` [GH-1674](https://github.com/gophercloud/gophercloud/pull/1674)
+* Added `containerinfra/v1/clusters.CreateOpts.FixedSubnet` [GH-1676](https://github.com/gophercloud/gophercloud/pull/1676)
+* Added `containerinfra/v1/clusters.CreateOpts.FloatingIPEnabled` [GH-1677](https://github.com/gophercloud/gophercloud/pull/1677)
+* Added `CreatedAt` and `UpdatedAt` to `loadbalancers/v2/loadbalancers.LoadBalancer` [GH-1681](https://github.com/gophercloud/gophercloud/pull/1681)
+* Added `networking/v2/extensions/layer3/portforwarding.Create` [GH-1651](https://github.com/gophercloud/gophercloud/pull/1651)
+* Added `networking/v2/extensions/agents.ListDHCPNetworks` [GH-1686](https://github.com/gophercloud/gophercloud/pull/1686)
+* Added `networking/v2/extensions/layer3/portforwarding.Delete` [GH-1652](https://github.com/gophercloud/gophercloud/pull/1652)
+* Added `compute/v2/extensions/tags.List` [GH-1679](https://github.com/gophercloud/gophercloud/pull/1679)
+* Added `compute/v2/extensions/tags.Check` [GH-1679](https://github.com/gophercloud/gophercloud/pull/1679)
+
+BUG FIXES
+
+* Changed `identity/v3/endpoints.ListOpts.RegionID` from `int` to `string` [GH-1664](https://github.com/gophercloud/gophercloud/pull/1664)
+* Fixed issue where older time formats in some networking APIs/resources were unable to be parsed [GH-1671](https://github.com/gophercloud/gophercloud/pull/1664)
+* Changed `SATA`, `SCSI`, and `SAS` types to `InterfaceType` in `baremetal/v1/nodes` [GH-1683]
+
+## 0.3.0 (July 31, 2019)
+
+IMPROVEMENTS
+
+* Added `baremetal/apiversions.List` [GH-1577](https://github.com/gophercloud/gophercloud/pull/1577)
+* Added `baremetal/apiversions.Get` [GH-1577](https://github.com/gophercloud/gophercloud/pull/1577)
+* Added `compute/v2/extensions/servergroups.CreateOpts.Policy` [GH-1636](https://github.com/gophercloud/gophercloud/pull/1636)
+* Added `identity/v3/extensions/trusts.Create` [GH-1644](https://github.com/gophercloud/gophercloud/pull/1644)
+* Added `identity/v3/extensions/trusts.Delete` [GH-1644](https://github.com/gophercloud/gophercloud/pull/1644)
+* Added `CreatedAt` and `UpdatedAt` to `networking/v2/extensions/layer3/floatingips.FloatingIP` [GH-1647](https://github.com/gophercloud/gophercloud/issues/1646)
+* Added `CreatedAt` and `UpdatedAt` to `networking/v2/extensions/security/groups.SecGroup` [GH-1654](https://github.com/gophercloud/gophercloud/issues/1654)
+* Added `CreatedAt` and `UpdatedAt` to `networking/v2/networks.Network` [GH-1657](https://github.com/gophercloud/gophercloud/issues/1657)
+* Added `keymanager/v1/containers.CreateSecretRef` [GH-1659](https://github.com/gophercloud/gophercloud/issues/1659)
+* Added `keymanager/v1/containers.DeleteSecretRef` [GH-1659](https://github.com/gophercloud/gophercloud/issues/1659)
+* Added `sharedfilesystems/v2/shares.GetMetadata` [GH-1656](https://github.com/gophercloud/gophercloud/issues/1656)
+* Added `sharedfilesystems/v2/shares.GetMetadatum` [GH-1656](https://github.com/gophercloud/gophercloud/issues/1656)
+* Added `sharedfilesystems/v2/shares.SetMetadata` [GH-1656](https://github.com/gophercloud/gophercloud/issues/1656)
+* Added `sharedfilesystems/v2/shares.UpdateMetadata` [GH-1656](https://github.com/gophercloud/gophercloud/issues/1656)
+* Added `sharedfilesystems/v2/shares.DeleteMetadatum` [GH-1656](https://github.com/gophercloud/gophercloud/issues/1656)
+* Added `sharedfilesystems/v2/sharetypes.IDFromName` [GH-1662](https://github.com/gophercloud/gophercloud/issues/1662)
+
+
+
+BUG FIXES
+
+* Changed `baremetal/v1/nodes.CleanStep.Args` from `map[string]string` to `map[string]interface{}` [GH-1638](https://github.com/gophercloud/gophercloud/pull/1638)
+* Removed `URLPath` and `ExpectedCodes` from `loadbalancer/v2/monitors.ToMonitorCreateMap` since Octavia now provides default values when these fields are not specified [GH-1640](https://github.com/gophercloud/gophercloud/pull/1540)
+
+
+## 0.2.0 (June 17, 2019)
+
+IMPROVEMENTS
+
+* Added `networking/v2/extensions/qos/rules.ListBandwidthLimitRules` [GH-1584](https://github.com/gophercloud/gophercloud/pull/1584)
+* Added `networking/v2/extensions/qos/rules.GetBandwidthLimitRule` [GH-1584](https://github.com/gophercloud/gophercloud/pull/1584)
+* Added `networking/v2/extensions/qos/rules.CreateBandwidthLimitRule` [GH-1584](https://github.com/gophercloud/gophercloud/pull/1584)
+* Added `networking/v2/extensions/qos/rules.UpdateBandwidthLimitRule` [GH-1589](https://github.com/gophercloud/gophercloud/pull/1589)
+* Added `networking/v2/extensions/qos/rules.DeleteBandwidthLimitRule` [GH-1590](https://github.com/gophercloud/gophercloud/pull/1590)
+* Added `networking/v2/extensions/qos/policies.List` [GH-1591](https://github.com/gophercloud/gophercloud/pull/1591)
+* Added `networking/v2/extensions/qos/policies.Get` [GH-1593](https://github.com/gophercloud/gophercloud/pull/1593)
+* Added `networking/v2/extensions/qos/rules.ListDSCPMarkingRules` [GH-1594](https://github.com/gophercloud/gophercloud/pull/1594)
+* Added `networking/v2/extensions/qos/policies.Create` [GH-1595](https://github.com/gophercloud/gophercloud/pull/1595)
+* Added `compute/v2/extensions/diagnostics.Get` [GH-1592](https://github.com/gophercloud/gophercloud/pull/1592)
+* Added `networking/v2/extensions/qos/policies.Update` [GH-1603](https://github.com/gophercloud/gophercloud/pull/1603)
+* Added `networking/v2/extensions/qos/policies.Delete` [GH-1603](https://github.com/gophercloud/gophercloud/pull/1603)
+* Added `networking/v2/extensions/qos/rules.CreateDSCPMarkingRule` [GH-1605](https://github.com/gophercloud/gophercloud/pull/1605)
+* Added `networking/v2/extensions/qos/rules.UpdateDSCPMarkingRule` [GH-1605](https://github.com/gophercloud/gophercloud/pull/1605)
+* Added `networking/v2/extensions/qos/rules.GetDSCPMarkingRule` [GH-1609](https://github.com/gophercloud/gophercloud/pull/1609)
+* Added `networking/v2/extensions/qos/rules.DeleteDSCPMarkingRule` [GH-1609](https://github.com/gophercloud/gophercloud/pull/1609)
+* Added `networking/v2/extensions/qos/rules.ListMinimumBandwidthRules` [GH-1615](https://github.com/gophercloud/gophercloud/pull/1615)
+* Added `networking/v2/extensions/qos/rules.GetMinimumBandwidthRule` [GH-1615](https://github.com/gophercloud/gophercloud/pull/1615)
+* Added `networking/v2/extensions/qos/rules.CreateMinimumBandwidthRule` [GH-1615](https://github.com/gophercloud/gophercloud/pull/1615)
+* Added `Hostname` to `baremetalintrospection/v1/introspection.Data` [GH-1627](https://github.com/gophercloud/gophercloud/pull/1627)
+* Added `networking/v2/extensions/qos/rules.UpdateMinimumBandwidthRule` [GH-1624](https://github.com/gophercloud/gophercloud/pull/1624)
+* Added `networking/v2/extensions/qos/rules.DeleteMinimumBandwidthRule` [GH-1624](https://github.com/gophercloud/gophercloud/pull/1624)
+* Added `networking/v2/extensions/qos/ruletypes.GetRuleType` [GH-1625](https://github.com/gophercloud/gophercloud/pull/1625)
+* Added `Extra` to `baremetalintrospection/v1/introspection.Data` [GH-1611](https://github.com/gophercloud/gophercloud/pull/1611)
+* Added `blockstorage/extensions/volumeactions.SetImageMetadata` [GH-1621](https://github.com/gophercloud/gophercloud/pull/1621)
+
+BUG FIXES
+
+* Updated `networking/v2/extensions/qos/rules.UpdateBandwidthLimitRule` to use return code 200 [GH-1606](https://github.com/gophercloud/gophercloud/pull/1606)
+* Fixed bug in `compute/v2/extensions/schedulerhints.SchedulerHints.Query` where contents will now be marshalled to a string [GH-1620](https://github.com/gophercloud/gophercloud/pull/1620)
+
+## 0.1.0 (May 27, 2019)
+
+Initial tagged release.
diff --git a/vendor/github.com/gophercloud/gophercloud/LICENSE b/vendor/github.com/gophercloud/gophercloud/LICENSE
new file mode 100644
index 0000000000..c3f4f2f7c9
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/LICENSE
@@ -0,0 +1,192 @@
+Copyright 2012-2013 Rackspace, Inc.
+Copyright Gophercloud 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.
+
+------
+
+ 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
diff --git a/vendor/github.com/gophercloud/gophercloud/README.md b/vendor/github.com/gophercloud/gophercloud/README.md
new file mode 100644
index 0000000000..4e6e57dadb
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/README.md
@@ -0,0 +1,172 @@
+# Gophercloud: an OpenStack SDK for Go
+[](https://coveralls.io/github/gophercloud/gophercloud?branch=v1)
+
+Gophercloud is an OpenStack Go SDK.
+
+## Useful links
+
+* [Reference documentation](http://godoc.org/github.com/gophercloud/gophercloud)
+* [Effective Go](https://golang.org/doc/effective_go.html)
+
+## How to install
+
+Reference a Gophercloud package in your code:
+
+```go
+import "github.com/gophercloud/gophercloud"
+```
+
+Then update your `go.mod`:
+
+```shell
+go mod tidy
+```
+
+## Getting started
+
+### Credentials
+
+Because you'll be hitting an API, you will need to retrieve your OpenStack
+credentials and either store them in a `clouds.yaml` file, as environment
+variables, or in your local Go files. The first method is recommended because
+it decouples credential information from source code, allowing you to push the
+latter to your version control system without any security risk.
+
+You will need to retrieve the following:
+
+* A valid Keystone identity URL
+* Credentials. These can be a username/password combo, a set of Application
+ Credentials, a pre-generated token, or any other supported authentication
+ mechanism.
+
+For users who have the OpenStack dashboard installed, there's a shortcut. If
+you visit the `project/api_access` path in Horizon and click on the
+"Download OpenStack RC File" button at the top right hand corner, you can
+download either a `clouds.yaml` file or an `openrc` bash file that exports all
+of your access details to environment variables. To use the `clouds.yaml` file,
+place it at `~/.config/openstack/clouds.yaml`. To use the `openrc` file, run
+`source openrc` and you will be prompted for your password.
+
+### Authentication
+
+Once you have access to your credentials, you can begin plugging them into
+Gophercloud. The next step is authentication, which is handled by a base
+"Provider" struct. There are number of ways to construct such a struct.
+
+**With `gophercloud/utils`**
+
+The [github.com/gophercloud/utils](https://github.com/gophercloud/utils)
+library provides the `clientconfig` package to simplify authentication. It
+provides additional functionality, such as the ability to read `clouds.yaml`
+files. To generate a "Provider" struct using the `clientconfig` package:
+
+```go
+import (
+ "github.com/gophercloud/utils/openstack/clientconfig"
+)
+
+// You can also skip configuring this and instead set 'OS_CLOUD' in your
+// environment
+opts := new(clientconfig.ClientOpts)
+opts.Cloud = "devstack-admin"
+
+provider, err := clientconfig.AuthenticatedClient(opts)
+```
+
+A provider client is a top-level client that all of your OpenStack service
+clients derive from. The provider contains all of the authentication details
+that allow your Go code to access the API - such as the base URL and token ID.
+
+Once we have a base Provider, we inject it as a dependency into each OpenStack
+service. For example, in order to work with the Compute API, we need a Compute
+service client. This can be created like so:
+
+```go
+client, err := clientconfig.NewServiceClient("compute", opts)
+```
+
+**Without `gophercloud/utils`**
+
+> *Note*
+> gophercloud doesn't provide support for `clouds.yaml` file so you need to
+> implement this functionality yourself if you don't wish to use
+> `gophercloud/utils`.
+
+You can also generate a "Provider" struct without using the `clientconfig`
+package from `gophercloud/utils`. To do this, you can either pass in your
+credentials explicitly or tell Gophercloud to use environment variables:
+
+```go
+import (
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/openstack"
+)
+
+// Option 1: Pass in the values yourself
+opts := gophercloud.AuthOptions{
+ IdentityEndpoint: "https://openstack.example.com:5000/v2.0",
+ Username: "{username}",
+ Password: "{password}",
+}
+
+// Option 2: Use a utility function to retrieve all your environment variables
+opts, err := openstack.AuthOptionsFromEnv()
+```
+
+Once you have the `opts` variable, you can pass it in and get back a
+`ProviderClient` struct:
+
+```go
+provider, err := openstack.AuthenticatedClient(opts)
+```
+
+As above, you can then use this provider client to generate a service client
+for a particular OpenStack service:
+
+```go
+client, err := openstack.NewComputeV2(provider, gophercloud.EndpointOpts{
+ Region: os.Getenv("OS_REGION_NAME"),
+})
+```
+
+### Provision a server
+
+We can use the Compute service client generated above for any Compute API
+operation we want. In our case, we want to provision a new server. To do this,
+we invoke the `Create` method and pass in the flavor ID (hardware
+specification) and image ID (operating system) we're interested in:
+
+```go
+import "github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
+
+server, err := servers.Create(client, servers.CreateOpts{
+ Name: "My new server!",
+ FlavorRef: "flavor_id",
+ ImageRef: "image_id",
+}).Extract()
+```
+
+The above code sample creates a new server with the parameters, and embodies the
+new resource in the `server` variable (a
+[`servers.Server`](http://godoc.org/github.com/gophercloud/gophercloud) struct).
+
+## Advanced Usage
+
+Have a look at the [FAQ](./docs/FAQ.md) for some tips on customizing the way Gophercloud works.
+
+## Backwards-Compatibility Guarantees
+
+Gophercloud versioning follows [semver](https://semver.org/spec/v2.0.0.html).
+
+Before `v1.0.0`, there were no guarantees. Starting with v1, there will be no breaking changes within a major release.
+
+See the [Release instructions](./RELEASE.md).
+
+## Contributing
+
+See the [contributing guide](./.github/CONTRIBUTING.md).
+
+## Help and feedback
+
+If you're struggling with something or have spotted a potential bug, feel free
+to submit an issue to our [bug tracker](https://github.com/gophercloud/gophercloud/issues).
diff --git a/vendor/github.com/gophercloud/gophercloud/RELEASE.md b/vendor/github.com/gophercloud/gophercloud/RELEASE.md
new file mode 100644
index 0000000000..6490ed8877
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/RELEASE.md
@@ -0,0 +1,79 @@
+# Gophercloud release
+
+## Contributions
+
+### The semver label
+
+Gophercloud follows [semver](https://semver.org/).
+
+Each Pull request must have a label indicating its impact on the API:
+* `semver:patch` for changes that don't impact the API
+* `semver:minor` for changes that impact the API in a backwards-compatible fashion
+* `semver:major` for changes that introduce a breaking change in the API
+
+Automation prevents merges if the label is not present.
+
+### Metadata
+
+The release notes for a given release are generated based on the PR title: make
+sure that the PR title is descriptive.
+
+## Release of a new version
+
+Requirements:
+* [`gh`](https://github.com/cli/cli)
+* [`jq`](https://stedolan.github.io/jq/)
+
+### Step 1: Collect all PRs since the last release
+
+Supposing that the base release is `v1.2.0`:
+
+```
+for commit_sha in $(git log --pretty=format:"%h" v1.2.0..HEAD); do
+ gh pr list --search "$commit_sha" --state merged --json number,title,labels,url
+done | jq '.[]' | jq --slurp 'unique_by(.number)' > prs.json
+```
+
+This JSON file will be useful later.
+
+### Step 2: Determine the version
+
+In order to determine the version of the next release, we first check that no incompatible change is detected in the code that has been merged since the last release. This step can be automated with the `gorelease` tool:
+
+```shell
+gorelease | grep -B2 -A0 '^## incompatible changes'
+```
+
+If the tool detects incompatible changes outside a `testing` package, then the bump is major.
+
+Next, we check all PRs merged since the last release using the file `prs.json` that we generated above.
+
+* Find PRs labeled with `semver:major`: `jq 'map(select(contains({labels: [{name: "semver:major"}]}) ))' prs.json`
+* Find PRs labeled with `semver:minor`: `jq 'map(select(contains({labels: [{name: "semver:minor"}]}) ))' prs.json`
+
+The highest semver descriptor determines the release bump.
+
+### Step 3: Release notes and version string
+
+Once all PRs have a sensible title, generate the release notes:
+
+```shell
+jq -r '.[] | "* [GH-\(.number)](\(.url)) \(.title)"' prs.json
+```
+
+Add that to the top of `CHANGELOG.md`. Also add any information that could be useful to consumers willing to upgrade.
+
+**Set the new version string in the `DefaultUserAgent` constant in `provider_client.go`.**
+
+Create a PR with these two changes. The new PR should be labeled with the semver label corresponding to the type of bump.
+
+### Step 3: Git tag and Github release
+
+The Go mod system relies on Git tags. In order to simulate a review mechanism, we rely on Github to create the tag through the Release mechanism.
+
+* [Prepare a new release](https://github.com/gophercloud/gophercloud/releases/new)
+* Let Github generate the release notes by clicking on Generate release notes
+* Click on **Save draft**
+* Ask another Gophercloud maintainer to review and publish the release
+
+_Note: never change a release or force-push a tag. Tags are almost immediately picked up by the Go proxy and changing the commit it points to will be detected as tampering._
diff --git a/vendor/github.com/gophercloud/gophercloud/auth_options.go b/vendor/github.com/gophercloud/gophercloud/auth_options.go
new file mode 100644
index 0000000000..335ce87957
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/auth_options.go
@@ -0,0 +1,514 @@
+package gophercloud
+
+/*
+AuthOptions stores information needed to authenticate to an OpenStack Cloud.
+You can populate one manually, or use a provider's AuthOptionsFromEnv() function
+to read relevant information from the standard environment variables. Pass one
+to a provider's AuthenticatedClient function to authenticate and obtain a
+ProviderClient representing an active session on that provider.
+
+Its fields are the union of those recognized by each identity implementation and
+provider.
+
+An example of manually providing authentication information:
+
+ opts := gophercloud.AuthOptions{
+ IdentityEndpoint: "https://openstack.example.com:5000/v2.0",
+ Username: "{username}",
+ Password: "{password}",
+ TenantID: "{tenant_id}",
+ }
+
+ provider, err := openstack.AuthenticatedClient(opts)
+
+An example of using AuthOptionsFromEnv(), where the environment variables can
+be read from a file, such as a standard openrc file:
+
+ opts, err := openstack.AuthOptionsFromEnv()
+ provider, err := openstack.AuthenticatedClient(opts)
+*/
+type AuthOptions struct {
+ // IdentityEndpoint specifies the HTTP endpoint that is required to work with
+ // the Identity API of the appropriate version. While it's ultimately needed by
+ // all of the identity services, it will often be populated by a provider-level
+ // function.
+ //
+ // The IdentityEndpoint is typically referred to as the "auth_url" or
+ // "OS_AUTH_URL" in the information provided by the cloud operator.
+ IdentityEndpoint string `json:"-"`
+
+ // Username is required if using Identity V2 API. Consult with your provider's
+ // control panel to discover your account's username. In Identity V3, either
+ // UserID or a combination of Username and DomainID or DomainName are needed.
+ Username string `json:"username,omitempty"`
+ UserID string `json:"-"`
+
+ Password string `json:"password,omitempty"`
+
+ // Passcode is used in TOTP authentication method
+ Passcode string `json:"passcode,omitempty"`
+
+ // At most one of DomainID and DomainName must be provided if using Username
+ // with Identity V3. Otherwise, either are optional.
+ DomainID string `json:"-"`
+ DomainName string `json:"name,omitempty"`
+
+ // The TenantID and TenantName fields are optional for the Identity V2 API.
+ // The same fields are known as project_id and project_name in the Identity
+ // V3 API, but are collected as TenantID and TenantName here in both cases.
+ // Some providers allow you to specify a TenantName instead of the TenantId.
+ // Some require both. Your provider's authentication policies will determine
+ // how these fields influence authentication.
+ // If DomainID or DomainName are provided, they will also apply to TenantName.
+ // It is not currently possible to authenticate with Username and a Domain
+ // and scope to a Project in a different Domain by using TenantName. To
+ // accomplish that, the ProjectID will need to be provided as the TenantID
+ // option.
+ TenantID string `json:"tenantId,omitempty"`
+ TenantName string `json:"tenantName,omitempty"`
+
+ // AllowReauth should be set to true if you grant permission for Gophercloud to
+ // cache your credentials in memory, and to allow Gophercloud to attempt to
+ // re-authenticate automatically if/when your token expires. If you set it to
+ // false, it will not cache these settings, but re-authentication will not be
+ // possible. This setting defaults to false.
+ //
+ // NOTE: The reauth function will try to re-authenticate endlessly if left
+ // unchecked. The way to limit the number of attempts is to provide a custom
+ // HTTP client to the provider client and provide a transport that implements
+ // the RoundTripper interface and stores the number of failed retries. For an
+ // example of this, see here:
+ // https://github.com/rackspace/rack/blob/1.0.0/auth/clients.go#L311
+ AllowReauth bool `json:"-"`
+
+ // TokenID allows users to authenticate (possibly as another user) with an
+ // authentication token ID.
+ TokenID string `json:"-"`
+
+ // Scope determines the scoping of the authentication request.
+ Scope *AuthScope `json:"-"`
+
+ // Authentication through Application Credentials requires supplying name, project and secret
+ // For project we can use TenantID
+ ApplicationCredentialID string `json:"-"`
+ ApplicationCredentialName string `json:"-"`
+ ApplicationCredentialSecret string `json:"-"`
+}
+
+// AuthScope allows a created token to be limited to a specific domain or project.
+type AuthScope struct {
+ ProjectID string
+ ProjectName string
+ DomainID string
+ DomainName string
+ System bool
+}
+
+// ToTokenV2CreateMap allows AuthOptions to satisfy the AuthOptionsBuilder
+// interface in the v2 tokens package
+func (opts AuthOptions) ToTokenV2CreateMap() (map[string]interface{}, error) {
+ // Populate the request map.
+ authMap := make(map[string]interface{})
+
+ if opts.Username != "" {
+ if opts.Password != "" {
+ authMap["passwordCredentials"] = map[string]interface{}{
+ "username": opts.Username,
+ "password": opts.Password,
+ }
+ } else {
+ return nil, ErrMissingInput{Argument: "Password"}
+ }
+ } else if opts.TokenID != "" {
+ authMap["token"] = map[string]interface{}{
+ "id": opts.TokenID,
+ }
+ } else {
+ return nil, ErrMissingInput{Argument: "Username"}
+ }
+
+ if opts.TenantID != "" {
+ authMap["tenantId"] = opts.TenantID
+ }
+ if opts.TenantName != "" {
+ authMap["tenantName"] = opts.TenantName
+ }
+
+ return map[string]interface{}{"auth": authMap}, nil
+}
+
+// ToTokenV3CreateMap allows AuthOptions to satisfy the AuthOptionsBuilder
+// interface in the v3 tokens package
+func (opts *AuthOptions) ToTokenV3CreateMap(scope map[string]interface{}) (map[string]interface{}, error) {
+ type domainReq struct {
+ ID *string `json:"id,omitempty"`
+ Name *string `json:"name,omitempty"`
+ }
+
+ type projectReq struct {
+ Domain *domainReq `json:"domain,omitempty"`
+ Name *string `json:"name,omitempty"`
+ ID *string `json:"id,omitempty"`
+ }
+
+ type userReq struct {
+ ID *string `json:"id,omitempty"`
+ Name *string `json:"name,omitempty"`
+ Password *string `json:"password,omitempty"`
+ Passcode *string `json:"passcode,omitempty"`
+ Domain *domainReq `json:"domain,omitempty"`
+ }
+
+ type passwordReq struct {
+ User userReq `json:"user"`
+ }
+
+ type tokenReq struct {
+ ID string `json:"id"`
+ }
+
+ type applicationCredentialReq struct {
+ ID *string `json:"id,omitempty"`
+ Name *string `json:"name,omitempty"`
+ User *userReq `json:"user,omitempty"`
+ Secret *string `json:"secret,omitempty"`
+ }
+
+ type totpReq struct {
+ User *userReq `json:"user,omitempty"`
+ }
+
+ type identityReq struct {
+ Methods []string `json:"methods"`
+ Password *passwordReq `json:"password,omitempty"`
+ Token *tokenReq `json:"token,omitempty"`
+ ApplicationCredential *applicationCredentialReq `json:"application_credential,omitempty"`
+ TOTP *totpReq `json:"totp,omitempty"`
+ }
+
+ type authReq struct {
+ Identity identityReq `json:"identity"`
+ }
+
+ type request struct {
+ Auth authReq `json:"auth"`
+ }
+
+ // Populate the request structure based on the provided arguments. Create and return an error
+ // if insufficient or incompatible information is present.
+ var req request
+
+ if opts.Password == "" && opts.Passcode == "" {
+ if opts.TokenID != "" {
+ // Because we aren't using password authentication, it's an error to also provide any of the user-based authentication
+ // parameters.
+ if opts.Username != "" {
+ return nil, ErrUsernameWithToken{}
+ }
+ if opts.UserID != "" {
+ return nil, ErrUserIDWithToken{}
+ }
+ if opts.DomainID != "" {
+ return nil, ErrDomainIDWithToken{}
+ }
+ if opts.DomainName != "" {
+ return nil, ErrDomainNameWithToken{}
+ }
+
+ // Configure the request for Token authentication.
+ req.Auth.Identity.Methods = []string{"token"}
+ req.Auth.Identity.Token = &tokenReq{
+ ID: opts.TokenID,
+ }
+
+ } else if opts.ApplicationCredentialID != "" {
+ // Configure the request for ApplicationCredentialID authentication.
+ // https://github.com/openstack/keystoneauth/blob/stable/rocky/keystoneauth1/identity/v3/application_credential.py#L48-L67
+ // There are three kinds of possible application_credential requests
+ // 1. application_credential id + secret
+ // 2. application_credential name + secret + user_id
+ // 3. application_credential name + secret + username + domain_id / domain_name
+ if opts.ApplicationCredentialSecret == "" {
+ return nil, ErrAppCredMissingSecret{}
+ }
+ req.Auth.Identity.Methods = []string{"application_credential"}
+ req.Auth.Identity.ApplicationCredential = &applicationCredentialReq{
+ ID: &opts.ApplicationCredentialID,
+ Secret: &opts.ApplicationCredentialSecret,
+ }
+ } else if opts.ApplicationCredentialName != "" {
+ if opts.ApplicationCredentialSecret == "" {
+ return nil, ErrAppCredMissingSecret{}
+ }
+
+ var userRequest *userReq
+
+ if opts.UserID != "" {
+ // UserID could be used without the domain information
+ userRequest = &userReq{
+ ID: &opts.UserID,
+ }
+ }
+
+ if userRequest == nil && opts.Username == "" {
+ // Make sure that Username or UserID are provided
+ return nil, ErrUsernameOrUserID{}
+ }
+
+ if userRequest == nil && opts.DomainID != "" {
+ userRequest = &userReq{
+ Name: &opts.Username,
+ Domain: &domainReq{ID: &opts.DomainID},
+ }
+ }
+
+ if userRequest == nil && opts.DomainName != "" {
+ userRequest = &userReq{
+ Name: &opts.Username,
+ Domain: &domainReq{Name: &opts.DomainName},
+ }
+ }
+
+ // Make sure that DomainID or DomainName are provided among Username
+ if userRequest == nil {
+ return nil, ErrDomainIDOrDomainName{}
+ }
+
+ req.Auth.Identity.Methods = []string{"application_credential"}
+ req.Auth.Identity.ApplicationCredential = &applicationCredentialReq{
+ Name: &opts.ApplicationCredentialName,
+ User: userRequest,
+ Secret: &opts.ApplicationCredentialSecret,
+ }
+ } else {
+ // If no password or token ID or ApplicationCredential are available, authentication can't continue.
+ return nil, ErrMissingPassword{}
+ }
+ } else {
+ // Password authentication.
+ if opts.Password != "" {
+ req.Auth.Identity.Methods = append(req.Auth.Identity.Methods, "password")
+ }
+
+ // TOTP authentication.
+ if opts.Passcode != "" {
+ req.Auth.Identity.Methods = append(req.Auth.Identity.Methods, "totp")
+ }
+
+ // At least one of Username and UserID must be specified.
+ if opts.Username == "" && opts.UserID == "" {
+ return nil, ErrUsernameOrUserID{}
+ }
+
+ if opts.Username != "" {
+ // If Username is provided, UserID may not be provided.
+ if opts.UserID != "" {
+ return nil, ErrUsernameOrUserID{}
+ }
+
+ // Either DomainID or DomainName must also be specified.
+ if opts.DomainID == "" && opts.DomainName == "" {
+ return nil, ErrDomainIDOrDomainName{}
+ }
+
+ if opts.DomainID != "" {
+ if opts.DomainName != "" {
+ return nil, ErrDomainIDOrDomainName{}
+ }
+
+ // Configure the request for Username and Password authentication with a DomainID.
+ if opts.Password != "" {
+ req.Auth.Identity.Password = &passwordReq{
+ User: userReq{
+ Name: &opts.Username,
+ Password: &opts.Password,
+ Domain: &domainReq{ID: &opts.DomainID},
+ },
+ }
+ }
+ if opts.Passcode != "" {
+ req.Auth.Identity.TOTP = &totpReq{
+ User: &userReq{
+ Name: &opts.Username,
+ Passcode: &opts.Passcode,
+ Domain: &domainReq{ID: &opts.DomainID},
+ },
+ }
+ }
+ }
+
+ if opts.DomainName != "" {
+ // Configure the request for Username and Password authentication with a DomainName.
+ if opts.Password != "" {
+ req.Auth.Identity.Password = &passwordReq{
+ User: userReq{
+ Name: &opts.Username,
+ Password: &opts.Password,
+ Domain: &domainReq{Name: &opts.DomainName},
+ },
+ }
+ }
+
+ if opts.Passcode != "" {
+ req.Auth.Identity.TOTP = &totpReq{
+ User: &userReq{
+ Name: &opts.Username,
+ Passcode: &opts.Passcode,
+ Domain: &domainReq{Name: &opts.DomainName},
+ },
+ }
+ }
+ }
+ }
+
+ if opts.UserID != "" {
+ // If UserID is specified, neither DomainID nor DomainName may be.
+ if opts.DomainID != "" {
+ return nil, ErrDomainIDWithUserID{}
+ }
+ if opts.DomainName != "" {
+ return nil, ErrDomainNameWithUserID{}
+ }
+
+ // Configure the request for UserID and Password authentication.
+ if opts.Password != "" {
+ req.Auth.Identity.Password = &passwordReq{
+ User: userReq{
+ ID: &opts.UserID,
+ Password: &opts.Password,
+ },
+ }
+ }
+
+ if opts.Passcode != "" {
+ req.Auth.Identity.TOTP = &totpReq{
+ User: &userReq{
+ ID: &opts.UserID,
+ Passcode: &opts.Passcode,
+ },
+ }
+ }
+ }
+ }
+
+ b, err := BuildRequestBody(req, "")
+ if err != nil {
+ return nil, err
+ }
+
+ if len(scope) != 0 {
+ b["auth"].(map[string]interface{})["scope"] = scope
+ }
+
+ return b, nil
+}
+
+// ToTokenV3ScopeMap builds a scope from AuthOptions and satisfies interface in
+// the v3 tokens package.
+func (opts *AuthOptions) ToTokenV3ScopeMap() (map[string]interface{}, error) {
+ // For backwards compatibility.
+ // If AuthOptions.Scope was not set, try to determine it.
+ // This works well for common scenarios.
+ if opts.Scope == nil {
+ opts.Scope = new(AuthScope)
+ if opts.TenantID != "" {
+ opts.Scope.ProjectID = opts.TenantID
+ } else {
+ if opts.TenantName != "" {
+ opts.Scope.ProjectName = opts.TenantName
+ opts.Scope.DomainID = opts.DomainID
+ opts.Scope.DomainName = opts.DomainName
+ }
+ }
+ }
+
+ if opts.Scope.System {
+ return map[string]interface{}{
+ "system": map[string]interface{}{
+ "all": true,
+ },
+ }, nil
+ }
+
+ if opts.Scope.ProjectName != "" {
+ // ProjectName provided: either DomainID or DomainName must also be supplied.
+ // ProjectID may not be supplied.
+ if opts.Scope.DomainID == "" && opts.Scope.DomainName == "" {
+ return nil, ErrScopeDomainIDOrDomainName{}
+ }
+ if opts.Scope.ProjectID != "" {
+ return nil, ErrScopeProjectIDOrProjectName{}
+ }
+
+ if opts.Scope.DomainID != "" {
+ // ProjectName + DomainID
+ return map[string]interface{}{
+ "project": map[string]interface{}{
+ "name": &opts.Scope.ProjectName,
+ "domain": map[string]interface{}{"id": &opts.Scope.DomainID},
+ },
+ }, nil
+ }
+
+ if opts.Scope.DomainName != "" {
+ // ProjectName + DomainName
+ return map[string]interface{}{
+ "project": map[string]interface{}{
+ "name": &opts.Scope.ProjectName,
+ "domain": map[string]interface{}{"name": &opts.Scope.DomainName},
+ },
+ }, nil
+ }
+ } else if opts.Scope.ProjectID != "" {
+ // ProjectID provided. ProjectName, DomainID, and DomainName may not be provided.
+ if opts.Scope.DomainID != "" {
+ return nil, ErrScopeProjectIDAlone{}
+ }
+ if opts.Scope.DomainName != "" {
+ return nil, ErrScopeProjectIDAlone{}
+ }
+
+ // ProjectID
+ return map[string]interface{}{
+ "project": map[string]interface{}{
+ "id": &opts.Scope.ProjectID,
+ },
+ }, nil
+ } else if opts.Scope.DomainID != "" {
+ // DomainID provided. ProjectID, ProjectName, and DomainName may not be provided.
+ if opts.Scope.DomainName != "" {
+ return nil, ErrScopeDomainIDOrDomainName{}
+ }
+
+ // DomainID
+ return map[string]interface{}{
+ "domain": map[string]interface{}{
+ "id": &opts.Scope.DomainID,
+ },
+ }, nil
+ } else if opts.Scope.DomainName != "" {
+ // DomainName
+ return map[string]interface{}{
+ "domain": map[string]interface{}{
+ "name": &opts.Scope.DomainName,
+ },
+ }, nil
+ }
+
+ return nil, nil
+}
+
+func (opts AuthOptions) CanReauth() bool {
+ if opts.Passcode != "" {
+ // cannot reauth using TOTP passcode
+ return false
+ }
+
+ return opts.AllowReauth
+}
+
+// ToTokenV3HeadersMap allows AuthOptions to satisfy the AuthOptionsBuilder
+// interface in the v3 tokens package.
+func (opts *AuthOptions) ToTokenV3HeadersMap(map[string]interface{}) (map[string]string, error) {
+ return nil, nil
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/auth_result.go b/vendor/github.com/gophercloud/gophercloud/auth_result.go
new file mode 100644
index 0000000000..2e4699b978
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/auth_result.go
@@ -0,0 +1,52 @@
+package gophercloud
+
+/*
+AuthResult is the result from the request that was used to obtain a provider
+client's Keystone token. It is returned from ProviderClient.GetAuthResult().
+
+The following types satisfy this interface:
+
+ github.com/gophercloud/gophercloud/openstack/identity/v2/tokens.CreateResult
+ github.com/gophercloud/gophercloud/openstack/identity/v3/tokens.CreateResult
+
+Usage example:
+
+ import (
+ "github.com/gophercloud/gophercloud"
+ tokens2 "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens"
+ tokens3 "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens"
+ )
+
+ func GetAuthenticatedUserID(providerClient *gophercloud.ProviderClient) (string, error) {
+ r := providerClient.GetAuthResult()
+ if r == nil {
+ //ProviderClient did not use openstack.Authenticate(), e.g. because token
+ //was set manually with ProviderClient.SetToken()
+ return "", errors.New("no AuthResult available")
+ }
+ switch r := r.(type) {
+ case tokens2.CreateResult:
+ u, err := r.ExtractUser()
+ if err != nil {
+ return "", err
+ }
+ return u.ID, nil
+ case tokens3.CreateResult:
+ u, err := r.ExtractUser()
+ if err != nil {
+ return "", err
+ }
+ return u.ID, nil
+ default:
+ panic(fmt.Sprintf("got unexpected AuthResult type %t", r))
+ }
+ }
+
+Both implementing types share a lot of methods by name, like ExtractUser() in
+this example. But those methods cannot be part of the AuthResult interface
+because the return types are different (in this case, type tokens2.User vs.
+type tokens3.User).
+*/
+type AuthResult interface {
+ ExtractTokenID() (string, error)
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/doc.go b/vendor/github.com/gophercloud/gophercloud/doc.go
new file mode 100644
index 0000000000..19b64d6508
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/doc.go
@@ -0,0 +1,148 @@
+/*
+Package gophercloud provides a multi-vendor interface to OpenStack-compatible
+clouds. The library has a three-level hierarchy: providers, services, and
+resources.
+
+# Authenticating with Providers
+
+Provider structs represent the cloud providers that offer and manage a
+collection of services. You will generally want to create one Provider
+client per OpenStack cloud.
+
+ It is now recommended to use the `clientconfig` package found at
+ https://github.com/gophercloud/utils/tree/master/openstack/clientconfig
+ for all authentication purposes.
+
+ The below documentation is still relevant. clientconfig simply implements
+ the below and presents it in an easier and more flexible way.
+
+Use your OpenStack credentials to create a Provider client. The
+IdentityEndpoint is typically refered to as "auth_url" or "OS_AUTH_URL" in
+information provided by the cloud operator. Additionally, the cloud may refer to
+TenantID or TenantName as project_id and project_name. Credentials are
+specified like so:
+
+ opts := gophercloud.AuthOptions{
+ IdentityEndpoint: "https://openstack.example.com:5000/v2.0",
+ Username: "{username}",
+ Password: "{password}",
+ TenantID: "{tenant_id}",
+ }
+
+ provider, err := openstack.AuthenticatedClient(opts)
+
+You can authenticate with a token by doing:
+
+ opts := gophercloud.AuthOptions{
+ IdentityEndpoint: "https://openstack.example.com:5000/v2.0",
+ TokenID: "{token_id}",
+ TenantID: "{tenant_id}",
+ }
+
+ provider, err := openstack.AuthenticatedClient(opts)
+
+You may also use the openstack.AuthOptionsFromEnv() helper function. This
+function reads in standard environment variables frequently found in an
+OpenStack `openrc` file. Again note that Gophercloud currently uses "tenant"
+instead of "project".
+
+ opts, err := openstack.AuthOptionsFromEnv()
+ provider, err := openstack.AuthenticatedClient(opts)
+
+# Service Clients
+
+Service structs are specific to a provider and handle all of the logic and
+operations for a particular OpenStack service. Examples of services include:
+Compute, Object Storage, Block Storage. In order to define one, you need to
+pass in the parent provider, like so:
+
+ opts := gophercloud.EndpointOpts{Region: "RegionOne"}
+
+ client, err := openstack.NewComputeV2(provider, opts)
+
+# Resources
+
+Resource structs are the domain models that services make use of in order
+to work with and represent the state of API resources:
+
+ server, err := servers.Get(client, "{serverId}").Extract()
+
+Intermediate Result structs are returned for API operations, which allow
+generic access to the HTTP headers, response body, and any errors associated
+with the network transaction. To turn a result into a usable resource struct,
+you must call the Extract method which is chained to the response, or an
+Extract function from an applicable extension:
+
+ result := servers.Get(client, "{serverId}")
+
+ // Attempt to extract the disk configuration from the OS-DCF disk config
+ // extension:
+ config, err := diskconfig.ExtractGet(result)
+
+All requests that enumerate a collection return a Pager struct that is used to
+iterate through the results one page at a time. Use the EachPage method on that
+Pager to handle each successive Page in a closure, then use the appropriate
+extraction method from that request's package to interpret that Page as a slice
+of results:
+
+ err := servers.List(client, nil).EachPage(func (page pagination.Page) (bool, error) {
+ s, err := servers.ExtractServers(page)
+ if err != nil {
+ return false, err
+ }
+
+ // Handle the []servers.Server slice.
+
+ // Return "false" or an error to prematurely stop fetching new pages.
+ return true, nil
+ })
+
+If you want to obtain the entire collection of pages without doing any
+intermediary processing on each page, you can use the AllPages method:
+
+ allPages, err := servers.List(client, nil).AllPages()
+ allServers, err := servers.ExtractServers(allPages)
+
+This top-level package contains utility functions and data types that are used
+throughout the provider and service packages. Of particular note for end users
+are the AuthOptions and EndpointOpts structs.
+
+An example retry backoff function, which respects the 429 HTTP response code and a "Retry-After" header:
+
+ endpoint := "http://localhost:5000"
+ provider, err := openstack.NewClient(endpoint)
+ if err != nil {
+ panic(err)
+ }
+ provider.MaxBackoffRetries = 3 // max three retries
+ provider.RetryBackoffFunc = func(ctx context.Context, respErr *ErrUnexpectedResponseCode, e error, retries uint) error {
+ retryAfter := respErr.ResponseHeader.Get("Retry-After")
+ if retryAfter == "" {
+ return e
+ }
+
+ var sleep time.Duration
+
+ // Parse delay seconds or HTTP date
+ if v, err := strconv.ParseUint(retryAfter, 10, 32); err == nil {
+ sleep = time.Duration(v) * time.Second
+ } else if v, err := time.Parse(http.TimeFormat, retryAfter); err == nil {
+ sleep = time.Until(v)
+ } else {
+ return e
+ }
+
+ if ctx != nil {
+ select {
+ case <-time.After(sleep):
+ case <-ctx.Done():
+ return e
+ }
+ } else {
+ time.Sleep(sleep)
+ }
+
+ return nil
+ }
+*/
+package gophercloud
diff --git a/vendor/github.com/gophercloud/gophercloud/endpoint_search.go b/vendor/github.com/gophercloud/gophercloud/endpoint_search.go
new file mode 100644
index 0000000000..2fbc3c97f1
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/endpoint_search.go
@@ -0,0 +1,76 @@
+package gophercloud
+
+// Availability indicates to whom a specific service endpoint is accessible:
+// the internet at large, internal networks only, or only to administrators.
+// Different identity services use different terminology for these. Identity v2
+// lists them as different kinds of URLs within the service catalog ("adminURL",
+// "internalURL", and "publicURL"), while v3 lists them as "Interfaces" in an
+// endpoint's response.
+type Availability string
+
+const (
+ // AvailabilityAdmin indicates that an endpoint is only available to
+ // administrators.
+ AvailabilityAdmin Availability = "admin"
+
+ // AvailabilityPublic indicates that an endpoint is available to everyone on
+ // the internet.
+ AvailabilityPublic Availability = "public"
+
+ // AvailabilityInternal indicates that an endpoint is only available within
+ // the cluster's internal network.
+ AvailabilityInternal Availability = "internal"
+)
+
+// EndpointOpts specifies search criteria used by queries against an
+// OpenStack service catalog. The options must contain enough information to
+// unambiguously identify one, and only one, endpoint within the catalog.
+//
+// Usually, these are passed to service client factory functions in a provider
+// package, like "openstack.NewComputeV2()".
+type EndpointOpts struct {
+ // Type [required] is the service type for the client (e.g., "compute",
+ // "object-store"). Generally, this will be supplied by the service client
+ // function, but a user-given value will be honored if provided.
+ Type string
+
+ // Name [optional] is the service name for the client (e.g., "nova") as it
+ // appears in the service catalog. Services can have the same Type but a
+ // different Name, which is why both Type and Name are sometimes needed.
+ Name string
+
+ // Region [required] is the geographic region in which the endpoint resides,
+ // generally specifying which datacenter should house your resources.
+ // Required only for services that span multiple regions.
+ Region string
+
+ // Availability [optional] is the visibility of the endpoint to be returned.
+ // Valid types include the constants AvailabilityPublic, AvailabilityInternal,
+ // or AvailabilityAdmin from this package.
+ //
+ // Availability is not required, and defaults to AvailabilityPublic. Not all
+ // providers or services offer all Availability options.
+ Availability Availability
+}
+
+/*
+EndpointLocator is an internal function to be used by provider implementations.
+
+It provides an implementation that locates a single endpoint from a service
+catalog for a specific ProviderClient based on user-provided EndpointOpts. The
+provider then uses it to discover related ServiceClients.
+*/
+type EndpointLocator func(EndpointOpts) (string, error)
+
+// ApplyDefaults is an internal method to be used by provider implementations.
+//
+// It sets EndpointOpts fields if not already set, including a default type.
+// Currently, EndpointOpts.Availability defaults to the public endpoint.
+func (eo *EndpointOpts) ApplyDefaults(t string) {
+ if eo.Type == "" {
+ eo.Type = t
+ }
+ if eo.Availability == "" {
+ eo.Availability = AvailabilityPublic
+ }
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/errors.go b/vendor/github.com/gophercloud/gophercloud/errors.go
new file mode 100644
index 0000000000..8ab592ca49
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/errors.go
@@ -0,0 +1,571 @@
+package gophercloud
+
+import (
+ "fmt"
+ "net/http"
+ "strings"
+)
+
+// BaseError is an error type that all other error types embed.
+type BaseError struct {
+ DefaultErrString string
+ Info string
+}
+
+func (e BaseError) Error() string {
+ e.DefaultErrString = "An error occurred while executing a Gophercloud request."
+ return e.choseErrString()
+}
+
+func (e BaseError) choseErrString() string {
+ if e.Info != "" {
+ return e.Info
+ }
+ return e.DefaultErrString
+}
+
+// ErrMissingInput is the error when input is required in a particular
+// situation but not provided by the user
+type ErrMissingInput struct {
+ BaseError
+ Argument string
+}
+
+func (e ErrMissingInput) Error() string {
+ e.DefaultErrString = fmt.Sprintf("Missing input for argument [%s]", e.Argument)
+ return e.choseErrString()
+}
+
+// ErrInvalidInput is an error type used for most non-HTTP Gophercloud errors.
+type ErrInvalidInput struct {
+ ErrMissingInput
+ Value interface{}
+}
+
+func (e ErrInvalidInput) Error() string {
+ e.DefaultErrString = fmt.Sprintf("Invalid input provided for argument [%s]: [%+v]", e.Argument, e.Value)
+ return e.choseErrString()
+}
+
+// ErrMissingEnvironmentVariable is the error when environment variable is required
+// in a particular situation but not provided by the user
+type ErrMissingEnvironmentVariable struct {
+ BaseError
+ EnvironmentVariable string
+}
+
+func (e ErrMissingEnvironmentVariable) Error() string {
+ e.DefaultErrString = fmt.Sprintf("Missing environment variable [%s]", e.EnvironmentVariable)
+ return e.choseErrString()
+}
+
+// ErrMissingAnyoneOfEnvironmentVariables is the error when anyone of the environment variables
+// is required in a particular situation but not provided by the user
+type ErrMissingAnyoneOfEnvironmentVariables struct {
+ BaseError
+ EnvironmentVariables []string
+}
+
+func (e ErrMissingAnyoneOfEnvironmentVariables) Error() string {
+ e.DefaultErrString = fmt.Sprintf(
+ "Missing one of the following environment variables [%s]",
+ strings.Join(e.EnvironmentVariables, ", "),
+ )
+ return e.choseErrString()
+}
+
+// ErrUnexpectedResponseCode is returned by the Request method when a response code other than
+// those listed in OkCodes is encountered.
+type ErrUnexpectedResponseCode struct {
+ BaseError
+ URL string
+ Method string
+ Expected []int
+ Actual int
+ Body []byte
+ ResponseHeader http.Header
+}
+
+func (e ErrUnexpectedResponseCode) Error() string {
+ e.DefaultErrString = fmt.Sprintf(
+ "Expected HTTP response code %v when accessing [%s %s], but got %d instead\n%s",
+ e.Expected, e.Method, e.URL, e.Actual, e.Body,
+ )
+ return e.choseErrString()
+}
+
+// GetStatusCode returns the actual status code of the error.
+func (e ErrUnexpectedResponseCode) GetStatusCode() int {
+ return e.Actual
+}
+
+// StatusCodeError is a convenience interface to easily allow access to the
+// status code field of the various ErrDefault* types.
+//
+// By using this interface, you only have to make a single type cast of
+// the returned error to err.(StatusCodeError) and then call GetStatusCode()
+// instead of having a large switch statement checking for each of the
+// ErrDefault* types.
+type StatusCodeError interface {
+ Error() string
+ GetStatusCode() int
+}
+
+// ErrDefault400 is the default error type returned on a 400 HTTP response code.
+type ErrDefault400 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault400) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault401 is the default error type returned on a 401 HTTP response code.
+type ErrDefault401 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault401) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault403 is the default error type returned on a 403 HTTP response code.
+type ErrDefault403 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault403) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault404 is the default error type returned on a 404 HTTP response code.
+type ErrDefault404 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault404) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault405 is the default error type returned on a 405 HTTP response code.
+type ErrDefault405 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault405) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault408 is the default error type returned on a 408 HTTP response code.
+type ErrDefault408 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault408) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault409 is the default error type returned on a 409 HTTP response code.
+type ErrDefault409 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault409) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault429 is the default error type returned on a 429 HTTP response code.
+type ErrDefault429 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault429) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault500 is the default error type returned on a 500 HTTP response code.
+type ErrDefault500 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault500) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault502 is the default error type returned on a 502 HTTP response code.
+type ErrDefault502 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault502) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault503 is the default error type returned on a 503 HTTP response code.
+type ErrDefault503 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault503) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+// ErrDefault504 is the default error type returned on a 504 HTTP response code.
+type ErrDefault504 struct {
+ ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault504) Unwrap() error {
+ return e.ErrUnexpectedResponseCode
+}
+
+func (e ErrDefault400) Error() string {
+ e.DefaultErrString = fmt.Sprintf(
+ "Bad request with: [%s %s], error message: %s",
+ e.Method, e.URL, e.Body,
+ )
+ return e.choseErrString()
+}
+func (e ErrDefault401) Error() string {
+ return "Authentication failed"
+}
+func (e ErrDefault403) Error() string {
+ e.DefaultErrString = fmt.Sprintf(
+ "Request forbidden: [%s %s], error message: %s",
+ e.Method, e.URL, e.Body,
+ )
+ return e.choseErrString()
+}
+func (e ErrDefault404) Error() string {
+ e.DefaultErrString = fmt.Sprintf(
+ "Resource not found: [%s %s], error message: %s",
+ e.Method, e.URL, e.Body,
+ )
+ return e.choseErrString()
+}
+func (e ErrDefault405) Error() string {
+ return "Method not allowed"
+}
+func (e ErrDefault408) Error() string {
+ return "The server timed out waiting for the request"
+}
+func (e ErrDefault429) Error() string {
+ return "Too many requests have been sent in a given amount of time. Pause" +
+ " requests, wait up to one minute, and try again."
+}
+func (e ErrDefault500) Error() string {
+ return "Internal Server Error"
+}
+func (e ErrDefault502) Error() string {
+ return "Bad Gateway"
+}
+func (e ErrDefault503) Error() string {
+ return "The service is currently unable to handle the request due to a temporary" +
+ " overloading or maintenance. This is a temporary condition. Try again later."
+}
+func (e ErrDefault504) Error() string {
+ return "Gateway Timeout"
+}
+
+// Err400er is the interface resource error types implement to override the error message
+// from a 400 error.
+type Err400er interface {
+ Error400(ErrUnexpectedResponseCode) error
+}
+
+// Err401er is the interface resource error types implement to override the error message
+// from a 401 error.
+type Err401er interface {
+ Error401(ErrUnexpectedResponseCode) error
+}
+
+// Err403er is the interface resource error types implement to override the error message
+// from a 403 error.
+type Err403er interface {
+ Error403(ErrUnexpectedResponseCode) error
+}
+
+// Err404er is the interface resource error types implement to override the error message
+// from a 404 error.
+type Err404er interface {
+ Error404(ErrUnexpectedResponseCode) error
+}
+
+// Err405er is the interface resource error types implement to override the error message
+// from a 405 error.
+type Err405er interface {
+ Error405(ErrUnexpectedResponseCode) error
+}
+
+// Err408er is the interface resource error types implement to override the error message
+// from a 408 error.
+type Err408er interface {
+ Error408(ErrUnexpectedResponseCode) error
+}
+
+// Err409er is the interface resource error types implement to override the error message
+// from a 409 error.
+type Err409er interface {
+ Error409(ErrUnexpectedResponseCode) error
+}
+
+// Err429er is the interface resource error types implement to override the error message
+// from a 429 error.
+type Err429er interface {
+ Error429(ErrUnexpectedResponseCode) error
+}
+
+// Err500er is the interface resource error types implement to override the error message
+// from a 500 error.
+type Err500er interface {
+ Error500(ErrUnexpectedResponseCode) error
+}
+
+// Err502er is the interface resource error types implement to override the error message
+// from a 502 error.
+type Err502er interface {
+ Error502(ErrUnexpectedResponseCode) error
+}
+
+// Err503er is the interface resource error types implement to override the error message
+// from a 503 error.
+type Err503er interface {
+ Error503(ErrUnexpectedResponseCode) error
+}
+
+// Err504er is the interface resource error types implement to override the error message
+// from a 504 error.
+type Err504er interface {
+ Error504(ErrUnexpectedResponseCode) error
+}
+
+// ErrTimeOut is the error type returned when an operations times out.
+type ErrTimeOut struct {
+ BaseError
+}
+
+func (e ErrTimeOut) Error() string {
+ e.DefaultErrString = "A time out occurred"
+ return e.choseErrString()
+}
+
+// ErrUnableToReauthenticate is the error type returned when reauthentication fails.
+type ErrUnableToReauthenticate struct {
+ BaseError
+ ErrOriginal error
+ ErrReauth error
+}
+
+func (e ErrUnableToReauthenticate) Error() string {
+ e.DefaultErrString = fmt.Sprintf("Unable to re-authenticate: %s: %s", e.ErrOriginal, e.ErrReauth)
+ return e.choseErrString()
+}
+
+// ErrErrorAfterReauthentication is the error type returned when reauthentication
+// succeeds, but an error occurs afterword (usually an HTTP error).
+type ErrErrorAfterReauthentication struct {
+ BaseError
+ ErrOriginal error
+}
+
+func (e ErrErrorAfterReauthentication) Error() string {
+ e.DefaultErrString = fmt.Sprintf("Successfully re-authenticated, but got error executing request: %s", e.ErrOriginal)
+ return e.choseErrString()
+}
+
+// ErrServiceNotFound is returned when no service in a service catalog matches
+// the provided EndpointOpts. This is generally returned by provider service
+// factory methods like "NewComputeV2()" and can mean that a service is not
+// enabled for your account.
+type ErrServiceNotFound struct {
+ BaseError
+}
+
+func (e ErrServiceNotFound) Error() string {
+ e.DefaultErrString = "No suitable service could be found in the service catalog."
+ return e.choseErrString()
+}
+
+// ErrEndpointNotFound is returned when no available endpoints match the
+// provided EndpointOpts. This is also generally returned by provider service
+// factory methods, and usually indicates that a region was specified
+// incorrectly.
+type ErrEndpointNotFound struct {
+ BaseError
+}
+
+func (e ErrEndpointNotFound) Error() string {
+ e.DefaultErrString = "No suitable endpoint could be found in the service catalog."
+ return e.choseErrString()
+}
+
+// ErrResourceNotFound is the error when trying to retrieve a resource's
+// ID by name and the resource doesn't exist.
+type ErrResourceNotFound struct {
+ BaseError
+ Name string
+ ResourceType string
+}
+
+func (e ErrResourceNotFound) Error() string {
+ e.DefaultErrString = fmt.Sprintf("Unable to find %s with name %s", e.ResourceType, e.Name)
+ return e.choseErrString()
+}
+
+// ErrMultipleResourcesFound is the error when trying to retrieve a resource's
+// ID by name and multiple resources have the user-provided name.
+type ErrMultipleResourcesFound struct {
+ BaseError
+ Name string
+ Count int
+ ResourceType string
+}
+
+func (e ErrMultipleResourcesFound) Error() string {
+ e.DefaultErrString = fmt.Sprintf("Found %d %ss matching %s", e.Count, e.ResourceType, e.Name)
+ return e.choseErrString()
+}
+
+// ErrUnexpectedType is the error when an unexpected type is encountered
+type ErrUnexpectedType struct {
+ BaseError
+ Expected string
+ Actual string
+}
+
+func (e ErrUnexpectedType) Error() string {
+ e.DefaultErrString = fmt.Sprintf("Expected %s but got %s", e.Expected, e.Actual)
+ return e.choseErrString()
+}
+
+func unacceptedAttributeErr(attribute string) string {
+ return fmt.Sprintf("The base Identity V3 API does not accept authentication by %s", attribute)
+}
+
+func redundantWithTokenErr(attribute string) string {
+ return fmt.Sprintf("%s may not be provided when authenticating with a TokenID", attribute)
+}
+
+func redundantWithUserID(attribute string) string {
+ return fmt.Sprintf("%s may not be provided when authenticating with a UserID", attribute)
+}
+
+// ErrAPIKeyProvided indicates that an APIKey was provided but can't be used.
+type ErrAPIKeyProvided struct{ BaseError }
+
+func (e ErrAPIKeyProvided) Error() string {
+ return unacceptedAttributeErr("APIKey")
+}
+
+// ErrTenantIDProvided indicates that a TenantID was provided but can't be used.
+type ErrTenantIDProvided struct{ BaseError }
+
+func (e ErrTenantIDProvided) Error() string {
+ return unacceptedAttributeErr("TenantID")
+}
+
+// ErrTenantNameProvided indicates that a TenantName was provided but can't be used.
+type ErrTenantNameProvided struct{ BaseError }
+
+func (e ErrTenantNameProvided) Error() string {
+ return unacceptedAttributeErr("TenantName")
+}
+
+// ErrUsernameWithToken indicates that a Username was provided, but token authentication is being used instead.
+type ErrUsernameWithToken struct{ BaseError }
+
+func (e ErrUsernameWithToken) Error() string {
+ return redundantWithTokenErr("Username")
+}
+
+// ErrUserIDWithToken indicates that a UserID was provided, but token authentication is being used instead.
+type ErrUserIDWithToken struct{ BaseError }
+
+func (e ErrUserIDWithToken) Error() string {
+ return redundantWithTokenErr("UserID")
+}
+
+// ErrDomainIDWithToken indicates that a DomainID was provided, but token authentication is being used instead.
+type ErrDomainIDWithToken struct{ BaseError }
+
+func (e ErrDomainIDWithToken) Error() string {
+ return redundantWithTokenErr("DomainID")
+}
+
+// ErrDomainNameWithToken indicates that a DomainName was provided, but token authentication is being used instead.s
+type ErrDomainNameWithToken struct{ BaseError }
+
+func (e ErrDomainNameWithToken) Error() string {
+ return redundantWithTokenErr("DomainName")
+}
+
+// ErrUsernameOrUserID indicates that neither username nor userID are specified, or both are at once.
+type ErrUsernameOrUserID struct{ BaseError }
+
+func (e ErrUsernameOrUserID) Error() string {
+ return "Exactly one of Username and UserID must be provided for password authentication"
+}
+
+// ErrDomainIDWithUserID indicates that a DomainID was provided, but unnecessary because a UserID is being used.
+type ErrDomainIDWithUserID struct{ BaseError }
+
+func (e ErrDomainIDWithUserID) Error() string {
+ return redundantWithUserID("DomainID")
+}
+
+// ErrDomainNameWithUserID indicates that a DomainName was provided, but unnecessary because a UserID is being used.
+type ErrDomainNameWithUserID struct{ BaseError }
+
+func (e ErrDomainNameWithUserID) Error() string {
+ return redundantWithUserID("DomainName")
+}
+
+// ErrDomainIDOrDomainName indicates that a username was provided, but no domain to scope it.
+// It may also indicate that both a DomainID and a DomainName were provided at once.
+type ErrDomainIDOrDomainName struct{ BaseError }
+
+func (e ErrDomainIDOrDomainName) Error() string {
+ return "You must provide exactly one of DomainID or DomainName to authenticate by Username"
+}
+
+// ErrMissingPassword indicates that no password was provided and no token is available.
+type ErrMissingPassword struct{ BaseError }
+
+func (e ErrMissingPassword) Error() string {
+ return "You must provide a password to authenticate"
+}
+
+// ErrScopeDomainIDOrDomainName indicates that a domain ID or Name was required in a Scope, but not present.
+type ErrScopeDomainIDOrDomainName struct{ BaseError }
+
+func (e ErrScopeDomainIDOrDomainName) Error() string {
+ return "You must provide exactly one of DomainID or DomainName in a Scope with ProjectName"
+}
+
+// ErrScopeProjectIDOrProjectName indicates that both a ProjectID and a ProjectName were provided in a Scope.
+type ErrScopeProjectIDOrProjectName struct{ BaseError }
+
+func (e ErrScopeProjectIDOrProjectName) Error() string {
+ return "You must provide at most one of ProjectID or ProjectName in a Scope"
+}
+
+// ErrScopeProjectIDAlone indicates that a ProjectID was provided with other constraints in a Scope.
+type ErrScopeProjectIDAlone struct{ BaseError }
+
+func (e ErrScopeProjectIDAlone) Error() string {
+ return "ProjectID must be supplied alone in a Scope"
+}
+
+// ErrScopeEmpty indicates that no credentials were provided in a Scope.
+type ErrScopeEmpty struct{ BaseError }
+
+func (e ErrScopeEmpty) Error() string {
+ return "You must provide either a Project or Domain in a Scope"
+}
+
+// ErrAppCredMissingSecret indicates that no Application Credential Secret was provided with Application Credential ID or Name
+type ErrAppCredMissingSecret struct{ BaseError }
+
+func (e ErrAppCredMissingSecret) Error() string {
+ return "You must provide an Application Credential Secret"
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/doc.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/doc.go
new file mode 100644
index 0000000000..813579905c
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/doc.go
@@ -0,0 +1,123 @@
+/*
+Package l7policies provides information and interaction with L7Policies and
+Rules of the LBaaS v2 extension for the OpenStack Networking service.
+
+Example to Create a L7Policy
+
+ createOpts := l7policies.CreateOpts{
+ Name: "redirect-example.com",
+ ListenerID: "023f2e34-7806-443b-bfae-16c324569a3d",
+ Action: l7policies.ActionRedirectToURL,
+ RedirectURL: "http://www.example.com",
+ }
+ l7policy, err := l7policies.Create(lbClient, createOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to List L7Policies
+
+ listOpts := l7policies.ListOpts{
+ ListenerID: "c79a4468-d788-410c-bf79-9a8ef6354852",
+ }
+ allPages, err := l7policies.List(lbClient, listOpts).AllPages()
+ if err != nil {
+ panic(err)
+ }
+ allL7Policies, err := l7policies.ExtractL7Policies(allPages)
+ if err != nil {
+ panic(err)
+ }
+ for _, l7policy := range allL7Policies {
+ fmt.Printf("%+v\n", l7policy)
+ }
+
+Example to Get a L7Policy
+
+ l7policy, err := l7policies.Get(lbClient, "023f2e34-7806-443b-bfae-16c324569a3d").Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Delete a L7Policy
+
+ l7policyID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ err := l7policies.Delete(lbClient, l7policyID).ExtractErr()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Update a L7Policy
+
+ l7policyID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ name := "new-name"
+ updateOpts := l7policies.UpdateOpts{
+ Name: &name,
+ }
+ l7policy, err := l7policies.Update(lbClient, l7policyID, updateOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Create a Rule
+
+ l7policyID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ createOpts := l7policies.CreateRuleOpts{
+ RuleType: l7policies.TypePath,
+ CompareType: l7policies.CompareTypeRegex,
+ Value: "/images*",
+ }
+ rule, err := l7policies.CreateRule(lbClient, l7policyID, createOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to List L7 Rules
+
+ l7policyID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ listOpts := l7policies.ListRulesOpts{
+ RuleType: l7policies.TypePath,
+ }
+ allPages, err := l7policies.ListRules(lbClient, l7policyID, listOpts).AllPages()
+ if err != nil {
+ panic(err)
+ }
+ allRules, err := l7policies.ExtractRules(allPages)
+ if err != nil {
+ panic(err)
+ }
+ for _, rule := allRules {
+ fmt.Printf("%+v\n", rule)
+ }
+
+Example to Get a l7 rule
+
+ l7rule, err := l7policies.GetRule(lbClient, "023f2e34-7806-443b-bfae-16c324569a3d", "53ad8ab8-40fa-11e8-a508-00224d6b7bc1").Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Delete a l7 rule
+
+ l7policyID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ ruleID := "64dba99f-8af8-4200-8882-e32a0660f23e"
+ err := l7policies.DeleteRule(lbClient, l7policyID, ruleID).ExtractErr()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Update a Rule
+
+ l7policyID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ ruleID := "64dba99f-8af8-4200-8882-e32a0660f23e"
+ updateOpts := l7policies.UpdateRuleOpts{
+ RuleType: l7policies.TypePath,
+ CompareType: l7policies.CompareTypeRegex,
+ Value: "/images/special*",
+ }
+ rule, err := l7policies.UpdateRule(lbClient, l7policyID, ruleID, updateOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+*/
+package l7policies
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/requests.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/requests.go
new file mode 100644
index 0000000000..2b84bcad14
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/requests.go
@@ -0,0 +1,418 @@
+package l7policies
+
+import (
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+// CreateOptsBuilder allows extensions to add additional parameters to the
+// Create request.
+type CreateOptsBuilder interface {
+ ToL7PolicyCreateMap() (map[string]interface{}, error)
+}
+
+type Action string
+type RuleType string
+type CompareType string
+
+const (
+ ActionRedirectPrefix Action = "REDIRECT_PREFIX"
+ ActionRedirectToPool Action = "REDIRECT_TO_POOL"
+ ActionRedirectToURL Action = "REDIRECT_TO_URL"
+ ActionReject Action = "REJECT"
+
+ TypeCookie RuleType = "COOKIE"
+ TypeFileType RuleType = "FILE_TYPE"
+ TypeHeader RuleType = "HEADER"
+ TypeHostName RuleType = "HOST_NAME"
+ TypePath RuleType = "PATH"
+
+ CompareTypeContains CompareType = "CONTAINS"
+ CompareTypeEndWith CompareType = "ENDS_WITH"
+ CompareTypeEqual CompareType = "EQUAL_TO"
+ CompareTypeRegex CompareType = "REGEX"
+ CompareTypeStartWith CompareType = "STARTS_WITH"
+)
+
+// CreateOpts is the common options struct used in this package's Create
+// operation.
+type CreateOpts struct {
+ // Name of the L7 policy.
+ Name string `json:"name,omitempty"`
+
+ // The ID of the listener.
+ ListenerID string `json:"listener_id,omitempty"`
+
+ // The L7 policy action. One of REDIRECT_PREFIX, REDIRECT_TO_POOL, REDIRECT_TO_URL, or REJECT.
+ Action Action `json:"action" required:"true"`
+
+ // The position of this policy on the listener.
+ Position int32 `json:"position,omitempty"`
+
+ // A human-readable description for the resource.
+ Description string `json:"description,omitempty"`
+
+ // ProjectID is the UUID of the project who owns the L7 policy in octavia.
+ // Only administrative users can specify a project UUID other than their own.
+ ProjectID string `json:"project_id,omitempty"`
+
+ // Requests matching this policy will be redirected to this Prefix URL.
+ // Only valid if action is REDIRECT_PREFIX.
+ RedirectPrefix string `json:"redirect_prefix,omitempty"`
+
+ // Requests matching this policy will be redirected to the pool with this ID.
+ // Only valid if action is REDIRECT_TO_POOL.
+ RedirectPoolID string `json:"redirect_pool_id,omitempty"`
+
+ // Requests matching this policy will be redirected to this URL.
+ // Only valid if action is REDIRECT_TO_URL.
+ RedirectURL string `json:"redirect_url,omitempty"`
+
+ // Requests matching this policy will be redirected to the specified URL or Prefix URL
+ // with the HTTP response code. Valid if action is REDIRECT_TO_URL or REDIRECT_PREFIX.
+ // Valid options are: 301, 302, 303, 307, or 308. Default is 302. Requires version 2.9
+ RedirectHttpCode int32 `json:"redirect_http_code,omitempty"`
+
+ // The administrative state of the Loadbalancer. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // Rules is a slice of CreateRuleOpts which allows a set of rules
+ // to be created at the same time the policy is created.
+ //
+ // This is only possible to use when creating a fully populated
+ // Loadbalancer.
+ Rules []CreateRuleOpts `json:"rules,omitempty"`
+}
+
+// ToL7PolicyCreateMap builds a request body from CreateOpts.
+func (opts CreateOpts) ToL7PolicyCreateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "l7policy")
+}
+
+// Create accepts a CreateOpts struct and uses the values to create a new l7policy.
+func Create(c *gophercloud.ServiceClient, opts CreateOptsBuilder) (r CreateResult) {
+ b, err := opts.ToL7PolicyCreateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Post(rootURL(c), b, &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// ListOptsBuilder allows extensions to add additional parameters to the
+// List request.
+type ListOptsBuilder interface {
+ ToL7PolicyListQuery() (string, error)
+}
+
+// ListOpts allows the filtering and sorting of paginated collections through
+// the API.
+type ListOpts struct {
+ Name string `q:"name"`
+ Description string `q:"description"`
+ ListenerID string `q:"listener_id"`
+ Action string `q:"action"`
+ ProjectID string `q:"project_id"`
+ RedirectPoolID string `q:"redirect_pool_id"`
+ RedirectURL string `q:"redirect_url"`
+ Position int32 `q:"position"`
+ AdminStateUp bool `q:"admin_state_up"`
+ ID string `q:"id"`
+ Limit int `q:"limit"`
+ Marker string `q:"marker"`
+ SortKey string `q:"sort_key"`
+ SortDir string `q:"sort_dir"`
+}
+
+// ToL7PolicyListQuery formats a ListOpts into a query string.
+func (opts ListOpts) ToL7PolicyListQuery() (string, error) {
+ q, err := gophercloud.BuildQueryString(opts)
+ return q.String(), err
+}
+
+// List returns a Pager which allows you to iterate over a collection of
+// l7policies. It accepts a ListOpts struct, which allows you to filter and sort
+// the returned collection for greater efficiency.
+//
+// Default policy settings return only those l7policies that are owned by the
+// project who submits the request, unless an admin user submits the request.
+func List(c *gophercloud.ServiceClient, opts ListOptsBuilder) pagination.Pager {
+ url := rootURL(c)
+ if opts != nil {
+ query, err := opts.ToL7PolicyListQuery()
+ if err != nil {
+ return pagination.Pager{Err: err}
+ }
+ url += query
+ }
+ return pagination.NewPager(c, url, func(r pagination.PageResult) pagination.Page {
+ return L7PolicyPage{pagination.LinkedPageBase{PageResult: r}}
+ })
+}
+
+// Get retrieves a particular l7policy based on its unique ID.
+func Get(c *gophercloud.ServiceClient, id string) (r GetResult) {
+ resp, err := c.Get(resourceURL(c, id), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// Delete will permanently delete a particular l7policy based on its unique ID.
+func Delete(c *gophercloud.ServiceClient, id string) (r DeleteResult) {
+ resp, err := c.Delete(resourceURL(c, id), nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// UpdateOptsBuilder allows extensions to add additional parameters to the
+// Update request.
+type UpdateOptsBuilder interface {
+ ToL7PolicyUpdateMap() (map[string]interface{}, error)
+}
+
+// UpdateOpts is the common options struct used in this package's Update
+// operation.
+type UpdateOpts struct {
+ // Name of the L7 policy, empty string is allowed.
+ Name *string `json:"name,omitempty"`
+
+ // The L7 policy action. One of REDIRECT_PREFIX, REDIRECT_TO_POOL, REDIRECT_TO_URL, or REJECT.
+ Action Action `json:"action,omitempty"`
+
+ // The position of this policy on the listener.
+ Position int32 `json:"position,omitempty"`
+
+ // A human-readable description for the resource, empty string is allowed.
+ Description *string `json:"description,omitempty"`
+
+ // Requests matching this policy will be redirected to this Prefix URL.
+ // Only valid if action is REDIRECT_PREFIX.
+ RedirectPrefix *string `json:"redirect_prefix,omitempty"`
+
+ // Requests matching this policy will be redirected to the pool with this ID.
+ // Only valid if action is REDIRECT_TO_POOL.
+ RedirectPoolID *string `json:"redirect_pool_id,omitempty"`
+
+ // Requests matching this policy will be redirected to this URL.
+ // Only valid if action is REDIRECT_TO_URL.
+ RedirectURL *string `json:"redirect_url,omitempty"`
+
+ // Requests matching this policy will be redirected to the specified URL or Prefix URL
+ // with the HTTP response code. Valid if action is REDIRECT_TO_URL or REDIRECT_PREFIX.
+ // Valid options are: 301, 302, 303, 307, or 308. Default is 302. Requires version 2.9
+ RedirectHttpCode int32 `json:"redirect_http_code,omitempty"`
+
+ // The administrative state of the Loadbalancer. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+}
+
+// ToL7PolicyUpdateMap builds a request body from UpdateOpts.
+func (opts UpdateOpts) ToL7PolicyUpdateMap() (map[string]interface{}, error) {
+ b, err := gophercloud.BuildRequestBody(opts, "l7policy")
+ if err != nil {
+ return nil, err
+ }
+
+ m := b["l7policy"].(map[string]interface{})
+
+ if m["redirect_pool_id"] == "" {
+ m["redirect_pool_id"] = nil
+ }
+
+ if m["redirect_url"] == "" {
+ m["redirect_url"] = nil
+ }
+
+ if m["redirect_prefix"] == "" {
+ m["redirect_prefix"] = nil
+ }
+
+ if m["redirect_http_code"] == 0 {
+ m["redirect_http_code"] = nil
+ }
+
+ return b, nil
+}
+
+// Update allows l7policy to be updated.
+func Update(c *gophercloud.ServiceClient, id string, opts UpdateOptsBuilder) (r UpdateResult) {
+ b, err := opts.ToL7PolicyUpdateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Put(resourceURL(c, id), b, &r.Body, &gophercloud.RequestOpts{
+ OkCodes: []int{200},
+ })
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// CreateRuleOpts is the common options struct used in this package's CreateRule
+// operation.
+type CreateRuleOpts struct {
+ // The L7 rule type. One of COOKIE, FILE_TYPE, HEADER, HOST_NAME, or PATH.
+ RuleType RuleType `json:"type" required:"true"`
+
+ // The comparison type for the L7 rule. One of CONTAINS, ENDS_WITH, EQUAL_TO, REGEX, or STARTS_WITH.
+ CompareType CompareType `json:"compare_type" required:"true"`
+
+ // The value to use for the comparison. For example, the file type to compare.
+ Value string `json:"value" required:"true"`
+
+ // ProjectID is the UUID of the project who owns the rule in octavia.
+ // Only administrative users can specify a project UUID other than their own.
+ ProjectID string `json:"project_id,omitempty"`
+
+ // The key to use for the comparison. For example, the name of the cookie to evaluate.
+ Key string `json:"key,omitempty"`
+
+ // When true the logic of the rule is inverted. For example, with invert true,
+ // equal to would become not equal to. Default is false.
+ Invert bool `json:"invert,omitempty"`
+
+ // The administrative state of the Loadbalancer. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+}
+
+// ToRuleCreateMap builds a request body from CreateRuleOpts.
+func (opts CreateRuleOpts) ToRuleCreateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "rule")
+}
+
+// CreateRule will create and associate a Rule with a particular L7Policy.
+func CreateRule(c *gophercloud.ServiceClient, policyID string, opts CreateRuleOpts) (r CreateRuleResult) {
+ b, err := opts.ToRuleCreateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Post(ruleRootURL(c, policyID), b, &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// ListRulesOptsBuilder allows extensions to add additional parameters to the
+// ListRules request.
+type ListRulesOptsBuilder interface {
+ ToRulesListQuery() (string, error)
+}
+
+// ListRulesOpts allows the filtering and sorting of paginated collections
+// through the API.
+type ListRulesOpts struct {
+ RuleType RuleType `q:"type"`
+ ProjectID string `q:"project_id"`
+ CompareType CompareType `q:"compare_type"`
+ Value string `q:"value"`
+ Key string `q:"key"`
+ Invert bool `q:"invert"`
+ AdminStateUp bool `q:"admin_state_up"`
+ ID string `q:"id"`
+ Limit int `q:"limit"`
+ Marker string `q:"marker"`
+ SortKey string `q:"sort_key"`
+ SortDir string `q:"sort_dir"`
+}
+
+// ToRulesListQuery formats a ListOpts into a query string.
+func (opts ListRulesOpts) ToRulesListQuery() (string, error) {
+ q, err := gophercloud.BuildQueryString(opts)
+ return q.String(), err
+}
+
+// ListRules returns a Pager which allows you to iterate over a collection of
+// rules. It accepts a ListRulesOptsBuilder, which allows you to filter and
+// sort the returned collection for greater efficiency.
+//
+// Default policy settings return only those rules that are owned by the
+// project who submits the request, unless an admin user submits the request.
+func ListRules(c *gophercloud.ServiceClient, policyID string, opts ListRulesOptsBuilder) pagination.Pager {
+ url := ruleRootURL(c, policyID)
+ if opts != nil {
+ query, err := opts.ToRulesListQuery()
+ if err != nil {
+ return pagination.Pager{Err: err}
+ }
+ url += query
+ }
+ return pagination.NewPager(c, url, func(r pagination.PageResult) pagination.Page {
+ return RulePage{pagination.LinkedPageBase{PageResult: r}}
+ })
+}
+
+// GetRule retrieves a particular L7Policy Rule based on its unique ID.
+func GetRule(c *gophercloud.ServiceClient, policyID string, ruleID string) (r GetRuleResult) {
+ resp, err := c.Get(ruleResourceURL(c, policyID, ruleID), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// DeleteRule will remove a Rule from a particular L7Policy.
+func DeleteRule(c *gophercloud.ServiceClient, policyID string, ruleID string) (r DeleteRuleResult) {
+ resp, err := c.Delete(ruleResourceURL(c, policyID, ruleID), nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// UpdateRuleOptsBuilder allows to add additional parameters to the PUT request.
+type UpdateRuleOptsBuilder interface {
+ ToRuleUpdateMap() (map[string]interface{}, error)
+}
+
+// UpdateRuleOpts is the common options struct used in this package's Update
+// operation.
+type UpdateRuleOpts struct {
+ // The L7 rule type. One of COOKIE, FILE_TYPE, HEADER, HOST_NAME, or PATH.
+ RuleType RuleType `json:"type,omitempty"`
+
+ // The comparison type for the L7 rule. One of CONTAINS, ENDS_WITH, EQUAL_TO, REGEX, or STARTS_WITH.
+ CompareType CompareType `json:"compare_type,omitempty"`
+
+ // The value to use for the comparison. For example, the file type to compare.
+ Value string `json:"value,omitempty"`
+
+ // The key to use for the comparison. For example, the name of the cookie to evaluate.
+ Key *string `json:"key,omitempty"`
+
+ // When true the logic of the rule is inverted. For example, with invert true,
+ // equal to would become not equal to. Default is false.
+ Invert *bool `json:"invert,omitempty"`
+
+ // The administrative state of the Loadbalancer. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+}
+
+// ToRuleUpdateMap builds a request body from UpdateRuleOpts.
+func (opts UpdateRuleOpts) ToRuleUpdateMap() (map[string]interface{}, error) {
+ b, err := gophercloud.BuildRequestBody(opts, "rule")
+ if err != nil {
+ return nil, err
+ }
+
+ if m := b["rule"].(map[string]interface{}); m["key"] == "" {
+ m["key"] = nil
+ }
+
+ return b, nil
+}
+
+// UpdateRule allows Rule to be updated.
+func UpdateRule(c *gophercloud.ServiceClient, policyID string, ruleID string, opts UpdateRuleOptsBuilder) (r UpdateRuleResult) {
+ b, err := opts.ToRuleUpdateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Put(ruleResourceURL(c, policyID, ruleID), b, &r.Body, &gophercloud.RequestOpts{
+ OkCodes: []int{200, 201, 202},
+ })
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/results.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/results.go
new file mode 100644
index 0000000000..bc5b32139a
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/results.go
@@ -0,0 +1,253 @@
+package l7policies
+
+import (
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+// L7Policy is a collection of L7 rules associated with a Listener, and which
+// may also have an association to a back-end pool.
+type L7Policy struct {
+ // The unique ID for the L7 policy.
+ ID string `json:"id"`
+
+ // Name of the L7 policy.
+ Name string `json:"name"`
+
+ // The ID of the listener.
+ ListenerID string `json:"listener_id"`
+
+ // The L7 policy action. One of REDIRECT_PREFIX, REDIRECT_TO_POOL, REDIRECT_TO_URL, or REJECT.
+ Action string `json:"action"`
+
+ // The position of this policy on the listener.
+ Position int32 `json:"position"`
+
+ // A human-readable description for the resource.
+ Description string `json:"description"`
+
+ // ProjectID is the UUID of the project who owns the L7 policy in octavia.
+ // Only administrative users can specify a project UUID other than their own.
+ ProjectID string `json:"project_id"`
+
+ // Requests matching this policy will be redirected to the pool with this ID.
+ // Only valid if action is REDIRECT_TO_POOL.
+ RedirectPoolID string `json:"redirect_pool_id"`
+
+ // Requests matching this policy will be redirected to this Prefix URL.
+ // Only valid if action is REDIRECT_PREFIX.
+ RedirectPrefix string `json:"redirect_prefix"`
+
+ // Requests matching this policy will be redirected to this URL.
+ // Only valid if action is REDIRECT_TO_URL.
+ RedirectURL string `json:"redirect_url"`
+
+ // Requests matching this policy will be redirected to the specified URL or Prefix URL
+ // with the HTTP response code. Valid if action is REDIRECT_TO_URL or REDIRECT_PREFIX.
+ RedirectHttpCode int32 `json:"redirect_http_code"`
+
+ // The administrative state of the L7 policy, which is up (true) or down (false).
+ AdminStateUp bool `json:"admin_state_up"`
+
+ // The provisioning status of the L7 policy.
+ // This value is ACTIVE, PENDING_* or ERROR.
+ ProvisioningStatus string `json:"provisioning_status"`
+
+ // The operating status of the L7 policy.
+ OperatingStatus string `json:"operating_status"`
+
+ // Rules are List of associated L7 rule IDs.
+ Rules []Rule `json:"rules"`
+}
+
+// Rule represents layer 7 load balancing rule.
+type Rule struct {
+ // The unique ID for the L7 rule.
+ ID string `json:"id"`
+
+ // The L7 rule type. One of COOKIE, FILE_TYPE, HEADER, HOST_NAME, or PATH.
+ RuleType string `json:"type"`
+
+ // The comparison type for the L7 rule. One of CONTAINS, ENDS_WITH, EQUAL_TO, REGEX, or STARTS_WITH.
+ CompareType string `json:"compare_type"`
+
+ // The value to use for the comparison. For example, the file type to compare.
+ Value string `json:"value"`
+
+ // ProjectID is the UUID of the project who owns the rule in octavia.
+ // Only administrative users can specify a project UUID other than their own.
+ ProjectID string `json:"project_id"`
+
+ // The key to use for the comparison. For example, the name of the cookie to evaluate.
+ Key string `json:"key"`
+
+ // When true the logic of the rule is inverted. For example, with invert true,
+ // equal to would become not equal to. Default is false.
+ Invert bool `json:"invert"`
+
+ // The administrative state of the L7 rule, which is up (true) or down (false).
+ AdminStateUp bool `json:"admin_state_up"`
+
+ // The provisioning status of the L7 rule.
+ // This value is ACTIVE, PENDING_* or ERROR.
+ ProvisioningStatus string `json:"provisioning_status"`
+
+ // The operating status of the L7 policy.
+ OperatingStatus string `json:"operating_status"`
+}
+
+type commonResult struct {
+ gophercloud.Result
+}
+
+// Extract is a function that accepts a result and extracts a l7policy.
+func (r commonResult) Extract() (*L7Policy, error) {
+ var s struct {
+ L7Policy *L7Policy `json:"l7policy"`
+ }
+ err := r.ExtractInto(&s)
+ return s.L7Policy, err
+}
+
+// CreateResult represents the result of a Create operation. Call its Extract
+// method to interpret the result as a L7Policy.
+type CreateResult struct {
+ commonResult
+}
+
+// L7PolicyPage is the page returned by a pager when traversing over a
+// collection of l7policies.
+type L7PolicyPage struct {
+ pagination.LinkedPageBase
+}
+
+// NextPageURL is invoked when a paginated collection of l7policies has reached
+// the end of a page and the pager seeks to traverse over a new one. In order
+// to do this, it needs to construct the next page's URL.
+func (r L7PolicyPage) NextPageURL() (string, error) {
+ var s struct {
+ Links []gophercloud.Link `json:"l7policies_links"`
+ }
+ err := r.ExtractInto(&s)
+ if err != nil {
+ return "", err
+ }
+ return gophercloud.ExtractNextURL(s.Links)
+}
+
+// IsEmpty checks whether a L7PolicyPage struct is empty.
+func (r L7PolicyPage) IsEmpty() (bool, error) {
+ if r.StatusCode == 204 {
+ return true, nil
+ }
+
+ is, err := ExtractL7Policies(r)
+ return len(is) == 0, err
+}
+
+// ExtractL7Policies accepts a Page struct, specifically a L7PolicyPage struct,
+// and extracts the elements into a slice of L7Policy structs. In other words,
+// a generic collection is mapped into a relevant slice.
+func ExtractL7Policies(r pagination.Page) ([]L7Policy, error) {
+ var s struct {
+ L7Policies []L7Policy `json:"l7policies"`
+ }
+ err := (r.(L7PolicyPage)).ExtractInto(&s)
+ return s.L7Policies, err
+}
+
+// GetResult represents the result of a Get operation. Call its Extract
+// method to interpret the result as a L7Policy.
+type GetResult struct {
+ commonResult
+}
+
+// DeleteResult represents the result of a Delete operation. Call its
+// ExtractErr method to determine if the request succeeded or failed.
+type DeleteResult struct {
+ gophercloud.ErrResult
+}
+
+// UpdateResult represents the result of an Update operation. Call its Extract
+// method to interpret the result as a L7Policy.
+type UpdateResult struct {
+ commonResult
+}
+
+type commonRuleResult struct {
+ gophercloud.Result
+}
+
+// Extract is a function that accepts a result and extracts a rule.
+func (r commonRuleResult) Extract() (*Rule, error) {
+ var s struct {
+ Rule *Rule `json:"rule"`
+ }
+ err := r.ExtractInto(&s)
+ return s.Rule, err
+}
+
+// CreateRuleResult represents the result of a CreateRule operation.
+// Call its Extract method to interpret it as a Rule.
+type CreateRuleResult struct {
+ commonRuleResult
+}
+
+// RulePage is the page returned by a pager when traversing over a
+// collection of Rules in a L7Policy.
+type RulePage struct {
+ pagination.LinkedPageBase
+}
+
+// NextPageURL is invoked when a paginated collection of rules has reached
+// the end of a page and the pager seeks to traverse over a new one. In order
+// to do this, it needs to construct the next page's URL.
+func (r RulePage) NextPageURL() (string, error) {
+ var s struct {
+ Links []gophercloud.Link `json:"rules_links"`
+ }
+ err := r.ExtractInto(&s)
+ if err != nil {
+ return "", err
+ }
+ return gophercloud.ExtractNextURL(s.Links)
+}
+
+// IsEmpty checks whether a RulePage struct is empty.
+func (r RulePage) IsEmpty() (bool, error) {
+ if r.StatusCode == 204 {
+ return true, nil
+ }
+
+ is, err := ExtractRules(r)
+ return len(is) == 0, err
+}
+
+// ExtractRules accepts a Page struct, specifically a RulePage struct,
+// and extracts the elements into a slice of Rules structs. In other words,
+// a generic collection is mapped into a relevant slice.
+func ExtractRules(r pagination.Page) ([]Rule, error) {
+ var s struct {
+ Rules []Rule `json:"rules"`
+ }
+ err := (r.(RulePage)).ExtractInto(&s)
+ return s.Rules, err
+}
+
+// GetRuleResult represents the result of a GetRule operation.
+// Call its Extract method to interpret it as a Rule.
+type GetRuleResult struct {
+ commonRuleResult
+}
+
+// DeleteRuleResult represents the result of a DeleteRule operation.
+// Call its ExtractErr method to determine if the request succeeded or failed.
+type DeleteRuleResult struct {
+ gophercloud.ErrResult
+}
+
+// UpdateRuleResult represents the result of an UpdateRule operation.
+// Call its Extract method to interpret it as a Rule.
+type UpdateRuleResult struct {
+ commonRuleResult
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/urls.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/urls.go
new file mode 100644
index 0000000000..ecb607a8e8
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies/urls.go
@@ -0,0 +1,25 @@
+package l7policies
+
+import "github.com/gophercloud/gophercloud"
+
+const (
+ rootPath = "lbaas"
+ resourcePath = "l7policies"
+ rulePath = "rules"
+)
+
+func rootURL(c *gophercloud.ServiceClient) string {
+ return c.ServiceURL(rootPath, resourcePath)
+}
+
+func resourceURL(c *gophercloud.ServiceClient, id string) string {
+ return c.ServiceURL(rootPath, resourcePath, id)
+}
+
+func ruleRootURL(c *gophercloud.ServiceClient, policyID string) string {
+ return c.ServiceURL(rootPath, resourcePath, policyID, rulePath)
+}
+
+func ruleResourceURL(c *gophercloud.ServiceClient, policyID string, ruleID string) string {
+ return c.ServiceURL(rootPath, resourcePath, policyID, rulePath, ruleID)
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/doc.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/doc.go
new file mode 100644
index 0000000000..c99bbc7026
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/doc.go
@@ -0,0 +1,77 @@
+/*
+Package listeners provides information and interaction with Listeners of the
+LBaaS v2 extension for the OpenStack Networking service.
+
+Example to List Listeners
+
+ listOpts := listeners.ListOpts{
+ LoadbalancerID : "ca430f80-1737-4712-8dc6-3f640d55594b",
+ }
+
+ allPages, err := listeners.List(networkClient, listOpts).AllPages()
+ if err != nil {
+ panic(err)
+ }
+
+ allListeners, err := listeners.ExtractListeners(allPages)
+ if err != nil {
+ panic(err)
+ }
+
+ for _, listener := range allListeners {
+ fmt.Printf("%+v\n", listener)
+ }
+
+Example to Create a Listener
+
+ createOpts := listeners.CreateOpts{
+ Protocol: "TCP",
+ Name: "db",
+ LoadbalancerID: "79e05663-7f03-45d2-a092-8b94062f22ab",
+ AdminStateUp: gophercloud.Enabled,
+ DefaultPoolID: "41efe233-7591-43c5-9cf7-923964759f9e",
+ ProtocolPort: 3306,
+ Tags: []string{"test", "stage"},
+ }
+
+ listener, err := listeners.Create(networkClient, createOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Update a Listener
+
+ listenerID := "d67d56a6-4a86-4688-a282-f46444705c64"
+
+ i1001 := 1001
+ i181000 := 181000
+ newTags := []string{"prod"}
+ updateOpts := listeners.UpdateOpts{
+ ConnLimit: &i1001,
+ TimeoutClientData: &i181000,
+ TimeoutMemberData: &i181000,
+ Tags: &newTags,
+ }
+
+ listener, err := listeners.Update(networkClient, listenerID, updateOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Delete a Listener
+
+ listenerID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ err := listeners.Delete(networkClient, listenerID).ExtractErr()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Get the Statistics of a Listener
+
+ listenerID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ stats, err := listeners.GetStats(networkClient, listenerID).Extract()
+ if err != nil {
+ panic(err)
+ }
+*/
+package listeners
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/requests.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/requests.go
new file mode 100644
index 0000000000..a0a06f6448
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/requests.go
@@ -0,0 +1,303 @@
+package listeners
+
+import (
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+// Type Protocol represents a listener protocol.
+type Protocol string
+
+// Supported attributes for create/update operations.
+const (
+ ProtocolTCP Protocol = "TCP"
+ ProtocolUDP Protocol = "UDP"
+ ProtocolPROXY Protocol = "PROXY"
+ ProtocolHTTP Protocol = "HTTP"
+ ProtocolHTTPS Protocol = "HTTPS"
+ // Protocol SCTP requires octavia microversion 2.23
+ ProtocolSCTP Protocol = "SCTP"
+ // Protocol Prometheus requires octavia microversion 2.25
+ ProtocolPrometheus Protocol = "PROMETHEUS"
+ ProtocolTerminatedHTTPS Protocol = "TERMINATED_HTTPS"
+)
+
+// Type TLSVersion represents a tls version
+type TLSVersion string
+
+const (
+ TLSVersionSSLv3 TLSVersion = "SSLv3"
+ TLSVersionTLSv1 TLSVersion = "TLSv1"
+ TLSVersionTLSv1_1 TLSVersion = "TLSv1.1"
+ TLSVersionTLSv1_2 TLSVersion = "TLSv1.2"
+ TLSVersionTLSv1_3 TLSVersion = "TLSv1.3"
+)
+
+// ListOptsBuilder allows extensions to add additional parameters to the
+// List request.
+type ListOptsBuilder interface {
+ ToListenerListQuery() (string, error)
+}
+
+// ListOpts allows the filtering and sorting of paginated collections through
+// the API. Filtering is achieved by passing in struct field values that map to
+// the floating IP attributes you want to see returned. SortKey allows you to
+// sort by a particular listener attribute. SortDir sets the direction, and is
+// either `asc' or `desc'. Marker and Limit are used for pagination.
+type ListOpts struct {
+ ID string `q:"id"`
+ Name string `q:"name"`
+ AdminStateUp *bool `q:"admin_state_up"`
+ ProjectID string `q:"project_id"`
+ LoadbalancerID string `q:"loadbalancer_id"`
+ DefaultPoolID string `q:"default_pool_id"`
+ Protocol string `q:"protocol"`
+ ProtocolPort int `q:"protocol_port"`
+ ConnectionLimit int `q:"connection_limit"`
+ Limit int `q:"limit"`
+ Marker string `q:"marker"`
+ SortKey string `q:"sort_key"`
+ SortDir string `q:"sort_dir"`
+ TimeoutClientData *int `q:"timeout_client_data"`
+ TimeoutMemberData *int `q:"timeout_member_data"`
+ TimeoutMemberConnect *int `q:"timeout_member_connect"`
+ TimeoutTCPInspect *int `q:"timeout_tcp_inspect"`
+}
+
+// ToListenerListQuery formats a ListOpts into a query string.
+func (opts ListOpts) ToListenerListQuery() (string, error) {
+ q, err := gophercloud.BuildQueryString(opts)
+ return q.String(), err
+}
+
+// List returns a Pager which allows you to iterate over a collection of
+// listeners. It accepts a ListOpts struct, which allows you to filter and sort
+// the returned collection for greater efficiency.
+//
+// Default policy settings return only those listeners that are owned by the
+// project who submits the request, unless an admin user submits the request.
+func List(c *gophercloud.ServiceClient, opts ListOptsBuilder) pagination.Pager {
+ url := rootURL(c)
+ if opts != nil {
+ query, err := opts.ToListenerListQuery()
+ if err != nil {
+ return pagination.Pager{Err: err}
+ }
+ url += query
+ }
+ return pagination.NewPager(c, url, func(r pagination.PageResult) pagination.Page {
+ return ListenerPage{pagination.LinkedPageBase{PageResult: r}}
+ })
+}
+
+// CreateOptsBuilder allows extensions to add additional parameters to the
+// Create request.
+type CreateOptsBuilder interface {
+ ToListenerCreateMap() (map[string]interface{}, error)
+}
+
+// CreateOpts represents options for creating a listener.
+type CreateOpts struct {
+ // The load balancer on which to provision this listener.
+ LoadbalancerID string `json:"loadbalancer_id,omitempty"`
+
+ // The protocol - can either be TCP, SCTP, HTTP, HTTPS or TERMINATED_HTTPS.
+ Protocol Protocol `json:"protocol" required:"true"`
+
+ // The port on which to listen for client traffic.
+ ProtocolPort int `json:"protocol_port" required:"true"`
+
+ // ProjectID is only required if the caller has an admin role and wants
+ // to create a pool for another project.
+ ProjectID string `json:"project_id,omitempty"`
+
+ // Human-readable name for the Listener. Does not have to be unique.
+ Name string `json:"name,omitempty"`
+
+ // The ID of the default pool with which the Listener is associated.
+ DefaultPoolID string `json:"default_pool_id,omitempty"`
+
+ // DefaultPool an instance of pools.CreateOpts which allows a
+ // (default) pool to be created at the same time the listener is created.
+ //
+ // This is only possible to use when creating a fully populated
+ // load balancer.
+ DefaultPool *pools.CreateOpts `json:"default_pool,omitempty"`
+
+ // Human-readable description for the Listener.
+ Description string `json:"description,omitempty"`
+
+ // The maximum number of connections allowed for the Listener.
+ ConnLimit *int `json:"connection_limit,omitempty"`
+
+ // A reference to a Barbican container of TLS secrets.
+ DefaultTlsContainerRef string `json:"default_tls_container_ref,omitempty"`
+
+ // A list of references to TLS secrets.
+ SniContainerRefs []string `json:"sni_container_refs,omitempty"`
+
+ // The administrative state of the Listener. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // L7Policies is a slice of l7policies.CreateOpts which allows a set
+ // of policies to be created at the same time the listener is created.
+ //
+ // This is only possible to use when creating a fully populated
+ // Loadbalancer.
+ L7Policies []l7policies.CreateOpts `json:"l7policies,omitempty"`
+
+ // Frontend client inactivity timeout in milliseconds
+ TimeoutClientData *int `json:"timeout_client_data,omitempty"`
+
+ // Backend member inactivity timeout in milliseconds
+ TimeoutMemberData *int `json:"timeout_member_data,omitempty"`
+
+ // Backend member connection timeout in milliseconds
+ TimeoutMemberConnect *int `json:"timeout_member_connect,omitempty"`
+
+ // Time, in milliseconds, to wait for additional TCP packets for content inspection
+ TimeoutTCPInspect *int `json:"timeout_tcp_inspect,omitempty"`
+
+ // A dictionary of optional headers to insert into the request before it is sent to the backend member.
+ InsertHeaders map[string]string `json:"insert_headers,omitempty"`
+
+ // A list of IPv4, IPv6 or mix of both CIDRs
+ AllowedCIDRs []string `json:"allowed_cidrs,omitempty"`
+
+ // A list of TLS protocol versions. Available from microversion 2.17
+ TLSVersions []TLSVersion `json:"tls_versions,omitempty"`
+
+ // Tags is a set of resource tags. New in version 2.5
+ Tags []string `json:"tags,omitempty"`
+}
+
+// ToListenerCreateMap builds a request body from CreateOpts.
+func (opts CreateOpts) ToListenerCreateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "listener")
+}
+
+// Create is an operation which provisions a new Listeners based on the
+// configuration defined in the CreateOpts struct. Once the request is
+// validated and progress has started on the provisioning process, a
+// CreateResult will be returned.
+//
+// Users with an admin role can create Listeners on behalf of other projects by
+// specifying a ProjectID attribute different than their own.
+func Create(c *gophercloud.ServiceClient, opts CreateOptsBuilder) (r CreateResult) {
+ b, err := opts.ToListenerCreateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Post(rootURL(c), b, &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// Get retrieves a particular Listeners based on its unique ID.
+func Get(c *gophercloud.ServiceClient, id string) (r GetResult) {
+ resp, err := c.Get(resourceURL(c, id), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// UpdateOptsBuilder allows extensions to add additional parameters to the
+// Update request.
+type UpdateOptsBuilder interface {
+ ToListenerUpdateMap() (map[string]interface{}, error)
+}
+
+// UpdateOpts represents options for updating a Listener.
+type UpdateOpts struct {
+ // Human-readable name for the Listener. Does not have to be unique.
+ Name *string `json:"name,omitempty"`
+
+ // The ID of the default pool with which the Listener is associated.
+ DefaultPoolID *string `json:"default_pool_id,omitempty"`
+
+ // Human-readable description for the Listener.
+ Description *string `json:"description,omitempty"`
+
+ // The maximum number of connections allowed for the Listener.
+ ConnLimit *int `json:"connection_limit,omitempty"`
+
+ // A reference to a Barbican container of TLS secrets.
+ DefaultTlsContainerRef *string `json:"default_tls_container_ref,omitempty"`
+
+ // A list of references to TLS secrets.
+ SniContainerRefs *[]string `json:"sni_container_refs,omitempty"`
+
+ // The administrative state of the Listener. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // Frontend client inactivity timeout in milliseconds
+ TimeoutClientData *int `json:"timeout_client_data,omitempty"`
+
+ // Backend member inactivity timeout in milliseconds
+ TimeoutMemberData *int `json:"timeout_member_data,omitempty"`
+
+ // Backend member connection timeout in milliseconds
+ TimeoutMemberConnect *int `json:"timeout_member_connect,omitempty"`
+
+ // Time, in milliseconds, to wait for additional TCP packets for content inspection
+ TimeoutTCPInspect *int `json:"timeout_tcp_inspect,omitempty"`
+
+ // A dictionary of optional headers to insert into the request before it is sent to the backend member.
+ InsertHeaders *map[string]string `json:"insert_headers,omitempty"`
+
+ // A list of IPv4, IPv6 or mix of both CIDRs
+ AllowedCIDRs *[]string `json:"allowed_cidrs,omitempty"`
+
+ // A list of TLS protocol versions. Available from microversion 2.17
+ TLSVersions *[]TLSVersion `json:"tls_versions,omitempty"`
+
+ // Tags is a set of resource tags. New in version 2.5
+ Tags *[]string `json:"tags,omitempty"`
+}
+
+// ToListenerUpdateMap builds a request body from UpdateOpts.
+func (opts UpdateOpts) ToListenerUpdateMap() (map[string]interface{}, error) {
+ b, err := gophercloud.BuildRequestBody(opts, "listener")
+ if err != nil {
+ return nil, err
+ }
+
+ if m := b["listener"].(map[string]interface{}); m["default_pool_id"] == "" {
+ m["default_pool_id"] = nil
+ }
+
+ return b, nil
+}
+
+// Update is an operation which modifies the attributes of the specified
+// Listener.
+func Update(c *gophercloud.ServiceClient, id string, opts UpdateOpts) (r UpdateResult) {
+ b, err := opts.ToListenerUpdateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Put(resourceURL(c, id), b, &r.Body, &gophercloud.RequestOpts{
+ OkCodes: []int{200, 202},
+ })
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// Delete will permanently delete a particular Listeners based on its unique ID.
+func Delete(c *gophercloud.ServiceClient, id string) (r DeleteResult) {
+ resp, err := c.Delete(resourceURL(c, id), nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// GetStats will return the shows the current statistics of a particular Listeners.
+func GetStats(c *gophercloud.ServiceClient, id string) (r StatsResult) {
+ resp, err := c.Get(statisticsRootURL(c, id), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/results.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/results.go
new file mode 100644
index 0000000000..234b6cb062
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/results.go
@@ -0,0 +1,230 @@
+package listeners
+
+import (
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+type LoadBalancerID struct {
+ ID string `json:"id"`
+}
+
+// Listener is the primary load balancing configuration object that specifies
+// the loadbalancer and port on which client traffic is received, as well
+// as other details such as the load balancing method to be use, protocol, etc.
+type Listener struct {
+ // The unique ID for the Listener.
+ ID string `json:"id"`
+
+ // Owner of the Listener.
+ ProjectID string `json:"project_id"`
+
+ // Human-readable name for the Listener. Does not have to be unique.
+ Name string `json:"name"`
+
+ // Human-readable description for the Listener.
+ Description string `json:"description"`
+
+ // The protocol to loadbalance. A valid value is TCP, SCTP, HTTP, HTTPS or TERMINATED_HTTPS.
+ Protocol string `json:"protocol"`
+
+ // The port on which to listen to client traffic that is associated with the
+ // Loadbalancer. A valid value is from 0 to 65535.
+ ProtocolPort int `json:"protocol_port"`
+
+ // The UUID of default pool. Must have compatible protocol with listener.
+ DefaultPoolID string `json:"default_pool_id"`
+
+ // The default pool with which the Listener is associated.
+ DefaultPool *pools.Pool `json:"default_pool"`
+
+ // A list of load balancer IDs.
+ Loadbalancers []LoadBalancerID `json:"loadbalancers"`
+
+ // The maximum number of connections allowed for the Loadbalancer.
+ // Default is -1, meaning no limit.
+ ConnLimit int `json:"connection_limit"`
+
+ // The list of references to TLS secrets.
+ SniContainerRefs []string `json:"sni_container_refs"`
+
+ // A reference to a Barbican container of TLS secrets.
+ DefaultTlsContainerRef string `json:"default_tls_container_ref"`
+
+ // The administrative state of the Listener. A valid value is true (UP) or false (DOWN).
+ AdminStateUp bool `json:"admin_state_up"`
+
+ // Pools are the pools which are part of this listener.
+ Pools []pools.Pool `json:"pools"`
+
+ // L7policies are the L7 policies which are part of this listener.
+ L7Policies []l7policies.L7Policy `json:"l7policies"`
+
+ // The provisioning status of the Listener.
+ // This value is ACTIVE, PENDING_* or ERROR.
+ ProvisioningStatus string `json:"provisioning_status"`
+
+ // Frontend client inactivity timeout in milliseconds
+ TimeoutClientData int `json:"timeout_client_data"`
+
+ // Backend member inactivity timeout in milliseconds
+ TimeoutMemberData int `json:"timeout_member_data"`
+
+ // Backend member connection timeout in milliseconds
+ TimeoutMemberConnect int `json:"timeout_member_connect"`
+
+ // Time, in milliseconds, to wait for additional TCP packets for content inspection
+ TimeoutTCPInspect int `json:"timeout_tcp_inspect"`
+
+ // A dictionary of optional headers to insert into the request before it is sent to the backend member.
+ InsertHeaders map[string]string `json:"insert_headers"`
+
+ // A list of IPv4, IPv6 or mix of both CIDRs
+ AllowedCIDRs []string `json:"allowed_cidrs"`
+
+ // List of ciphers in OpenSSL format (colon-separated). See
+ // https://www.openssl.org/docs/man1.1.1/man1/ciphers.html
+ // New in version 2.15
+ TLSCiphers string `json:"tls_ciphers"`
+
+ // A list of TLS protocol versions. Available from microversion 2.17
+ TLSVersions []string `json:"tls_versions"`
+
+ // Tags is a list of resource tags. Tags are arbitrarily defined strings
+ // attached to the resource. New in version 2.5
+ Tags []string `json:"tags"`
+
+ // A list of ALPN protocols. Available protocols: http/1.0, http/1.1, h2
+ // New in version 2.20
+ ALPNProtocols []string `json:"alpn_protocols"`
+
+ // The TLS client authentication mode. One of the options NONE, OPTIONAL or MANDATORY.
+ // New in version 2.8
+ ClientAuthentication string `json:"client_authentication"`
+
+ // The ref of the key manager service secret containing a PEM format
+ // client CA certificate bundle for TERMINATED_HTTPS listeners.
+ // New in version 2.8
+ ClientCATLSContainerRef string `json:"client_ca_tls_container_ref"`
+
+ // The URI of the key manager service secret containing a PEM format CA
+ // revocation list file for TERMINATED_HTTPS listeners.
+ // New in version 2.8
+ ClientCRLContainerRef string `json:"client_crl_container_ref"`
+
+ // The operating status of the resource
+ OperatingStatus string `json:"operating_status"`
+}
+
+type Stats struct {
+ // The currently active connections.
+ ActiveConnections int `json:"active_connections"`
+
+ // The total bytes received.
+ BytesIn int `json:"bytes_in"`
+
+ // The total bytes sent.
+ BytesOut int `json:"bytes_out"`
+
+ // The total requests that were unable to be fulfilled.
+ RequestErrors int `json:"request_errors"`
+
+ // The total connections handled.
+ TotalConnections int `json:"total_connections"`
+}
+
+// ListenerPage is the page returned by a pager when traversing over a
+// collection of listeners.
+type ListenerPage struct {
+ pagination.LinkedPageBase
+}
+
+// NextPageURL is invoked when a paginated collection of listeners has reached
+// the end of a page and the pager seeks to traverse over a new one. In order
+// to do this, it needs to construct the next page's URL.
+func (r ListenerPage) NextPageURL() (string, error) {
+ var s struct {
+ Links []gophercloud.Link `json:"listeners_links"`
+ }
+ err := r.ExtractInto(&s)
+ if err != nil {
+ return "", err
+ }
+ return gophercloud.ExtractNextURL(s.Links)
+}
+
+// IsEmpty checks whether a ListenerPage struct is empty.
+func (r ListenerPage) IsEmpty() (bool, error) {
+ if r.StatusCode == 204 {
+ return true, nil
+ }
+
+ is, err := ExtractListeners(r)
+ return len(is) == 0, err
+}
+
+// ExtractListeners accepts a Page struct, specifically a ListenerPage struct,
+// and extracts the elements into a slice of Listener structs. In other words,
+// a generic collection is mapped into a relevant slice.
+func ExtractListeners(r pagination.Page) ([]Listener, error) {
+ var s struct {
+ Listeners []Listener `json:"listeners"`
+ }
+ err := (r.(ListenerPage)).ExtractInto(&s)
+ return s.Listeners, err
+}
+
+type commonResult struct {
+ gophercloud.Result
+}
+
+// Extract is a function that accepts a result and extracts a listener.
+func (r commonResult) Extract() (*Listener, error) {
+ var s struct {
+ Listener *Listener `json:"listener"`
+ }
+ err := r.ExtractInto(&s)
+ return s.Listener, err
+}
+
+// CreateResult represents the result of a create operation. Call its Extract
+// method to interpret it as a Listener.
+type CreateResult struct {
+ commonResult
+}
+
+// GetResult represents the result of a get operation. Call its Extract
+// method to interpret it as a Listener.
+type GetResult struct {
+ commonResult
+}
+
+// UpdateResult represents the result of an update operation. Call its Extract
+// method to interpret it as a Listener.
+type UpdateResult struct {
+ commonResult
+}
+
+// DeleteResult represents the result of a delete operation. Call its
+// ExtractErr method to determine if the request succeeded or failed.
+type DeleteResult struct {
+ gophercloud.ErrResult
+}
+
+// StatsResult represents the result of a GetStats operation.
+// Call its Extract method to interpret it as a Stats.
+type StatsResult struct {
+ gophercloud.Result
+}
+
+// Extract is a function that accepts a result and extracts the status of
+// a Listener.
+func (r StatsResult) Extract() (*Stats, error) {
+ var s struct {
+ Stats *Stats `json:"stats"`
+ }
+ err := r.ExtractInto(&s)
+ return s.Stats, err
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/urls.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/urls.go
new file mode 100644
index 0000000000..e9e3bccd3e
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/urls.go
@@ -0,0 +1,21 @@
+package listeners
+
+import "github.com/gophercloud/gophercloud"
+
+const (
+ rootPath = "lbaas"
+ resourcePath = "listeners"
+ statisticsPath = "stats"
+)
+
+func rootURL(c *gophercloud.ServiceClient) string {
+ return c.ServiceURL(rootPath, resourcePath)
+}
+
+func resourceURL(c *gophercloud.ServiceClient, id string) string {
+ return c.ServiceURL(rootPath, resourcePath, id)
+}
+
+func statisticsRootURL(c *gophercloud.ServiceClient, id string) string {
+ return c.ServiceURL(rootPath, resourcePath, id, statisticsPath)
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/doc.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/doc.go
new file mode 100644
index 0000000000..8587a0d99e
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/doc.go
@@ -0,0 +1,140 @@
+/*
+Package loadbalancers provides information and interaction with Load Balancers
+of the LBaaS v2 extension for the OpenStack Networking service.
+
+Example to List Load Balancers
+
+ listOpts := loadbalancers.ListOpts{
+ Provider: "haproxy",
+ }
+
+ allPages, err := loadbalancers.List(networkClient, listOpts).AllPages()
+ if err != nil {
+ panic(err)
+ }
+
+ allLoadbalancers, err := loadbalancers.ExtractLoadBalancers(allPages)
+ if err != nil {
+ panic(err)
+ }
+
+ for _, lb := range allLoadbalancers {
+ fmt.Printf("%+v\n", lb)
+ }
+
+Example to Create a Load Balancer
+
+ createOpts := loadbalancers.CreateOpts{
+ Name: "db_lb",
+ AdminStateUp: gophercloud.Enabled,
+ VipSubnetID: "9cedb85d-0759-4898-8a4b-fa5a5ea10086",
+ VipAddress: "10.30.176.48",
+ FlavorID: "60df399a-ee85-11e9-81b4-2a2ae2dbcce4",
+ Provider: "haproxy",
+ Tags: []string{"test", "stage"},
+ }
+
+ lb, err := loadbalancers.Create(networkClient, createOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Create a fully populated Load Balancer
+
+ createOpts := loadbalancers.CreateOpts{
+ Name: "db_lb",
+ AdminStateUp: gophercloud.Enabled,
+ VipSubnetID: "9cedb85d-0759-4898-8a4b-fa5a5ea10086",
+ VipAddress: "10.30.176.48",
+ FlavorID: "60df399a-ee85-11e9-81b4-2a2ae2dbcce4",
+ Provider: "haproxy",
+ Tags: []string{"test", "stage"},
+ Listeners: []listeners.CreateOpts{{
+ Protocol: "HTTP",
+ ProtocolPort: 8080,
+ Name: "redirect_listener",
+ L7Policies: []l7policies.CreateOpts{{
+ Name: "redirect-example.com",
+ Action: l7policies.ActionRedirectToURL,
+ RedirectURL: "http://www.example.com",
+ Rules: []l7policies.CreateRuleOpts{{
+ RuleType: l7policies.TypePath,
+ CompareType: l7policies.CompareTypeRegex,
+ Value: "/images*",
+ }},
+ }},
+ DefaultPool: &pools.CreateOpts{
+ LBMethod: pools.LBMethodRoundRobin,
+ Protocol: "HTTP",
+ Name: "example pool",
+ Members: []pools.BatchUpdateMemberOpts{{
+ Address: "192.0.2.51",
+ ProtocolPort: 80,
+ },},
+ Monitor: &monitors.CreateOpts{
+ Name: "db",
+ Type: "HTTP",
+ Delay: 3,
+ MaxRetries: 2,
+ Timeout: 1,
+ },
+ },
+ }},
+ }
+
+ lb, err := loadbalancers.Create(networkClient, createOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Update a Load Balancer
+
+ lbID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ name := "new-name"
+ updateOpts := loadbalancers.UpdateOpts{
+ Name: &name,
+ }
+ lb, err := loadbalancers.Update(networkClient, lbID, updateOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Delete a Load Balancers
+
+ deleteOpts := loadbalancers.DeleteOpts{
+ Cascade: true,
+ }
+
+ lbID := "d67d56a6-4a86-4688-a282-f46444705c64"
+
+ err := loadbalancers.Delete(networkClient, lbID, deleteOpts).ExtractErr()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Get the Status of a Load Balancer
+
+ lbID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ status, err := loadbalancers.GetStatuses(networkClient, LBID).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Get the Statistics of a Load Balancer
+
+ lbID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ stats, err := loadbalancers.GetStats(networkClient, LBID).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Failover a Load Balancers
+
+ lbID := "d67d56a6-4a86-4688-a282-f46444705c64"
+
+ err := loadbalancers.Failover(networkClient, lbID).ExtractErr()
+ if err != nil {
+ panic(err)
+ }
+*/
+package loadbalancers
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/requests.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/requests.go
new file mode 100644
index 0000000000..099113c418
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/requests.go
@@ -0,0 +1,275 @@
+package loadbalancers
+
+import (
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+// ListOptsBuilder allows extensions to add additional parameters to the
+// List request.
+type ListOptsBuilder interface {
+ ToLoadBalancerListQuery() (string, error)
+}
+
+// ListOpts allows the filtering and sorting of paginated collections through
+// the API. Filtering is achieved by passing in struct field values that map to
+// the Loadbalancer attributes you want to see returned. SortKey allows you to
+// sort by a particular attribute. SortDir sets the direction, and is
+// either `asc' or `desc'. Marker and Limit are used for pagination.
+type ListOpts struct {
+ Description string `q:"description"`
+ AdminStateUp *bool `q:"admin_state_up"`
+ ProjectID string `q:"project_id"`
+ ProvisioningStatus string `q:"provisioning_status"`
+ VipAddress string `q:"vip_address"`
+ VipPortID string `q:"vip_port_id"`
+ VipSubnetID string `q:"vip_subnet_id"`
+ VipNetworkID string `q:"vip_network_id"`
+ ID string `q:"id"`
+ OperatingStatus string `q:"operating_status"`
+ Name string `q:"name"`
+ FlavorID string `q:"flavor_id"`
+ AvailabilityZone string `q:"availability_zone"`
+ Provider string `q:"provider"`
+ Limit int `q:"limit"`
+ Marker string `q:"marker"`
+ SortKey string `q:"sort_key"`
+ SortDir string `q:"sort_dir"`
+ Tags []string `q:"tags"`
+ TagsAny []string `q:"tags-any"`
+ TagsNot []string `q:"not-tags"`
+ TagsNotAny []string `q:"not-tags-any"`
+}
+
+// ToLoadBalancerListQuery formats a ListOpts into a query string.
+func (opts ListOpts) ToLoadBalancerListQuery() (string, error) {
+ q, err := gophercloud.BuildQueryString(opts)
+ return q.String(), err
+}
+
+// List returns a Pager which allows you to iterate over a collection of
+// load balancers. It accepts a ListOpts struct, which allows you to filter
+// and sort the returned collection for greater efficiency.
+//
+// Default policy settings return only those load balancers that are owned by
+// the project who submits the request, unless an admin user submits the request.
+func List(c *gophercloud.ServiceClient, opts ListOptsBuilder) pagination.Pager {
+ url := rootURL(c)
+ if opts != nil {
+ query, err := opts.ToLoadBalancerListQuery()
+ if err != nil {
+ return pagination.Pager{Err: err}
+ }
+ url += query
+ }
+ return pagination.NewPager(c, url, func(r pagination.PageResult) pagination.Page {
+ return LoadBalancerPage{pagination.LinkedPageBase{PageResult: r}}
+ })
+}
+
+// CreateOptsBuilder allows extensions to add additional parameters to the
+// Create request.
+type CreateOptsBuilder interface {
+ ToLoadBalancerCreateMap() (map[string]interface{}, error)
+}
+
+// CreateOpts is the common options struct used in this package's Create
+// operation.
+type CreateOpts struct {
+ // Human-readable name for the Loadbalancer. Does not have to be unique.
+ Name string `json:"name,omitempty"`
+
+ // Human-readable description for the Loadbalancer.
+ Description string `json:"description,omitempty"`
+
+ // Providing a neutron port ID for the vip_port_id tells Octavia to use this
+ // port for the VIP. If the port has more than one subnet you must specify
+ // either the vip_subnet_id or vip_address to clarify which address should
+ // be used for the VIP.
+ VipPortID string `json:"vip_port_id,omitempty"`
+
+ // The subnet on which to allocate the Loadbalancer's address. A project can
+ // only create Loadbalancers on networks authorized by policy (e.g. networks
+ // that belong to them or networks that are shared).
+ VipSubnetID string `json:"vip_subnet_id,omitempty"`
+
+ // The network on which to allocate the Loadbalancer's address. A tenant can
+ // only create Loadbalancers on networks authorized by policy (e.g. networks
+ // that belong to them or networks that are shared).
+ VipNetworkID string `json:"vip_network_id,omitempty"`
+
+ // ProjectID is the UUID of the project who owns the Loadbalancer.
+ // Only administrative users can specify a project UUID other than their own.
+ ProjectID string `json:"project_id,omitempty"`
+
+ // The IP address of the Loadbalancer.
+ VipAddress string `json:"vip_address,omitempty"`
+
+ // The ID of the QoS Policy which will apply to the Virtual IP
+ VipQosPolicyID string `json:"vip_qos_policy_id,omitempty"`
+
+ // The administrative state of the Loadbalancer. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // The UUID of a flavor.
+ FlavorID string `json:"flavor_id,omitempty"`
+
+ // The name of an Octavia availability zone.
+ // Requires Octavia API version 2.14 or later.
+ AvailabilityZone string `json:"availability_zone,omitempty"`
+
+ // The name of the provider.
+ Provider string `json:"provider,omitempty"`
+
+ // Listeners is a slice of listeners.CreateOpts which allows a set
+ // of listeners to be created at the same time the Loadbalancer is created.
+ //
+ // This is only possible to use when creating a fully populated
+ // load balancer.
+ Listeners []listeners.CreateOpts `json:"listeners,omitempty"`
+
+ // Pools is a slice of pools.CreateOpts which allows a set of pools
+ // to be created at the same time the Loadbalancer is created.
+ //
+ // This is only possible to use when creating a fully populated
+ // load balancer.
+ Pools []pools.CreateOpts `json:"pools,omitempty"`
+
+ // Tags is a set of resource tags.
+ Tags []string `json:"tags,omitempty"`
+}
+
+// ToLoadBalancerCreateMap builds a request body from CreateOpts.
+func (opts CreateOpts) ToLoadBalancerCreateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "loadbalancer")
+}
+
+// Create is an operation which provisions a new loadbalancer based on the
+// configuration defined in the CreateOpts struct. Once the request is
+// validated and progress has started on the provisioning process, a
+// CreateResult will be returned.
+func Create(c *gophercloud.ServiceClient, opts CreateOptsBuilder) (r CreateResult) {
+ b, err := opts.ToLoadBalancerCreateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Post(rootURL(c), b, &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// Get retrieves a particular Loadbalancer based on its unique ID.
+func Get(c *gophercloud.ServiceClient, id string) (r GetResult) {
+ resp, err := c.Get(resourceURL(c, id), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// UpdateOptsBuilder allows extensions to add additional parameters to the
+// Update request.
+type UpdateOptsBuilder interface {
+ ToLoadBalancerUpdateMap() (map[string]interface{}, error)
+}
+
+// UpdateOpts is the common options struct used in this package's Update
+// operation.
+type UpdateOpts struct {
+ // Human-readable name for the Loadbalancer. Does not have to be unique.
+ Name *string `json:"name,omitempty"`
+
+ // Human-readable description for the Loadbalancer.
+ Description *string `json:"description,omitempty"`
+
+ // The administrative state of the Loadbalancer. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // The ID of the QoS Policy which will apply to the Virtual IP
+ VipQosPolicyID *string `json:"vip_qos_policy_id,omitempty"`
+
+ // Tags is a set of resource tags.
+ Tags *[]string `json:"tags,omitempty"`
+}
+
+// ToLoadBalancerUpdateMap builds a request body from UpdateOpts.
+func (opts UpdateOpts) ToLoadBalancerUpdateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "loadbalancer")
+}
+
+// Update is an operation which modifies the attributes of the specified
+// LoadBalancer.
+func Update(c *gophercloud.ServiceClient, id string, opts UpdateOpts) (r UpdateResult) {
+ b, err := opts.ToLoadBalancerUpdateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Put(resourceURL(c, id), b, &r.Body, &gophercloud.RequestOpts{
+ OkCodes: []int{200, 202},
+ })
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// DeleteOptsBuilder allows extensions to add additional parameters to the
+// Delete request.
+type DeleteOptsBuilder interface {
+ ToLoadBalancerDeleteQuery() (string, error)
+}
+
+// DeleteOpts is the common options struct used in this package's Delete
+// operation.
+type DeleteOpts struct {
+ // Cascade will delete all children of the load balancer (listners, monitors, etc).
+ Cascade bool `q:"cascade"`
+}
+
+// ToLoadBalancerDeleteQuery formats a DeleteOpts into a query string.
+func (opts DeleteOpts) ToLoadBalancerDeleteQuery() (string, error) {
+ q, err := gophercloud.BuildQueryString(opts)
+ return q.String(), err
+}
+
+// Delete will permanently delete a particular LoadBalancer based on its
+// unique ID.
+func Delete(c *gophercloud.ServiceClient, id string, opts DeleteOptsBuilder) (r DeleteResult) {
+ url := resourceURL(c, id)
+ if opts != nil {
+ query, err := opts.ToLoadBalancerDeleteQuery()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ url += query
+ }
+ resp, err := c.Delete(url, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// GetStatuses will return the status of a particular LoadBalancer.
+func GetStatuses(c *gophercloud.ServiceClient, id string) (r GetStatusesResult) {
+ resp, err := c.Get(statusRootURL(c, id), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// GetStats will return the shows the current statistics of a particular LoadBalancer.
+func GetStats(c *gophercloud.ServiceClient, id string) (r StatsResult) {
+ resp, err := c.Get(statisticsRootURL(c, id), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// Failover performs a failover of a load balancer.
+func Failover(c *gophercloud.ServiceClient, id string) (r FailoverResult) {
+ resp, err := c.Put(failoverRootURL(c, id), nil, nil, &gophercloud.RequestOpts{
+ OkCodes: []int{202},
+ })
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/results.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/results.go
new file mode 100644
index 0000000000..71f750dd6a
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/results.go
@@ -0,0 +1,256 @@
+package loadbalancers
+
+import (
+ "encoding/json"
+ "time"
+
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+// LoadBalancer is the primary load balancing configuration object that
+// specifies the virtual IP address on which client traffic is received, as well
+// as other details such as the load balancing method to be use, protocol, etc.
+type LoadBalancer struct {
+ // Human-readable description for the Loadbalancer.
+ Description string `json:"description"`
+
+ // The administrative state of the Loadbalancer.
+ // A valid value is true (UP) or false (DOWN).
+ AdminStateUp bool `json:"admin_state_up"`
+
+ // Owner of the LoadBalancer.
+ ProjectID string `json:"project_id"`
+
+ // UpdatedAt and CreatedAt contain ISO-8601 timestamps of when the state of the
+ // loadbalancer last changed, and when it was created.
+ UpdatedAt time.Time `json:"-"`
+ CreatedAt time.Time `json:"-"`
+
+ // The provisioning status of the LoadBalancer.
+ // This value is ACTIVE, PENDING_CREATE or ERROR.
+ ProvisioningStatus string `json:"provisioning_status"`
+
+ // The IP address of the Loadbalancer.
+ VipAddress string `json:"vip_address"`
+
+ // The UUID of the port associated with the IP address.
+ VipPortID string `json:"vip_port_id"`
+
+ // The UUID of the subnet on which to allocate the virtual IP for the
+ // Loadbalancer address.
+ VipSubnetID string `json:"vip_subnet_id"`
+
+ // The UUID of the network on which to allocate the virtual IP for the
+ // Loadbalancer address.
+ VipNetworkID string `json:"vip_network_id"`
+
+ // The ID of the QoS Policy which will apply to the Virtual IP
+ VipQosPolicyID string `json:"vip_qos_policy_id"`
+
+ // The unique ID for the LoadBalancer.
+ ID string `json:"id"`
+
+ // The operating status of the LoadBalancer. This value is ONLINE or OFFLINE.
+ OperatingStatus string `json:"operating_status"`
+
+ // Human-readable name for the LoadBalancer. Does not have to be unique.
+ Name string `json:"name"`
+
+ // The UUID of a flavor if set.
+ FlavorID string `json:"flavor_id"`
+
+ // The name of an Octavia availability zone if set.
+ AvailabilityZone string `json:"availability_zone"`
+
+ // The name of the provider.
+ Provider string `json:"provider"`
+
+ // Listeners are the listeners related to this Loadbalancer.
+ Listeners []listeners.Listener `json:"listeners"`
+
+ // Pools are the pools related to this Loadbalancer.
+ Pools []pools.Pool `json:"pools"`
+
+ // Tags is a list of resource tags. Tags are arbitrarily defined strings
+ // attached to the resource.
+ Tags []string `json:"tags"`
+}
+
+func (r *LoadBalancer) UnmarshalJSON(b []byte) error {
+ type tmp LoadBalancer
+
+ // Support for older neutron time format
+ var s1 struct {
+ tmp
+ CreatedAt gophercloud.JSONRFC3339NoZ `json:"created_at"`
+ UpdatedAt gophercloud.JSONRFC3339NoZ `json:"updated_at"`
+ }
+
+ err := json.Unmarshal(b, &s1)
+ if err == nil {
+ *r = LoadBalancer(s1.tmp)
+ r.CreatedAt = time.Time(s1.CreatedAt)
+ r.UpdatedAt = time.Time(s1.UpdatedAt)
+
+ return nil
+ }
+
+ // Support for newer neutron time format
+ var s2 struct {
+ tmp
+ CreatedAt time.Time `json:"created_at"`
+ UpdatedAt time.Time `json:"updated_at"`
+ }
+
+ err = json.Unmarshal(b, &s2)
+ if err != nil {
+ return err
+ }
+
+ *r = LoadBalancer(s2.tmp)
+ r.CreatedAt = time.Time(s2.CreatedAt)
+ r.UpdatedAt = time.Time(s2.UpdatedAt)
+
+ return nil
+}
+
+// StatusTree represents the status of a loadbalancer.
+type StatusTree struct {
+ Loadbalancer *LoadBalancer `json:"loadbalancer"`
+}
+
+type Stats struct {
+ // The currently active connections.
+ ActiveConnections int `json:"active_connections"`
+
+ // The total bytes received.
+ BytesIn int `json:"bytes_in"`
+
+ // The total bytes sent.
+ BytesOut int `json:"bytes_out"`
+
+ // The total requests that were unable to be fulfilled.
+ RequestErrors int `json:"request_errors"`
+
+ // The total connections handled.
+ TotalConnections int `json:"total_connections"`
+}
+
+// LoadBalancerPage is the page returned by a pager when traversing over a
+// collection of load balancers.
+type LoadBalancerPage struct {
+ pagination.LinkedPageBase
+}
+
+// NextPageURL is invoked when a paginated collection of load balancers has
+// reached the end of a page and the pager seeks to traverse over a new one.
+// In order to do this, it needs to construct the next page's URL.
+func (r LoadBalancerPage) NextPageURL() (string, error) {
+ var s struct {
+ Links []gophercloud.Link `json:"loadbalancers_links"`
+ }
+ err := r.ExtractInto(&s)
+ if err != nil {
+ return "", err
+ }
+ return gophercloud.ExtractNextURL(s.Links)
+}
+
+// IsEmpty checks whether a LoadBalancerPage struct is empty.
+func (r LoadBalancerPage) IsEmpty() (bool, error) {
+ if r.StatusCode == 204 {
+ return true, nil
+ }
+
+ is, err := ExtractLoadBalancers(r)
+ return len(is) == 0, err
+}
+
+// ExtractLoadBalancers accepts a Page struct, specifically a LoadbalancerPage
+// struct, and extracts the elements into a slice of LoadBalancer structs. In
+// other words, a generic collection is mapped into a relevant slice.
+func ExtractLoadBalancers(r pagination.Page) ([]LoadBalancer, error) {
+ var s struct {
+ LoadBalancers []LoadBalancer `json:"loadbalancers"`
+ }
+ err := (r.(LoadBalancerPage)).ExtractInto(&s)
+ return s.LoadBalancers, err
+}
+
+type commonResult struct {
+ gophercloud.Result
+}
+
+// Extract is a function that accepts a result and extracts a loadbalancer.
+func (r commonResult) Extract() (*LoadBalancer, error) {
+ var s struct {
+ LoadBalancer *LoadBalancer `json:"loadbalancer"`
+ }
+ err := r.ExtractInto(&s)
+ return s.LoadBalancer, err
+}
+
+// GetStatusesResult represents the result of a GetStatuses operation.
+// Call its Extract method to interpret it as a StatusTree.
+type GetStatusesResult struct {
+ gophercloud.Result
+}
+
+// Extract is a function that accepts a result and extracts the status of
+// a Loadbalancer.
+func (r GetStatusesResult) Extract() (*StatusTree, error) {
+ var s struct {
+ Statuses *StatusTree `json:"statuses"`
+ }
+ err := r.ExtractInto(&s)
+ return s.Statuses, err
+}
+
+// StatsResult represents the result of a GetStats operation.
+// Call its Extract method to interpret it as a Stats.
+type StatsResult struct {
+ gophercloud.Result
+}
+
+// Extract is a function that accepts a result and extracts the status of
+// a Loadbalancer.
+func (r StatsResult) Extract() (*Stats, error) {
+ var s struct {
+ Stats *Stats `json:"stats"`
+ }
+ err := r.ExtractInto(&s)
+ return s.Stats, err
+}
+
+// CreateResult represents the result of a create operation. Call its Extract
+// method to interpret it as a LoadBalancer.
+type CreateResult struct {
+ commonResult
+}
+
+// GetResult represents the result of a get operation. Call its Extract
+// method to interpret it as a LoadBalancer.
+type GetResult struct {
+ commonResult
+}
+
+// UpdateResult represents the result of an update operation. Call its Extract
+// method to interpret it as a LoadBalancer.
+type UpdateResult struct {
+ commonResult
+}
+
+// DeleteResult represents the result of a delete operation. Call its
+// ExtractErr method to determine if the request succeeded or failed.
+type DeleteResult struct {
+ gophercloud.ErrResult
+}
+
+// FailoverResult represents the result of a failover operation. Call its
+// ExtractErr method to determine if the request succeeded or failed.
+type FailoverResult struct {
+ gophercloud.ErrResult
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/urls.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/urls.go
new file mode 100644
index 0000000000..7b184e35f6
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers/urls.go
@@ -0,0 +1,31 @@
+package loadbalancers
+
+import "github.com/gophercloud/gophercloud"
+
+const (
+ rootPath = "lbaas"
+ resourcePath = "loadbalancers"
+ statusPath = "status"
+ statisticsPath = "stats"
+ failoverPath = "failover"
+)
+
+func rootURL(c *gophercloud.ServiceClient) string {
+ return c.ServiceURL(rootPath, resourcePath)
+}
+
+func resourceURL(c *gophercloud.ServiceClient, id string) string {
+ return c.ServiceURL(rootPath, resourcePath, id)
+}
+
+func statusRootURL(c *gophercloud.ServiceClient, id string) string {
+ return c.ServiceURL(rootPath, resourcePath, id, statusPath)
+}
+
+func statisticsRootURL(c *gophercloud.ServiceClient, id string) string {
+ return c.ServiceURL(rootPath, resourcePath, id, statisticsPath)
+}
+
+func failoverRootURL(c *gophercloud.ServiceClient, id string) string {
+ return c.ServiceURL(rootPath, resourcePath, id, failoverPath)
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/doc.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/doc.go
new file mode 100644
index 0000000000..b191b45e9c
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/doc.go
@@ -0,0 +1,71 @@
+/*
+Package monitors provides information and interaction with Monitors
+of the LBaaS v2 extension for the OpenStack Networking service.
+
+Example to List Monitors
+
+ listOpts := monitors.ListOpts{
+ PoolID: "c79a4468-d788-410c-bf79-9a8ef6354852",
+ }
+
+ allPages, err := monitors.List(networkClient, listOpts).AllPages()
+ if err != nil {
+ panic(err)
+ }
+
+ allMonitors, err := monitors.ExtractMonitors(allPages)
+ if err != nil {
+ panic(err)
+ }
+
+ for _, monitor := range allMonitors {
+ fmt.Printf("%+v\n", monitor)
+ }
+
+Example to Create a Monitor
+
+ createOpts := monitors.CreateOpts{
+ Type: "HTTP",
+ Name: "db",
+ PoolID: "84f1b61f-58c4-45bf-a8a9-2dafb9e5214d",
+ Delay: 20,
+ Timeout: 10,
+ MaxRetries: 5,
+ MaxRetriesDown: 4,
+ URLPath: "/check",
+ ExpectedCodes: "200-299",
+ }
+
+ monitor, err := monitors.Create(networkClient, createOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Update a Monitor
+
+ monitorID := "d67d56a6-4a86-4688-a282-f46444705c64"
+
+ updateOpts := monitors.UpdateOpts{
+ Name: "NewHealthmonitorName",
+ Delay: 3,
+ Timeout: 20,
+ MaxRetries: 10,
+ MaxRetriesDown: 8,
+ URLPath: "/another_check",
+ ExpectedCodes: "301",
+ }
+
+ monitor, err := monitors.Update(networkClient, monitorID, updateOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Delete a Monitor
+
+ monitorID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ err := monitors.Delete(networkClient, monitorID).ExtractErr()
+ if err != nil {
+ panic(err)
+ }
+*/
+package monitors
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/requests.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/requests.go
new file mode 100644
index 0000000000..7d7466a081
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/requests.go
@@ -0,0 +1,255 @@
+package monitors
+
+import (
+ "fmt"
+
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+// ListOptsBuilder allows extensions to add additional parameters to the
+// List request.
+type ListOptsBuilder interface {
+ ToMonitorListQuery() (string, error)
+}
+
+// ListOpts allows the filtering and sorting of paginated collections through
+// the API. Filtering is achieved by passing in struct field values that map to
+// the Monitor attributes you want to see returned. SortKey allows you to
+// sort by a particular Monitor attribute. SortDir sets the direction, and is
+// either `asc' or `desc'. Marker and Limit are used for pagination.
+type ListOpts struct {
+ ID string `q:"id"`
+ Name string `q:"name"`
+ TenantID string `q:"tenant_id"`
+ ProjectID string `q:"project_id"`
+ PoolID string `q:"pool_id"`
+ Type string `q:"type"`
+ Delay int `q:"delay"`
+ Timeout int `q:"timeout"`
+ MaxRetries int `q:"max_retries"`
+ MaxRetriesDown int `q:"max_retries_down"`
+ HTTPMethod string `q:"http_method"`
+ URLPath string `q:"url_path"`
+ ExpectedCodes string `q:"expected_codes"`
+ AdminStateUp *bool `q:"admin_state_up"`
+ Status string `q:"status"`
+ Limit int `q:"limit"`
+ Marker string `q:"marker"`
+ SortKey string `q:"sort_key"`
+ SortDir string `q:"sort_dir"`
+}
+
+// ToMonitorListQuery formats a ListOpts into a query string.
+func (opts ListOpts) ToMonitorListQuery() (string, error) {
+ q, err := gophercloud.BuildQueryString(opts)
+ if err != nil {
+ return "", err
+ }
+ return q.String(), nil
+}
+
+// List returns a Pager which allows you to iterate over a collection of
+// health monitors. It accepts a ListOpts struct, which allows you to filter and sort
+// the returned collection for greater efficiency.
+//
+// Default policy settings return only those health monitors that are owned by the
+// tenant who submits the request, unless an admin user submits the request.
+func List(c *gophercloud.ServiceClient, opts ListOptsBuilder) pagination.Pager {
+ url := rootURL(c)
+ if opts != nil {
+ query, err := opts.ToMonitorListQuery()
+ if err != nil {
+ return pagination.Pager{Err: err}
+ }
+ url += query
+ }
+ return pagination.NewPager(c, url, func(r pagination.PageResult) pagination.Page {
+ return MonitorPage{pagination.LinkedPageBase{PageResult: r}}
+ })
+}
+
+// Constants that represent approved monitoring types.
+const (
+ TypePING = "PING"
+ TypeTCP = "TCP"
+ TypeHTTP = "HTTP"
+ TypeHTTPS = "HTTPS"
+ TypeTLSHELLO = "TLS-HELLO"
+ TypeUDPConnect = "UDP-CONNECT"
+ TypeSCTP = "SCTP"
+)
+
+var (
+ errDelayMustGETimeout = fmt.Errorf("Delay must be greater than or equal to timeout")
+)
+
+// CreateOptsBuilder allows extensions to add additional parameters to the
+// List request.
+type CreateOptsBuilder interface {
+ ToMonitorCreateMap() (map[string]interface{}, error)
+}
+
+// CreateOpts is the common options struct used in this package's Create
+// operation.
+type CreateOpts struct {
+ // The Pool to Monitor.
+ PoolID string `json:"pool_id,omitempty"`
+
+ // The type of probe, which is PING, TCP, HTTP, or HTTPS, that is
+ // sent by the load balancer to verify the member state.
+ Type string `json:"type" required:"true"`
+
+ // The time, in seconds, between sending probes to members.
+ Delay int `json:"delay" required:"true"`
+
+ // Maximum number of seconds for a Monitor to wait for a ping reply
+ // before it times out. The value must be less than the delay value.
+ Timeout int `json:"timeout" required:"true"`
+
+ // Number of permissible ping failures before changing the member's
+ // status to INACTIVE. Must be a number between 1 and 10.
+ MaxRetries int `json:"max_retries" required:"true"`
+
+ // Number of permissible ping failures befor changing the member's
+ // status to ERROR. Must be a number between 1 and 10.
+ MaxRetriesDown int `json:"max_retries_down,omitempty"`
+
+ // URI path that will be accessed if Monitor type is HTTP or HTTPS.
+ URLPath string `json:"url_path,omitempty"`
+
+ // The HTTP method used for requests by the Monitor. If this attribute
+ // is not specified, it defaults to "GET". Required for HTTP(S) types.
+ HTTPMethod string `json:"http_method,omitempty"`
+
+ // Expected HTTP codes for a passing HTTP(S) Monitor. You can either specify
+ // a single status like "200", a range like "200-202", or a combination like
+ // "200-202, 401".
+ ExpectedCodes string `json:"expected_codes,omitempty"`
+
+ // TenantID is the UUID of the project who owns the Monitor.
+ // Only administrative users can specify a project UUID other than their own.
+ TenantID string `json:"tenant_id,omitempty"`
+
+ // ProjectID is the UUID of the project who owns the Monitor.
+ // Only administrative users can specify a project UUID other than their own.
+ ProjectID string `json:"project_id,omitempty"`
+
+ // The Name of the Monitor.
+ Name string `json:"name,omitempty"`
+
+ // The administrative state of the Monitor. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+}
+
+// ToMonitorCreateMap builds a request body from CreateOpts.
+func (opts CreateOpts) ToMonitorCreateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "healthmonitor")
+}
+
+/*
+Create is an operation which provisions a new Health Monitor. There are
+different types of Monitor you can provision: PING, TCP or HTTP(S). Below
+are examples of how to create each one.
+
+Here is an example config struct to use when creating a PING or TCP Monitor:
+
+CreateOpts{Type: TypePING, Delay: 20, Timeout: 10, MaxRetries: 3}
+CreateOpts{Type: TypeTCP, Delay: 20, Timeout: 10, MaxRetries: 3}
+
+Here is an example config struct to use when creating a HTTP(S) Monitor:
+
+CreateOpts{Type: TypeHTTP, Delay: 20, Timeout: 10, MaxRetries: 3,
+HttpMethod: "HEAD", ExpectedCodes: "200", PoolID: "2c946bfc-1804-43ab-a2ff-58f6a762b505"}
+*/
+func Create(c *gophercloud.ServiceClient, opts CreateOptsBuilder) (r CreateResult) {
+ b, err := opts.ToMonitorCreateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Post(rootURL(c), b, &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// Get retrieves a particular Health Monitor based on its unique ID.
+func Get(c *gophercloud.ServiceClient, id string) (r GetResult) {
+ resp, err := c.Get(resourceURL(c, id), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// UpdateOptsBuilder allows extensions to add additional parameters to the
+// Update request.
+type UpdateOptsBuilder interface {
+ ToMonitorUpdateMap() (map[string]interface{}, error)
+}
+
+// UpdateOpts is the common options struct used in this package's Update
+// operation.
+type UpdateOpts struct {
+ // The time, in seconds, between sending probes to members.
+ Delay int `json:"delay,omitempty"`
+
+ // Maximum number of seconds for a Monitor to wait for a ping reply
+ // before it times out. The value must be less than the delay value.
+ Timeout int `json:"timeout,omitempty"`
+
+ // Number of permissible ping failures before changing the member's
+ // status to INACTIVE. Must be a number between 1 and 10.
+ MaxRetries int `json:"max_retries,omitempty"`
+
+ // Number of permissible ping failures befor changing the member's
+ // status to ERROR. Must be a number between 1 and 10.
+ MaxRetriesDown int `json:"max_retries_down,omitempty"`
+
+ // URI path that will be accessed if Monitor type is HTTP or HTTPS.
+ // Required for HTTP(S) types.
+ URLPath string `json:"url_path,omitempty"`
+
+ // The HTTP method used for requests by the Monitor. If this attribute
+ // is not specified, it defaults to "GET". Required for HTTP(S) types.
+ HTTPMethod string `json:"http_method,omitempty"`
+
+ // Expected HTTP codes for a passing HTTP(S) Monitor. You can either specify
+ // a single status like "200", or a range like "200-202". Required for HTTP(S)
+ // types.
+ ExpectedCodes string `json:"expected_codes,omitempty"`
+
+ // The Name of the Monitor.
+ Name *string `json:"name,omitempty"`
+
+ // The administrative state of the Monitor. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+}
+
+// ToMonitorUpdateMap builds a request body from UpdateOpts.
+func (opts UpdateOpts) ToMonitorUpdateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "healthmonitor")
+}
+
+// Update is an operation which modifies the attributes of the specified
+// Monitor.
+func Update(c *gophercloud.ServiceClient, id string, opts UpdateOptsBuilder) (r UpdateResult) {
+ b, err := opts.ToMonitorUpdateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+
+ resp, err := c.Put(resourceURL(c, id), b, &r.Body, &gophercloud.RequestOpts{
+ OkCodes: []int{200, 202},
+ })
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// Delete will permanently delete a particular Monitor based on its unique ID.
+func Delete(c *gophercloud.ServiceClient, id string) (r DeleteResult) {
+ resp, err := c.Delete(resourceURL(c, id), nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/results.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/results.go
new file mode 100644
index 0000000000..502581feba
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/results.go
@@ -0,0 +1,167 @@
+package monitors
+
+import (
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+type PoolID struct {
+ ID string `json:"id"`
+}
+
+// Monitor represents a load balancer health monitor. A health monitor is used
+// to determine whether or not back-end members of the VIP's pool are usable
+// for processing a request. A pool can have several health monitors associated
+// with it. There are different types of health monitors supported:
+//
+// PING: used to ping the members using ICMP.
+// TCP: used to connect to the members using TCP.
+// HTTP: used to send an HTTP request to the member.
+// HTTPS: used to send a secure HTTP request to the member.
+// TLS-HELLO: used to send TLS-HELLO request to the member.
+// UDP-CONNECT: used to send UDP-CONNECT request to the member.
+// SCTP: used to send SCTP request to the member.
+//
+// When a pool has several monitors associated with it, each member of the pool
+// is monitored by all these monitors. If any monitor declares the member as
+// unhealthy, then the member status is changed to INACTIVE and the member
+// won't participate in its pool's load balancing. In other words, ALL monitors
+// must declare the member to be healthy for it to stay ACTIVE.
+type Monitor struct {
+ // The unique ID for the Monitor.
+ ID string `json:"id"`
+
+ // The Name of the Monitor.
+ Name string `json:"name"`
+
+ // The owner of the Monitor.
+ ProjectID string `json:"project_id"`
+
+ // The type of probe sent by the load balancer to verify the member state,
+ // which is PING, TCP, HTTP, HTTPS, TLS-HELLO, UDP-CONNECT or SCTP.
+ Type string `json:"type"`
+
+ // The time, in seconds, between sending probes to members.
+ Delay int `json:"delay"`
+
+ // The maximum number of seconds for a monitor to wait for a connection to be
+ // established before it times out. This value must be less than the delay
+ // value.
+ Timeout int `json:"timeout"`
+
+ // Number of allowed connection failures before changing the status of the
+ // member to INACTIVE. A valid value is from 1 to 10.
+ MaxRetries int `json:"max_retries"`
+
+ // Number of allowed connection failures before changing the status of the
+ // member to Error. A valid value is from 1 to 10.
+ MaxRetriesDown int `json:"max_retries_down"`
+
+ // The HTTP method that the monitor uses for requests.
+ HTTPMethod string `json:"http_method"`
+
+ // The HTTP path of the request sent by the monitor to test the health of a
+ // member. Must be a string beginning with a forward slash (/).
+ URLPath string `json:"url_path" `
+
+ // Expected HTTP codes for a passing HTTP(S) monitor.
+ ExpectedCodes string `json:"expected_codes"`
+
+ // The administrative state of the health monitor, which is up (true) or
+ // down (false).
+ AdminStateUp bool `json:"admin_state_up"`
+
+ // The status of the health monitor. Indicates whether the health monitor is
+ // operational.
+ Status string `json:"status"`
+
+ // List of pools that are associated with the health monitor.
+ Pools []PoolID `json:"pools"`
+
+ // The provisioning status of the Monitor.
+ // This value is ACTIVE, PENDING_* or ERROR.
+ ProvisioningStatus string `json:"provisioning_status"`
+
+ // The operating status of the monitor.
+ OperatingStatus string `json:"operating_status"`
+}
+
+// MonitorPage is the page returned by a pager when traversing over a
+// collection of health monitors.
+type MonitorPage struct {
+ pagination.LinkedPageBase
+}
+
+// NextPageURL is invoked when a paginated collection of monitors has reached
+// the end of a page and the pager seeks to traverse over a new one. In order
+// to do this, it needs to construct the next page's URL.
+func (r MonitorPage) NextPageURL() (string, error) {
+ var s struct {
+ Links []gophercloud.Link `json:"healthmonitors_links"`
+ }
+
+ err := r.ExtractInto(&s)
+ if err != nil {
+ return "", err
+ }
+
+ return gophercloud.ExtractNextURL(s.Links)
+}
+
+// IsEmpty checks whether a MonitorPage struct is empty.
+func (r MonitorPage) IsEmpty() (bool, error) {
+ if r.StatusCode == 204 {
+ return true, nil
+ }
+
+ is, err := ExtractMonitors(r)
+ return len(is) == 0, err
+}
+
+// ExtractMonitors accepts a Page struct, specifically a MonitorPage struct,
+// and extracts the elements into a slice of Monitor structs. In other words,
+// a generic collection is mapped into a relevant slice.
+func ExtractMonitors(r pagination.Page) ([]Monitor, error) {
+ var s struct {
+ Monitors []Monitor `json:"healthmonitors"`
+ }
+ err := (r.(MonitorPage)).ExtractInto(&s)
+ return s.Monitors, err
+}
+
+type commonResult struct {
+ gophercloud.Result
+}
+
+// Extract is a function that accepts a result and extracts a monitor.
+func (r commonResult) Extract() (*Monitor, error) {
+ var s struct {
+ Monitor *Monitor `json:"healthmonitor"`
+ }
+ err := r.ExtractInto(&s)
+ return s.Monitor, err
+}
+
+// CreateResult represents the result of a create operation. Call its Extract
+// method to interpret it as a Monitor.
+type CreateResult struct {
+ commonResult
+}
+
+// GetResult represents the result of a get operation. Call its Extract
+// method to interpret it as a Monitor.
+type GetResult struct {
+ commonResult
+}
+
+// UpdateResult represents the result of an update operation. Call its Extract
+// method to interpret it as a Monitor.
+type UpdateResult struct {
+ commonResult
+}
+
+// DeleteResult represents the result of a delete operation. Call its
+// ExtractErr method to determine if the result succeeded or failed.
+type DeleteResult struct {
+ gophercloud.ErrResult
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/urls.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/urls.go
new file mode 100644
index 0000000000..a222e52a93
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors/urls.go
@@ -0,0 +1,16 @@
+package monitors
+
+import "github.com/gophercloud/gophercloud"
+
+const (
+ rootPath = "lbaas"
+ resourcePath = "healthmonitors"
+)
+
+func rootURL(c *gophercloud.ServiceClient) string {
+ return c.ServiceURL(rootPath, resourcePath)
+}
+
+func resourceURL(c *gophercloud.ServiceClient, id string) string {
+ return c.ServiceURL(rootPath, resourcePath, id)
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/doc.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/doc.go
new file mode 100644
index 0000000000..5657cd8733
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/doc.go
@@ -0,0 +1,157 @@
+/*
+Package pools provides information and interaction with Pools and
+Members of the LBaaS v2 extension for the OpenStack Networking service.
+
+Example to List Pools
+
+ listOpts := pools.ListOpts{
+ LoadbalancerID: "c79a4468-d788-410c-bf79-9a8ef6354852",
+ }
+
+ allPages, err := pools.List(networkClient, listOpts).AllPages()
+ if err != nil {
+ panic(err)
+ }
+
+ allPools, err := pools.ExtractMonitors(allPages)
+ if err != nil {
+ panic(err)
+ }
+
+ for _, pools := range allPools {
+ fmt.Printf("%+v\n", pool)
+ }
+
+Example to Create a Pool
+
+ createOpts := pools.CreateOpts{
+ LBMethod: pools.LBMethodRoundRobin,
+ Protocol: "HTTP",
+ Name: "Example pool",
+ Tags: []string{"test"},
+ LoadbalancerID: "79e05663-7f03-45d2-a092-8b94062f22ab",
+ }
+
+ pool, err := pools.Create(networkClient, createOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Update a Pool
+
+ poolID := "d67d56a6-4a86-4688-a282-f46444705c64"
+
+ newTags := []string{"prod"}
+ updateOpts := pools.UpdateOpts{
+ Name: "new-name",
+ Tags: &newTags,
+ }
+
+ pool, err := pools.Update(networkClient, poolID, updateOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Delete a Pool
+
+ poolID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ err := pools.Delete(networkClient, poolID).ExtractErr()
+ if err != nil {
+ panic(err)
+ }
+
+Example to List Pool Members
+
+ poolID := "d67d56a6-4a86-4688-a282-f46444705c64"
+
+ listOpts := pools.ListMemberOpts{
+ ProtocolPort: 80,
+ }
+
+ allPages, err := pools.ListMembers(networkClient, poolID, listOpts).AllPages()
+ if err != nil {
+ panic(err)
+ }
+
+ allMembers, err := pools.ExtractMembers(allPages)
+ if err != nil {
+ panic(err)
+ }
+
+ for _, member := allMembers {
+ fmt.Printf("%+v\n", member)
+ }
+
+Example to Create a Member
+
+ poolID := "d67d56a6-4a86-4688-a282-f46444705c64"
+
+ weight := 10
+ createOpts := pools.CreateMemberOpts{
+ Name: "db",
+ SubnetID: "1981f108-3c48-48d2-b908-30f7d28532c9",
+ Address: "10.0.2.11",
+ ProtocolPort: 80,
+ Weight: &weight,
+ }
+
+ member, err := pools.CreateMember(networkClient, poolID, createOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Update a Member
+
+ poolID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ memberID := "64dba99f-8af8-4200-8882-e32a0660f23e"
+
+ weight := 4
+ updateOpts := pools.UpdateMemberOpts{
+ Name: "new-name",
+ Weight: &weight,
+ }
+
+ member, err := pools.UpdateMember(networkClient, poolID, memberID, updateOpts).Extract()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Delete a Member
+
+ poolID := "d67d56a6-4a86-4688-a282-f46444705c64"
+ memberID := "64dba99f-8af8-4200-8882-e32a0660f23e"
+
+ err := pools.DeleteMember(networkClient, poolID, memberID).ExtractErr()
+ if err != nil {
+ panic(err)
+ }
+
+Example to Update Members:
+
+ poolID := "d67d56a6-4a86-4688-a282-f46444705c64"
+
+ weight_1 := 20
+ member1 := pools.BatchUpdateMemberOpts{
+ Address: "192.0.2.16",
+ ProtocolPort: 80,
+ Name: "web-server-1",
+ SubnetID: "bbb35f84-35cc-4b2f-84c2-a6a29bba68aa",
+ Weight: &weight_1,
+ }
+
+ weight_2 := 10
+ member2 := pools.BatchUpdateMemberOpts{
+ Address: "192.0.2.17",
+ ProtocolPort: 80,
+ Name: "web-server-2",
+ Weight: &weight_2,
+ SubnetID: "bbb35f84-35cc-4b2f-84c2-a6a29bba68aa",
+ }
+ members := []pools.BatchUpdateMemberOpts{member1, member2}
+
+ err := pools.BatchUpdateMembers(networkClient, poolID, members).ExtractErr()
+ if err != nil {
+ panic(err)
+ }
+*/
+package pools
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/requests.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/requests.go
new file mode 100644
index 0000000000..69e6a2a763
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/requests.go
@@ -0,0 +1,499 @@
+package pools
+
+import (
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+// ListOptsBuilder allows extensions to add additional parameters to the
+// List request.
+type ListOptsBuilder interface {
+ ToPoolListQuery() (string, error)
+}
+
+// ListOpts allows the filtering and sorting of paginated collections through
+// the API. Filtering is achieved by passing in struct field values that map to
+// the Pool attributes you want to see returned. SortKey allows you to
+// sort by a particular Pool attribute. SortDir sets the direction, and is
+// either `asc' or `desc'. Marker and Limit are used for pagination.
+type ListOpts struct {
+ LBMethod string `q:"lb_algorithm"`
+ Protocol string `q:"protocol"`
+ ProjectID string `q:"project_id"`
+ AdminStateUp *bool `q:"admin_state_up"`
+ Name string `q:"name"`
+ ID string `q:"id"`
+ LoadbalancerID string `q:"loadbalancer_id"`
+ Limit int `q:"limit"`
+ Marker string `q:"marker"`
+ SortKey string `q:"sort_key"`
+ SortDir string `q:"sort_dir"`
+}
+
+// ToPoolListQuery formats a ListOpts into a query string.
+func (opts ListOpts) ToPoolListQuery() (string, error) {
+ q, err := gophercloud.BuildQueryString(opts)
+ return q.String(), err
+}
+
+// List returns a Pager which allows you to iterate over a collection of
+// pools. It accepts a ListOpts struct, which allows you to filter and sort
+// the returned collection for greater efficiency.
+//
+// Default policy settings return only those pools that are owned by the
+// project who submits the request, unless an admin user submits the request.
+func List(c *gophercloud.ServiceClient, opts ListOptsBuilder) pagination.Pager {
+ url := rootURL(c)
+ if opts != nil {
+ query, err := opts.ToPoolListQuery()
+ if err != nil {
+ return pagination.Pager{Err: err}
+ }
+ url += query
+ }
+ return pagination.NewPager(c, url, func(r pagination.PageResult) pagination.Page {
+ return PoolPage{pagination.LinkedPageBase{PageResult: r}}
+ })
+}
+
+type LBMethod string
+type Protocol string
+
+// Supported attributes for create/update operations.
+const (
+ LBMethodRoundRobin LBMethod = "ROUND_ROBIN"
+ LBMethodLeastConnections LBMethod = "LEAST_CONNECTIONS"
+ LBMethodSourceIp LBMethod = "SOURCE_IP"
+ LBMethodSourceIpPort LBMethod = "SOURCE_IP_PORT"
+
+ ProtocolTCP Protocol = "TCP"
+ ProtocolUDP Protocol = "UDP"
+ ProtocolPROXY Protocol = "PROXY"
+ ProtocolHTTP Protocol = "HTTP"
+ ProtocolHTTPS Protocol = "HTTPS"
+ // Protocol PROXYV2 requires octavia microversion 2.22
+ ProtocolPROXYV2 Protocol = "PROXYV2"
+ // Protocol SCTP requires octavia microversion 2.23
+ ProtocolSCTP Protocol = "SCTP"
+)
+
+// CreateOptsBuilder allows extensions to add additional parameters to the
+// Create request.
+type CreateOptsBuilder interface {
+ ToPoolCreateMap() (map[string]interface{}, error)
+}
+
+// CreateOpts is the common options struct used in this package's Create
+// operation.
+type CreateOpts struct {
+ // The algorithm used to distribute load between the members of the pool. The
+ // current specification supports LBMethodRoundRobin, LBMethodLeastConnections,
+ // LBMethodSourceIp and LBMethodSourceIpPort as valid values for this attribute.
+ LBMethod LBMethod `json:"lb_algorithm" required:"true"`
+
+ // The protocol used by the pool members, you can use either
+ // ProtocolTCP, ProtocolUDP, ProtocolPROXY, ProtocolHTTP, ProtocolHTTPS,
+ // ProtocolSCTP or ProtocolPROXYV2.
+ Protocol Protocol `json:"protocol" required:"true"`
+
+ // The Loadbalancer on which the members of the pool will be associated with.
+ // Note: one of LoadbalancerID or ListenerID must be provided.
+ LoadbalancerID string `json:"loadbalancer_id,omitempty"`
+
+ // The Listener on which the members of the pool will be associated with.
+ // Note: one of LoadbalancerID or ListenerID must be provided.
+ ListenerID string `json:"listener_id,omitempty"`
+
+ // ProjectID is the UUID of the project who owns the Pool.
+ // Only administrative users can specify a project UUID other than their own.
+ ProjectID string `json:"project_id,omitempty"`
+
+ // Name of the pool.
+ Name string `json:"name,omitempty"`
+
+ // Human-readable description for the pool.
+ Description string `json:"description,omitempty"`
+
+ // Persistence is the session persistence of the pool.
+ // Omit this field to prevent session persistence.
+ Persistence *SessionPersistence `json:"session_persistence,omitempty"`
+
+ // The administrative state of the Pool. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // Members is a slice of BatchUpdateMemberOpts which allows a set of
+ // members to be created at the same time the pool is created.
+ //
+ // This is only possible to use when creating a fully populated
+ // Loadbalancer.
+ Members []BatchUpdateMemberOpts `json:"members,omitempty"`
+
+ // Monitor is an instance of monitors.CreateOpts which allows a monitor
+ // to be created at the same time the pool is created.
+ //
+ // This is only possible to use when creating a fully populated
+ // Loadbalancer.
+ Monitor *monitors.CreateOpts `json:"healthmonitor,omitempty"`
+
+ // Tags is a set of resource tags. New in version 2.5
+ Tags []string `json:"tags,omitempty"`
+}
+
+// ToPoolCreateMap builds a request body from CreateOpts.
+func (opts CreateOpts) ToPoolCreateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "pool")
+}
+
+// Create accepts a CreateOpts struct and uses the values to create a new
+// load balancer pool.
+func Create(c *gophercloud.ServiceClient, opts CreateOptsBuilder) (r CreateResult) {
+ b, err := opts.ToPoolCreateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Post(rootURL(c), b, &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// Get retrieves a particular pool based on its unique ID.
+func Get(c *gophercloud.ServiceClient, id string) (r GetResult) {
+ resp, err := c.Get(resourceURL(c, id), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// UpdateOptsBuilder allows extensions to add additional parameters to the
+// Update request.
+type UpdateOptsBuilder interface {
+ ToPoolUpdateMap() (map[string]interface{}, error)
+}
+
+// UpdateOpts is the common options struct used in this package's Update
+// operation.
+type UpdateOpts struct {
+ // Name of the pool.
+ Name *string `json:"name,omitempty"`
+
+ // Human-readable description for the pool.
+ Description *string `json:"description,omitempty"`
+
+ // The algorithm used to distribute load between the members of the pool. The
+ // current specification supports LBMethodRoundRobin, LBMethodLeastConnections,
+ // LBMethodSourceIp and LBMethodSourceIpPort as valid values for this attribute.
+ LBMethod LBMethod `json:"lb_algorithm,omitempty"`
+
+ // The administrative state of the Pool. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // Persistence is the session persistence of the pool.
+ Persistence *SessionPersistence `json:"session_persistence,omitempty"`
+
+ // Tags is a set of resource tags. New in version 2.5
+ Tags *[]string `json:"tags,omitempty"`
+}
+
+// ToPoolUpdateMap builds a request body from UpdateOpts.
+func (opts UpdateOpts) ToPoolUpdateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "pool")
+}
+
+// Update allows pools to be updated.
+func Update(c *gophercloud.ServiceClient, id string, opts UpdateOptsBuilder) (r UpdateResult) {
+ b, err := opts.ToPoolUpdateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Put(resourceURL(c, id), b, &r.Body, &gophercloud.RequestOpts{
+ OkCodes: []int{200},
+ })
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// Delete will permanently delete a particular pool based on its unique ID.
+func Delete(c *gophercloud.ServiceClient, id string) (r DeleteResult) {
+ resp, err := c.Delete(resourceURL(c, id), nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// ListMemberOptsBuilder allows extensions to add additional parameters to the
+// ListMembers request.
+type ListMembersOptsBuilder interface {
+ ToMembersListQuery() (string, error)
+}
+
+// ListMembersOpts allows the filtering and sorting of paginated collections
+// through the API. Filtering is achieved by passing in struct field values
+// that map to the Member attributes you want to see returned. SortKey allows
+// you to sort by a particular Member attribute. SortDir sets the direction,
+// and is either `asc' or `desc'. Marker and Limit are used for pagination.
+type ListMembersOpts struct {
+ Name string `q:"name"`
+ Weight int `q:"weight"`
+ AdminStateUp *bool `q:"admin_state_up"`
+ ProjectID string `q:"project_id"`
+ Address string `q:"address"`
+ ProtocolPort int `q:"protocol_port"`
+ ID string `q:"id"`
+ Limit int `q:"limit"`
+ Marker string `q:"marker"`
+ SortKey string `q:"sort_key"`
+ SortDir string `q:"sort_dir"`
+}
+
+// ToMemberListQuery formats a ListOpts into a query string.
+func (opts ListMembersOpts) ToMembersListQuery() (string, error) {
+ q, err := gophercloud.BuildQueryString(opts)
+ return q.String(), err
+}
+
+// ListMembers returns a Pager which allows you to iterate over a collection of
+// members. It accepts a ListMembersOptsBuilder, which allows you to filter and
+// sort the returned collection for greater efficiency.
+//
+// Default policy settings return only those members that are owned by the
+// project who submits the request, unless an admin user submits the request.
+func ListMembers(c *gophercloud.ServiceClient, poolID string, opts ListMembersOptsBuilder) pagination.Pager {
+ url := memberRootURL(c, poolID)
+ if opts != nil {
+ query, err := opts.ToMembersListQuery()
+ if err != nil {
+ return pagination.Pager{Err: err}
+ }
+ url += query
+ }
+ return pagination.NewPager(c, url, func(r pagination.PageResult) pagination.Page {
+ return MemberPage{pagination.LinkedPageBase{PageResult: r}}
+ })
+}
+
+// CreateMemberOptsBuilder allows extensions to add additional parameters to the
+// CreateMember request.
+type CreateMemberOptsBuilder interface {
+ ToMemberCreateMap() (map[string]interface{}, error)
+}
+
+// CreateMemberOpts is the common options struct used in this package's CreateMember
+// operation.
+type CreateMemberOpts struct {
+ // The IP address of the member to receive traffic from the load balancer.
+ Address string `json:"address" required:"true"`
+
+ // The port on which to listen for client traffic.
+ ProtocolPort int `json:"protocol_port" required:"true"`
+
+ // Name of the Member.
+ Name string `json:"name,omitempty"`
+
+ // ProjectID is the UUID of the project who owns the Member.
+ // Only administrative users can specify a project UUID other than their own.
+ ProjectID string `json:"project_id,omitempty"`
+
+ // A positive integer value that indicates the relative portion of traffic
+ // that this member should receive from the pool. For example, a member with
+ // a weight of 10 receives five times as much traffic as a member with a
+ // weight of 2.
+ Weight *int `json:"weight,omitempty"`
+
+ // If you omit this parameter, LBaaS uses the vip_subnet_id parameter value
+ // for the subnet UUID.
+ SubnetID string `json:"subnet_id,omitempty"`
+
+ // The administrative state of the Pool. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // Is the member a backup? Backup members only receive traffic when all
+ // non-backup members are down.
+ // Requires microversion 2.1 or later.
+ Backup *bool `json:"backup,omitempty"`
+
+ // An alternate IP address used for health monitoring a backend member.
+ MonitorAddress string `json:"monitor_address,omitempty"`
+
+ // An alternate protocol port used for health monitoring a backend member.
+ MonitorPort *int `json:"monitor_port,omitempty"`
+
+ // A list of simple strings assigned to the resource.
+ // Requires microversion 2.5 or later.
+ Tags []string `json:"tags,omitempty"`
+}
+
+// ToMemberCreateMap builds a request body from CreateMemberOpts.
+func (opts CreateMemberOpts) ToMemberCreateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "member")
+}
+
+// CreateMember will create and associate a Member with a particular Pool.
+func CreateMember(c *gophercloud.ServiceClient, poolID string, opts CreateMemberOptsBuilder) (r CreateMemberResult) {
+ b, err := opts.ToMemberCreateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Post(memberRootURL(c, poolID), b, &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// GetMember retrieves a particular Pool Member based on its unique ID.
+func GetMember(c *gophercloud.ServiceClient, poolID string, memberID string) (r GetMemberResult) {
+ resp, err := c.Get(memberResourceURL(c, poolID, memberID), &r.Body, nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// UpdateMemberOptsBuilder allows extensions to add additional parameters to the
+// List request.
+type UpdateMemberOptsBuilder interface {
+ ToMemberUpdateMap() (map[string]interface{}, error)
+}
+
+// UpdateMemberOpts is the common options struct used in this package's Update
+// operation.
+type UpdateMemberOpts struct {
+ // Name of the Member.
+ Name *string `json:"name,omitempty"`
+
+ // A positive integer value that indicates the relative portion of traffic
+ // that this member should receive from the pool. For example, a member with
+ // a weight of 10 receives five times as much traffic as a member with a
+ // weight of 2.
+ Weight *int `json:"weight,omitempty"`
+
+ // The administrative state of the Pool. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // Is the member a backup? Backup members only receive traffic when all
+ // non-backup members are down.
+ // Requires microversion 2.1 or later.
+ Backup *bool `json:"backup,omitempty"`
+
+ // An alternate IP address used for health monitoring a backend member.
+ MonitorAddress *string `json:"monitor_address,omitempty"`
+
+ // An alternate protocol port used for health monitoring a backend member.
+ MonitorPort *int `json:"monitor_port,omitempty"`
+
+ // A list of simple strings assigned to the resource.
+ // Requires microversion 2.5 or later.
+ Tags []string `json:"tags,omitempty"`
+}
+
+// ToMemberUpdateMap builds a request body from UpdateMemberOpts.
+func (opts UpdateMemberOpts) ToMemberUpdateMap() (map[string]interface{}, error) {
+ return gophercloud.BuildRequestBody(opts, "member")
+}
+
+// Update allows Member to be updated.
+func UpdateMember(c *gophercloud.ServiceClient, poolID string, memberID string, opts UpdateMemberOptsBuilder) (r UpdateMemberResult) {
+ b, err := opts.ToMemberUpdateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ resp, err := c.Put(memberResourceURL(c, poolID, memberID), b, &r.Body, &gophercloud.RequestOpts{
+ OkCodes: []int{200, 201, 202},
+ })
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// BatchUpdateMemberOptsBuilder allows extensions to add additional parameters to the BatchUpdateMembers request.
+type BatchUpdateMemberOptsBuilder interface {
+ ToBatchMemberUpdateMap() (map[string]interface{}, error)
+}
+
+// BatchUpdateMemberOpts is the common options struct used in this package's BatchUpdateMembers
+// operation.
+type BatchUpdateMemberOpts struct {
+ // The IP address of the member to receive traffic from the load balancer.
+ Address string `json:"address" required:"true"`
+
+ // The port on which to listen for client traffic.
+ ProtocolPort int `json:"protocol_port" required:"true"`
+
+ // Name of the Member.
+ Name *string `json:"name,omitempty"`
+
+ // ProjectID is the UUID of the project who owns the Member.
+ // Only administrative users can specify a project UUID other than their own.
+ ProjectID string `json:"project_id,omitempty"`
+
+ // A positive integer value that indicates the relative portion of traffic
+ // that this member should receive from the pool. For example, a member with
+ // a weight of 10 receives five times as much traffic as a member with a
+ // weight of 2.
+ Weight *int `json:"weight,omitempty"`
+
+ // If you omit this parameter, LBaaS uses the vip_subnet_id parameter value
+ // for the subnet UUID.
+ SubnetID *string `json:"subnet_id,omitempty"`
+
+ // The administrative state of the Pool. A valid value is true (UP)
+ // or false (DOWN).
+ AdminStateUp *bool `json:"admin_state_up,omitempty"`
+
+ // Is the member a backup? Backup members only receive traffic when all
+ // non-backup members are down.
+ // Requires microversion 2.1 or later.
+ Backup *bool `json:"backup,omitempty"`
+
+ // An alternate IP address used for health monitoring a backend member.
+ MonitorAddress *string `json:"monitor_address,omitempty"`
+
+ // An alternate protocol port used for health monitoring a backend member.
+ MonitorPort *int `json:"monitor_port,omitempty"`
+
+ // A list of simple strings assigned to the resource.
+ // Requires microversion 2.5 or later.
+ Tags []string `json:"tags,omitempty"`
+}
+
+// ToBatchMemberUpdateMap builds a request body from BatchUpdateMemberOpts.
+func (opts BatchUpdateMemberOpts) ToBatchMemberUpdateMap() (map[string]interface{}, error) {
+ b, err := gophercloud.BuildRequestBody(opts, "")
+ if err != nil {
+ return nil, err
+ }
+
+ if b["subnet_id"] == "" {
+ b["subnet_id"] = nil
+ }
+
+ return b, nil
+}
+
+// BatchUpdateMembers updates the pool members in batch
+func BatchUpdateMembers(c *gophercloud.ServiceClient, poolID string, opts []BatchUpdateMemberOpts) (r UpdateMembersResult) {
+ members := []map[string]interface{}{}
+ for _, opt := range opts {
+ b, err := opt.ToBatchMemberUpdateMap()
+ if err != nil {
+ r.Err = err
+ return
+ }
+ members = append(members, b)
+ }
+
+ b := map[string]interface{}{"members": members}
+
+ resp, err := c.Put(memberRootURL(c, poolID), b, nil, &gophercloud.RequestOpts{OkCodes: []int{202}})
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
+
+// DeleteMember will remove and disassociate a Member from a particular Pool.
+func DeleteMember(c *gophercloud.ServiceClient, poolID string, memberID string) (r DeleteMemberResult) {
+ resp, err := c.Delete(memberResourceURL(c, poolID, memberID), nil)
+ _, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
+ return
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/results.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/results.go
new file mode 100644
index 0000000000..44379b6f38
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/results.go
@@ -0,0 +1,349 @@
+package pools
+
+import (
+ "encoding/json"
+ "time"
+
+ "github.com/gophercloud/gophercloud"
+ "github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors"
+ "github.com/gophercloud/gophercloud/pagination"
+)
+
+// SessionPersistence represents the session persistence feature of the load
+// balancing service. It attempts to force connections or requests in the same
+// session to be processed by the same member as long as it is ative. Three
+// types of persistence are supported:
+//
+// SOURCE_IP: With this mode, all connections originating from the same source
+//
+// IP address, will be handled by the same Member of the Pool.
+//
+// HTTP_COOKIE: With this persistence mode, the load balancing function will
+//
+// create a cookie on the first request from a client. Subsequent
+// requests containing the same cookie value will be handled by
+// the same Member of the Pool.
+//
+// APP_COOKIE: With this persistence mode, the load balancing function will
+//
+// rely on a cookie established by the backend application. All
+// requests carrying the same cookie value will be handled by the
+// same Member of the Pool.
+type SessionPersistence struct {
+ // The type of persistence mode.
+ Type string `json:"type"`
+
+ // Name of cookie if persistence mode is set appropriately.
+ CookieName string `json:"cookie_name,omitempty"`
+}
+
+// LoadBalancerID represents a load balancer.
+type LoadBalancerID struct {
+ ID string `json:"id"`
+}
+
+// ListenerID represents a listener.
+type ListenerID struct {
+ ID string `json:"id"`
+}
+
+// Pool represents a logical set of devices, such as web servers, that you
+// group together to receive and process traffic. The load balancing function
+// chooses a Member of the Pool according to the configured load balancing
+// method to handle the new requests or connections received on the VIP address.
+type Pool struct {
+ // The load-balancer algorithm, which is round-robin, least-connections, and
+ // so on. This value, which must be supported, is dependent on the provider.
+ // Round-robin must be supported.
+ LBMethod string `json:"lb_algorithm"`
+
+ // The protocol of the Pool, which is TCP, HTTP, or HTTPS.
+ Protocol string `json:"protocol"`
+
+ // Description for the Pool.
+ Description string `json:"description"`
+
+ // A list of listeners objects IDs.
+ Listeners []ListenerID `json:"listeners"` //[]map[string]interface{}
+
+ // A list of member objects IDs.
+ Members []Member `json:"members"`
+
+ // The ID of associated health monitor.
+ MonitorID string `json:"healthmonitor_id"`
+
+ // The network on which the members of the Pool will be located. Only members
+ // that are on this network can be added to the Pool.
+ SubnetID string `json:"subnet_id"`
+
+ // Owner of the Pool.
+ ProjectID string `json:"project_id"`
+
+ // The administrative state of the Pool, which is up (true) or down (false).
+ AdminStateUp bool `json:"admin_state_up"`
+
+ // Pool name. Does not have to be unique.
+ Name string `json:"name"`
+
+ // The unique ID for the Pool.
+ ID string `json:"id"`
+
+ // A list of load balancer objects IDs.
+ Loadbalancers []LoadBalancerID `json:"loadbalancers"`
+
+ // Indicates whether connections in the same session will be processed by the
+ // same Pool member or not.
+ Persistence SessionPersistence `json:"session_persistence"`
+
+ // The load balancer provider.
+ Provider string `json:"provider"`
+
+ // The Monitor associated with this Pool.
+ Monitor monitors.Monitor `json:"healthmonitor"`
+
+ // The provisioning status of the pool.
+ // This value is ACTIVE, PENDING_* or ERROR.
+ ProvisioningStatus string `json:"provisioning_status"`
+
+ // The operating status of the pool.
+ OperatingStatus string `json:"operating_status"`
+
+ // Tags is a list of resource tags. Tags are arbitrarily defined strings
+ // attached to the resource. New in version 2.5
+ Tags []string `json:"tags"`
+}
+
+// PoolPage is the page returned by a pager when traversing over a
+// collection of pools.
+type PoolPage struct {
+ pagination.LinkedPageBase
+}
+
+// NextPageURL is invoked when a paginated collection of pools has reached
+// the end of a page and the pager seeks to traverse over a new one. In order
+// to do this, it needs to construct the next page's URL.
+func (r PoolPage) NextPageURL() (string, error) {
+ var s struct {
+ Links []gophercloud.Link `json:"pools_links"`
+ }
+ err := r.ExtractInto(&s)
+ if err != nil {
+ return "", err
+ }
+ return gophercloud.ExtractNextURL(s.Links)
+}
+
+// IsEmpty checks whether a PoolPage struct is empty.
+func (r PoolPage) IsEmpty() (bool, error) {
+ if r.StatusCode == 204 {
+ return true, nil
+ }
+
+ is, err := ExtractPools(r)
+ return len(is) == 0, err
+}
+
+// ExtractPools accepts a Page struct, specifically a PoolPage struct,
+// and extracts the elements into a slice of Pool structs. In other words,
+// a generic collection is mapped into a relevant slice.
+func ExtractPools(r pagination.Page) ([]Pool, error) {
+ var s struct {
+ Pools []Pool `json:"pools"`
+ }
+ err := (r.(PoolPage)).ExtractInto(&s)
+ return s.Pools, err
+}
+
+type commonResult struct {
+ gophercloud.Result
+}
+
+// Extract is a function that accepts a result and extracts a pool.
+func (r commonResult) Extract() (*Pool, error) {
+ var s struct {
+ Pool *Pool `json:"pool"`
+ }
+ err := r.ExtractInto(&s)
+ return s.Pool, err
+}
+
+// CreateResult represents the result of a Create operation. Call its Extract
+// method to interpret the result as a Pool.
+type CreateResult struct {
+ commonResult
+}
+
+// GetResult represents the result of a Get operation. Call its Extract
+// method to interpret the result as a Pool.
+type GetResult struct {
+ commonResult
+}
+
+// UpdateResult represents the result of an Update operation. Call its Extract
+// method to interpret the result as a Pool.
+type UpdateResult struct {
+ commonResult
+}
+
+// DeleteResult represents the result of a Delete operation. Call its
+// ExtractErr method to determine if the request succeeded or failed.
+type DeleteResult struct {
+ gophercloud.ErrResult
+}
+
+// Member represents the application running on a backend server.
+type Member struct {
+ // Name of the Member.
+ Name string `json:"name"`
+
+ // Weight of Member.
+ Weight int `json:"weight"`
+
+ // The administrative state of the member, which is up (true) or down (false).
+ AdminStateUp bool `json:"admin_state_up"`
+
+ // Owner of the Member.
+ ProjectID string `json:"project_id"`
+
+ // Parameter value for the subnet UUID.
+ SubnetID string `json:"subnet_id"`
+
+ // The Pool to which the Member belongs.
+ PoolID string `json:"pool_id"`
+
+ // The IP address of the Member.
+ Address string `json:"address"`
+
+ // The port on which the application is hosted.
+ ProtocolPort int `json:"protocol_port"`
+
+ // The unique ID for the Member.
+ ID string `json:"id"`
+
+ // The provisioning status of the pool.
+ // This value is ACTIVE, PENDING_* or ERROR.
+ ProvisioningStatus string `json:"provisioning_status"`
+
+ // DateTime when the member was created
+ CreatedAt time.Time `json:"-"`
+
+ // DateTime when the member was updated
+ UpdatedAt time.Time `json:"-"`
+
+ // The operating status of the member
+ OperatingStatus string `json:"operating_status"`
+
+ // Is the member a backup? Backup members only receive traffic when all non-backup members are down.
+ Backup bool `json:"backup"`
+
+ // An alternate IP address used for health monitoring a backend member.
+ MonitorAddress string `json:"monitor_address"`
+
+ // An alternate protocol port used for health monitoring a backend member.
+ MonitorPort int `json:"monitor_port"`
+
+ // A list of simple strings assigned to the resource.
+ // Requires microversion 2.5 or later.
+ Tags []string `json:"tags"`
+}
+
+// MemberPage is the page returned by a pager when traversing over a
+// collection of Members in a Pool.
+type MemberPage struct {
+ pagination.LinkedPageBase
+}
+
+// NextPageURL is invoked when a paginated collection of members has reached
+// the end of a page and the pager seeks to traverse over a new one. In order
+// to do this, it needs to construct the next page's URL.
+func (r MemberPage) NextPageURL() (string, error) {
+ var s struct {
+ Links []gophercloud.Link `json:"members_links"`
+ }
+ err := r.ExtractInto(&s)
+ if err != nil {
+ return "", err
+ }
+ return gophercloud.ExtractNextURL(s.Links)
+}
+
+// IsEmpty checks whether a MemberPage struct is empty.
+func (r MemberPage) IsEmpty() (bool, error) {
+ if r.StatusCode == 204 {
+ return true, nil
+ }
+
+ is, err := ExtractMembers(r)
+ return len(is) == 0, err
+}
+
+// ExtractMembers accepts a Page struct, specifically a MemberPage struct,
+// and extracts the elements into a slice of Members structs. In other words,
+// a generic collection is mapped into a relevant slice.
+func ExtractMembers(r pagination.Page) ([]Member, error) {
+ var s struct {
+ Members []Member `json:"members"`
+ }
+ err := (r.(MemberPage)).ExtractInto(&s)
+ return s.Members, err
+}
+
+type commonMemberResult struct {
+ gophercloud.Result
+}
+
+func (r *Member) UnmarshalJSON(b []byte) error {
+ type tmp Member
+ var s struct {
+ tmp
+ CreatedAt gophercloud.JSONRFC3339NoZ `json:"created_at"`
+ UpdatedAt gophercloud.JSONRFC3339NoZ `json:"updated_at"`
+ }
+ err := json.Unmarshal(b, &s)
+ if err != nil {
+ return err
+ }
+ *r = Member(s.tmp)
+ r.CreatedAt = time.Time(s.CreatedAt)
+ r.UpdatedAt = time.Time(s.UpdatedAt)
+ return nil
+}
+
+// ExtractMember is a function that accepts a result and extracts a member.
+func (r commonMemberResult) Extract() (*Member, error) {
+ var s struct {
+ Member *Member `json:"member"`
+ }
+ err := r.ExtractInto(&s)
+ return s.Member, err
+}
+
+// CreateMemberResult represents the result of a CreateMember operation.
+// Call its Extract method to interpret it as a Member.
+type CreateMemberResult struct {
+ commonMemberResult
+}
+
+// GetMemberResult represents the result of a GetMember operation.
+// Call its Extract method to interpret it as a Member.
+type GetMemberResult struct {
+ commonMemberResult
+}
+
+// UpdateMemberResult represents the result of an UpdateMember operation.
+// Call its Extract method to interpret it as a Member.
+type UpdateMemberResult struct {
+ commonMemberResult
+}
+
+// UpdateMembersResult represents the result of an UpdateMembers operation.
+// Call its ExtractErr method to determine if the request succeeded or failed.
+type UpdateMembersResult struct {
+ gophercloud.ErrResult
+}
+
+// DeleteMemberResult represents the result of a DeleteMember operation.
+// Call its ExtractErr method to determine if the request succeeded or failed.
+type DeleteMemberResult struct {
+ gophercloud.ErrResult
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/urls.go b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/urls.go
new file mode 100644
index 0000000000..e7443c4f19
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/urls.go
@@ -0,0 +1,25 @@
+package pools
+
+import "github.com/gophercloud/gophercloud"
+
+const (
+ rootPath = "lbaas"
+ resourcePath = "pools"
+ memberPath = "members"
+)
+
+func rootURL(c *gophercloud.ServiceClient) string {
+ return c.ServiceURL(rootPath, resourcePath)
+}
+
+func resourceURL(c *gophercloud.ServiceClient, id string) string {
+ return c.ServiceURL(rootPath, resourcePath, id)
+}
+
+func memberRootURL(c *gophercloud.ServiceClient, poolId string) string {
+ return c.ServiceURL(rootPath, resourcePath, poolId, memberPath)
+}
+
+func memberResourceURL(c *gophercloud.ServiceClient, poolID string, memberID string) string {
+ return c.ServiceURL(rootPath, resourcePath, poolID, memberPath, memberID)
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/pagination/http.go b/vendor/github.com/gophercloud/gophercloud/pagination/http.go
new file mode 100644
index 0000000000..7845cda13b
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/pagination/http.go
@@ -0,0 +1,62 @@
+package pagination
+
+import (
+ "encoding/json"
+ "io/ioutil"
+ "net/http"
+ "net/url"
+ "strings"
+
+ "github.com/gophercloud/gophercloud"
+)
+
+// PageResult stores the HTTP response that returned the current page of results.
+type PageResult struct {
+ gophercloud.Result
+ url.URL
+}
+
+// PageResultFrom parses an HTTP response as JSON and returns a PageResult containing the
+// results, interpreting it as JSON if the content type indicates.
+func PageResultFrom(resp *http.Response) (PageResult, error) {
+ var parsedBody interface{}
+
+ defer resp.Body.Close()
+ rawBody, err := ioutil.ReadAll(resp.Body)
+ if err != nil {
+ return PageResult{}, err
+ }
+
+ if strings.HasPrefix(resp.Header.Get("Content-Type"), "application/json") {
+ err = json.Unmarshal(rawBody, &parsedBody)
+ if err != nil {
+ return PageResult{}, err
+ }
+ } else {
+ parsedBody = rawBody
+ }
+
+ return PageResultFromParsed(resp, parsedBody), err
+}
+
+// PageResultFromParsed constructs a PageResult from an HTTP response that has already had its
+// body parsed as JSON (and closed).
+func PageResultFromParsed(resp *http.Response, body interface{}) PageResult {
+ return PageResult{
+ Result: gophercloud.Result{
+ Body: body,
+ StatusCode: resp.StatusCode,
+ Header: resp.Header,
+ },
+ URL: *resp.Request.URL,
+ }
+}
+
+// Request performs an HTTP request and extracts the http.Response from the result.
+func Request(client *gophercloud.ServiceClient, headers map[string]string, url string) (*http.Response, error) {
+ return client.Get(url, nil, &gophercloud.RequestOpts{
+ MoreHeaders: headers,
+ OkCodes: []int{200, 204, 300},
+ KeepResponseBody: true,
+ })
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/pagination/linked.go b/vendor/github.com/gophercloud/gophercloud/pagination/linked.go
new file mode 100644
index 0000000000..a664e05673
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/pagination/linked.go
@@ -0,0 +1,92 @@
+package pagination
+
+import (
+ "fmt"
+ "reflect"
+
+ "github.com/gophercloud/gophercloud"
+)
+
+// LinkedPageBase may be embedded to implement a page that provides navigational "Next" and "Previous" links within its result.
+type LinkedPageBase struct {
+ PageResult
+
+ // LinkPath lists the keys that should be traversed within a response to arrive at the "next" pointer.
+ // If any link along the path is missing, an empty URL will be returned.
+ // If any link results in an unexpected value type, an error will be returned.
+ // When left as "nil", []string{"links", "next"} will be used as a default.
+ LinkPath []string
+}
+
+// NextPageURL extracts the pagination structure from a JSON response and returns the "next" link, if one is present.
+// It assumes that the links are available in a "links" element of the top-level response object.
+// If this is not the case, override NextPageURL on your result type.
+func (current LinkedPageBase) NextPageURL() (string, error) {
+ var path []string
+ var key string
+
+ if current.LinkPath == nil {
+ path = []string{"links", "next"}
+ } else {
+ path = current.LinkPath
+ }
+
+ submap, ok := current.Body.(map[string]interface{})
+ if !ok {
+ err := gophercloud.ErrUnexpectedType{}
+ err.Expected = "map[string]interface{}"
+ err.Actual = fmt.Sprintf("%v", reflect.TypeOf(current.Body))
+ return "", err
+ }
+
+ for {
+ key, path = path[0], path[1:]
+
+ value, ok := submap[key]
+ if !ok {
+ return "", nil
+ }
+
+ if len(path) > 0 {
+ submap, ok = value.(map[string]interface{})
+ if !ok {
+ err := gophercloud.ErrUnexpectedType{}
+ err.Expected = "map[string]interface{}"
+ err.Actual = fmt.Sprintf("%v", reflect.TypeOf(value))
+ return "", err
+ }
+ } else {
+ if value == nil {
+ // Actual null element.
+ return "", nil
+ }
+
+ url, ok := value.(string)
+ if !ok {
+ err := gophercloud.ErrUnexpectedType{}
+ err.Expected = "string"
+ err.Actual = fmt.Sprintf("%v", reflect.TypeOf(value))
+ return "", err
+ }
+
+ return url, nil
+ }
+ }
+}
+
+// IsEmpty satisifies the IsEmpty method of the Page interface
+func (current LinkedPageBase) IsEmpty() (bool, error) {
+ if b, ok := current.Body.([]interface{}); ok {
+ return len(b) == 0, nil
+ }
+ err := gophercloud.ErrUnexpectedType{}
+ err.Expected = "[]interface{}"
+ err.Actual = fmt.Sprintf("%v", reflect.TypeOf(current.Body))
+ return true, err
+}
+
+// GetBody returns the linked page's body. This method is needed to satisfy the
+// Page interface.
+func (current LinkedPageBase) GetBody() interface{} {
+ return current.Body
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/pagination/marker.go b/vendor/github.com/gophercloud/gophercloud/pagination/marker.go
new file mode 100644
index 0000000000..52e53bae85
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/pagination/marker.go
@@ -0,0 +1,58 @@
+package pagination
+
+import (
+ "fmt"
+ "reflect"
+
+ "github.com/gophercloud/gophercloud"
+)
+
+// MarkerPage is a stricter Page interface that describes additional functionality required for use with NewMarkerPager.
+// For convenience, embed the MarkedPageBase struct.
+type MarkerPage interface {
+ Page
+
+ // LastMarker returns the last "marker" value on this page.
+ LastMarker() (string, error)
+}
+
+// MarkerPageBase is a page in a collection that's paginated by "limit" and "marker" query parameters.
+type MarkerPageBase struct {
+ PageResult
+
+ // Owner is a reference to the embedding struct.
+ Owner MarkerPage
+}
+
+// NextPageURL generates the URL for the page of results after this one.
+func (current MarkerPageBase) NextPageURL() (string, error) {
+ currentURL := current.URL
+
+ mark, err := current.Owner.LastMarker()
+ if err != nil {
+ return "", err
+ }
+
+ q := currentURL.Query()
+ q.Set("marker", mark)
+ currentURL.RawQuery = q.Encode()
+
+ return currentURL.String(), nil
+}
+
+// IsEmpty satisifies the IsEmpty method of the Page interface
+func (current MarkerPageBase) IsEmpty() (bool, error) {
+ if b, ok := current.Body.([]interface{}); ok {
+ return len(b) == 0, nil
+ }
+ err := gophercloud.ErrUnexpectedType{}
+ err.Expected = "[]interface{}"
+ err.Actual = fmt.Sprintf("%v", reflect.TypeOf(current.Body))
+ return true, err
+}
+
+// GetBody returns the linked page's body. This method is needed to satisfy the
+// Page interface.
+func (current MarkerPageBase) GetBody() interface{} {
+ return current.Body
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/pagination/pager.go b/vendor/github.com/gophercloud/gophercloud/pagination/pager.go
new file mode 100644
index 0000000000..1dec2703eb
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/pagination/pager.go
@@ -0,0 +1,254 @@
+package pagination
+
+import (
+ "errors"
+ "fmt"
+ "net/http"
+ "reflect"
+ "strings"
+
+ "github.com/gophercloud/gophercloud"
+)
+
+var (
+ // ErrPageNotAvailable is returned from a Pager when a next or previous page is requested, but does not exist.
+ ErrPageNotAvailable = errors.New("The requested page does not exist.")
+)
+
+// Page must be satisfied by the result type of any resource collection.
+// It allows clients to interact with the resource uniformly, regardless of whether or not or how it's paginated.
+// Generally, rather than implementing this interface directly, implementors should embed one of the concrete PageBase structs,
+// instead.
+// Depending on the pagination strategy of a particular resource, there may be an additional subinterface that the result type
+// will need to implement.
+type Page interface {
+ // NextPageURL generates the URL for the page of data that follows this collection.
+ // Return "" if no such page exists.
+ NextPageURL() (string, error)
+
+ // IsEmpty returns true if this Page has no items in it.
+ IsEmpty() (bool, error)
+
+ // GetBody returns the Page Body. This is used in the `AllPages` method.
+ GetBody() interface{}
+}
+
+// Pager knows how to advance through a specific resource collection, one page at a time.
+type Pager struct {
+ client *gophercloud.ServiceClient
+
+ initialURL string
+
+ createPage func(r PageResult) Page
+
+ firstPage Page
+
+ Err error
+
+ // Headers supplies additional HTTP headers to populate on each paged request.
+ Headers map[string]string
+}
+
+// NewPager constructs a manually-configured pager.
+// Supply the URL for the first page, a function that requests a specific page given a URL, and a function that counts a page.
+func NewPager(client *gophercloud.ServiceClient, initialURL string, createPage func(r PageResult) Page) Pager {
+ return Pager{
+ client: client,
+ initialURL: initialURL,
+ createPage: createPage,
+ }
+}
+
+// WithPageCreator returns a new Pager that substitutes a different page creation function. This is
+// useful for overriding List functions in delegation.
+func (p Pager) WithPageCreator(createPage func(r PageResult) Page) Pager {
+ return Pager{
+ client: p.client,
+ initialURL: p.initialURL,
+ createPage: createPage,
+ }
+}
+
+func (p Pager) fetchNextPage(url string) (Page, error) {
+ resp, err := Request(p.client, p.Headers, url)
+ if err != nil {
+ return nil, err
+ }
+
+ remembered, err := PageResultFrom(resp)
+ if err != nil {
+ return nil, err
+ }
+
+ return p.createPage(remembered), nil
+}
+
+// EachPage iterates over each page returned by a Pager, yielding one at a time to a handler function.
+// Return "false" from the handler to prematurely stop iterating.
+func (p Pager) EachPage(handler func(Page) (bool, error)) error {
+ if p.Err != nil {
+ return p.Err
+ }
+ currentURL := p.initialURL
+ for {
+ var currentPage Page
+
+ // if first page has already been fetched, no need to fetch it again
+ if p.firstPage != nil {
+ currentPage = p.firstPage
+ p.firstPage = nil
+ } else {
+ var err error
+ currentPage, err = p.fetchNextPage(currentURL)
+ if err != nil {
+ return err
+ }
+ }
+
+ empty, err := currentPage.IsEmpty()
+ if err != nil {
+ return err
+ }
+ if empty {
+ return nil
+ }
+
+ ok, err := handler(currentPage)
+ if err != nil {
+ return err
+ }
+ if !ok {
+ return nil
+ }
+
+ currentURL, err = currentPage.NextPageURL()
+ if err != nil {
+ return err
+ }
+ if currentURL == "" {
+ return nil
+ }
+ }
+}
+
+// AllPages returns all the pages from a `List` operation in a single page,
+// allowing the user to retrieve all the pages at once.
+func (p Pager) AllPages() (Page, error) {
+ if p.Err != nil {
+ return nil, p.Err
+ }
+ // pagesSlice holds all the pages until they get converted into as Page Body.
+ var pagesSlice []interface{}
+ // body will contain the final concatenated Page body.
+ var body reflect.Value
+
+ // Grab a first page to ascertain the page body type.
+ firstPage, err := p.fetchNextPage(p.initialURL)
+ if err != nil {
+ return nil, err
+ }
+ // Store the page type so we can use reflection to create a new mega-page of
+ // that type.
+ pageType := reflect.TypeOf(firstPage)
+
+ // if it's a single page, just return the firstPage (first page)
+ if _, found := pageType.FieldByName("SinglePageBase"); found {
+ return firstPage, nil
+ }
+
+ // store the first page to avoid getting it twice
+ p.firstPage = firstPage
+
+ // Switch on the page body type. Recognized types are `map[string]interface{}`,
+ // `[]byte`, and `[]interface{}`.
+ switch pb := firstPage.GetBody().(type) {
+ case map[string]interface{}:
+ // key is the map key for the page body if the body type is `map[string]interface{}`.
+ var key string
+ // Iterate over the pages to concatenate the bodies.
+ err = p.EachPage(func(page Page) (bool, error) {
+ b := page.GetBody().(map[string]interface{})
+ for k, v := range b {
+ // If it's a linked page, we don't want the `links`, we want the other one.
+ if !strings.HasSuffix(k, "links") {
+ // check the field's type. we only want []interface{} (which is really []map[string]interface{})
+ switch vt := v.(type) {
+ case []interface{}:
+ key = k
+ pagesSlice = append(pagesSlice, vt...)
+ }
+ }
+ }
+ return true, nil
+ })
+ if err != nil {
+ return nil, err
+ }
+ // Set body to value of type `map[string]interface{}`
+ body = reflect.MakeMap(reflect.MapOf(reflect.TypeOf(key), reflect.TypeOf(pagesSlice)))
+ body.SetMapIndex(reflect.ValueOf(key), reflect.ValueOf(pagesSlice))
+ case []byte:
+ // Iterate over the pages to concatenate the bodies.
+ err = p.EachPage(func(page Page) (bool, error) {
+ b := page.GetBody().([]byte)
+ pagesSlice = append(pagesSlice, b)
+ // seperate pages with a comma
+ pagesSlice = append(pagesSlice, []byte{10})
+ return true, nil
+ })
+ if err != nil {
+ return nil, err
+ }
+ if len(pagesSlice) > 0 {
+ // Remove the trailing comma.
+ pagesSlice = pagesSlice[:len(pagesSlice)-1]
+ }
+ var b []byte
+ // Combine the slice of slices in to a single slice.
+ for _, slice := range pagesSlice {
+ b = append(b, slice.([]byte)...)
+ }
+ // Set body to value of type `bytes`.
+ body = reflect.New(reflect.TypeOf(b)).Elem()
+ body.SetBytes(b)
+ case []interface{}:
+ // Iterate over the pages to concatenate the bodies.
+ err = p.EachPage(func(page Page) (bool, error) {
+ b := page.GetBody().([]interface{})
+ pagesSlice = append(pagesSlice, b...)
+ return true, nil
+ })
+ if err != nil {
+ return nil, err
+ }
+ // Set body to value of type `[]interface{}`
+ body = reflect.MakeSlice(reflect.TypeOf(pagesSlice), len(pagesSlice), len(pagesSlice))
+ for i, s := range pagesSlice {
+ body.Index(i).Set(reflect.ValueOf(s))
+ }
+ default:
+ err := gophercloud.ErrUnexpectedType{}
+ err.Expected = "map[string]interface{}/[]byte/[]interface{}"
+ err.Actual = fmt.Sprintf("%T", pb)
+ return nil, err
+ }
+
+ // Each `Extract*` function is expecting a specific type of page coming back,
+ // otherwise the type assertion in those functions will fail. pageType is needed
+ // to create a type in this method that has the same type that the `Extract*`
+ // function is expecting and set the Body of that object to the concatenated
+ // pages.
+ page := reflect.New(pageType)
+ // Set the page body to be the concatenated pages.
+ page.Elem().FieldByName("Body").Set(body)
+ // Set any additional headers that were pass along. The `objectstorage` pacakge,
+ // for example, passes a Content-Type header.
+ h := make(http.Header)
+ for k, v := range p.Headers {
+ h.Add(k, v)
+ }
+ page.Elem().FieldByName("Header").Set(reflect.ValueOf(h))
+ // Type assert the page to a Page interface so that the type assertion in the
+ // `Extract*` methods will work.
+ return page.Elem().Interface().(Page), err
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/pagination/pkg.go b/vendor/github.com/gophercloud/gophercloud/pagination/pkg.go
new file mode 100644
index 0000000000..912daea364
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/pagination/pkg.go
@@ -0,0 +1,4 @@
+/*
+Package pagination contains utilities and convenience structs that implement common pagination idioms within OpenStack APIs.
+*/
+package pagination
diff --git a/vendor/github.com/gophercloud/gophercloud/pagination/single.go b/vendor/github.com/gophercloud/gophercloud/pagination/single.go
new file mode 100644
index 0000000000..4251d6491e
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/pagination/single.go
@@ -0,0 +1,33 @@
+package pagination
+
+import (
+ "fmt"
+ "reflect"
+
+ "github.com/gophercloud/gophercloud"
+)
+
+// SinglePageBase may be embedded in a Page that contains all of the results from an operation at once.
+type SinglePageBase PageResult
+
+// NextPageURL always returns "" to indicate that there are no more pages to return.
+func (current SinglePageBase) NextPageURL() (string, error) {
+ return "", nil
+}
+
+// IsEmpty satisifies the IsEmpty method of the Page interface
+func (current SinglePageBase) IsEmpty() (bool, error) {
+ if b, ok := current.Body.([]interface{}); ok {
+ return len(b) == 0, nil
+ }
+ err := gophercloud.ErrUnexpectedType{}
+ err.Expected = "[]interface{}"
+ err.Actual = fmt.Sprintf("%v", reflect.TypeOf(current.Body))
+ return true, err
+}
+
+// GetBody returns the single page's body. This method is needed to satisfy the
+// Page interface.
+func (current SinglePageBase) GetBody() interface{} {
+ return current.Body
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/params.go b/vendor/github.com/gophercloud/gophercloud/params.go
new file mode 100644
index 0000000000..5abc2c5589
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/params.go
@@ -0,0 +1,509 @@
+package gophercloud
+
+import (
+ "encoding/json"
+ "fmt"
+ "net/url"
+ "reflect"
+ "strconv"
+ "strings"
+ "time"
+)
+
+/*
+BuildRequestBody builds a map[string]interface from the given `struct`. If
+parent is not an empty string, the final map[string]interface returned will
+encapsulate the built one. For example:
+
+ disk := 1
+ createOpts := flavors.CreateOpts{
+ ID: "1",
+ Name: "m1.tiny",
+ Disk: &disk,
+ RAM: 512,
+ VCPUs: 1,
+ RxTxFactor: 1.0,
+ }
+
+ body, err := gophercloud.BuildRequestBody(createOpts, "flavor")
+
+The above example can be run as-is, however it is recommended to look at how
+BuildRequestBody is used within Gophercloud to more fully understand how it
+fits within the request process as a whole rather than use it directly as shown
+above.
+*/
+func BuildRequestBody(opts interface{}, parent string) (map[string]interface{}, error) {
+ optsValue := reflect.ValueOf(opts)
+ if optsValue.Kind() == reflect.Ptr {
+ optsValue = optsValue.Elem()
+ }
+
+ optsType := reflect.TypeOf(opts)
+ if optsType.Kind() == reflect.Ptr {
+ optsType = optsType.Elem()
+ }
+
+ optsMap := make(map[string]interface{})
+ if optsValue.Kind() == reflect.Struct {
+ //fmt.Printf("optsValue.Kind() is a reflect.Struct: %+v\n", optsValue.Kind())
+ for i := 0; i < optsValue.NumField(); i++ {
+ v := optsValue.Field(i)
+ f := optsType.Field(i)
+
+ if f.Name != strings.Title(f.Name) {
+ //fmt.Printf("Skipping field: %s...\n", f.Name)
+ continue
+ }
+
+ //fmt.Printf("Starting on field: %s...\n", f.Name)
+
+ zero := isZero(v)
+ //fmt.Printf("v is zero?: %v\n", zero)
+
+ // if the field has a required tag that's set to "true"
+ if requiredTag := f.Tag.Get("required"); requiredTag == "true" {
+ //fmt.Printf("Checking required field [%s]:\n\tv: %+v\n\tisZero:%v\n", f.Name, v.Interface(), zero)
+ // if the field's value is zero, return a missing-argument error
+ if zero {
+ // if the field has a 'required' tag, it can't have a zero-value
+ err := ErrMissingInput{}
+ err.Argument = f.Name
+ return nil, err
+ }
+ }
+
+ if xorTag := f.Tag.Get("xor"); xorTag != "" {
+ //fmt.Printf("Checking `xor` tag for field [%s] with value %+v:\n\txorTag: %s\n", f.Name, v, xorTag)
+ xorField := optsValue.FieldByName(xorTag)
+ var xorFieldIsZero bool
+ if reflect.ValueOf(xorField.Interface()) == reflect.Zero(xorField.Type()) {
+ xorFieldIsZero = true
+ } else {
+ if xorField.Kind() == reflect.Ptr {
+ xorField = xorField.Elem()
+ }
+ xorFieldIsZero = isZero(xorField)
+ }
+ if !(zero != xorFieldIsZero) {
+ err := ErrMissingInput{}
+ err.Argument = fmt.Sprintf("%s/%s", f.Name, xorTag)
+ err.Info = fmt.Sprintf("Exactly one of %s and %s must be provided", f.Name, xorTag)
+ return nil, err
+ }
+ }
+
+ if orTag := f.Tag.Get("or"); orTag != "" {
+ //fmt.Printf("Checking `or` tag for field with:\n\tname: %+v\n\torTag:%s\n", f.Name, orTag)
+ //fmt.Printf("field is zero?: %v\n", zero)
+ if zero {
+ orField := optsValue.FieldByName(orTag)
+ var orFieldIsZero bool
+ if reflect.ValueOf(orField.Interface()) == reflect.Zero(orField.Type()) {
+ orFieldIsZero = true
+ } else {
+ if orField.Kind() == reflect.Ptr {
+ orField = orField.Elem()
+ }
+ orFieldIsZero = isZero(orField)
+ }
+ if orFieldIsZero {
+ err := ErrMissingInput{}
+ err.Argument = fmt.Sprintf("%s/%s", f.Name, orTag)
+ err.Info = fmt.Sprintf("At least one of %s and %s must be provided", f.Name, orTag)
+ return nil, err
+ }
+ }
+ }
+
+ jsonTag := f.Tag.Get("json")
+ if jsonTag == "-" {
+ continue
+ }
+
+ if v.Kind() == reflect.Slice || (v.Kind() == reflect.Ptr && v.Elem().Kind() == reflect.Slice) {
+ sliceValue := v
+ if sliceValue.Kind() == reflect.Ptr {
+ sliceValue = sliceValue.Elem()
+ }
+
+ for i := 0; i < sliceValue.Len(); i++ {
+ element := sliceValue.Index(i)
+ if element.Kind() == reflect.Struct || (element.Kind() == reflect.Ptr && element.Elem().Kind() == reflect.Struct) {
+ _, err := BuildRequestBody(element.Interface(), "")
+ if err != nil {
+ return nil, err
+ }
+ }
+ }
+ }
+ if v.Kind() == reflect.Struct || (v.Kind() == reflect.Ptr && v.Elem().Kind() == reflect.Struct) {
+ if zero {
+ //fmt.Printf("value before change: %+v\n", optsValue.Field(i))
+ if jsonTag != "" {
+ jsonTagPieces := strings.Split(jsonTag, ",")
+ if len(jsonTagPieces) > 1 && jsonTagPieces[1] == "omitempty" {
+ if v.CanSet() {
+ if !v.IsNil() {
+ if v.Kind() == reflect.Ptr {
+ v.Set(reflect.Zero(v.Type()))
+ }
+ }
+ //fmt.Printf("value after change: %+v\n", optsValue.Field(i))
+ }
+ }
+ }
+ continue
+ }
+
+ //fmt.Printf("Calling BuildRequestBody with:\n\tv: %+v\n\tf.Name:%s\n", v.Interface(), f.Name)
+ _, err := BuildRequestBody(v.Interface(), f.Name)
+ if err != nil {
+ return nil, err
+ }
+ }
+ }
+
+ //fmt.Printf("opts: %+v \n", opts)
+
+ b, err := json.Marshal(opts)
+ if err != nil {
+ return nil, err
+ }
+
+ //fmt.Printf("string(b): %s\n", string(b))
+
+ err = json.Unmarshal(b, &optsMap)
+ if err != nil {
+ return nil, err
+ }
+
+ //fmt.Printf("optsMap: %+v\n", optsMap)
+
+ if parent != "" {
+ optsMap = map[string]interface{}{parent: optsMap}
+ }
+ //fmt.Printf("optsMap after parent added: %+v\n", optsMap)
+ return optsMap, nil
+ }
+ // Return an error if the underlying type of 'opts' isn't a struct.
+ return nil, fmt.Errorf("Options type is not a struct.")
+}
+
+// EnabledState is a convenience type, mostly used in Create and Update
+// operations. Because the zero value of a bool is FALSE, we need to use a
+// pointer instead to indicate zero-ness.
+type EnabledState *bool
+
+// Convenience vars for EnabledState values.
+var (
+ iTrue = true
+ iFalse = false
+
+ Enabled EnabledState = &iTrue
+ Disabled EnabledState = &iFalse
+)
+
+// IPVersion is a type for the possible IP address versions. Valid instances
+// are IPv4 and IPv6
+type IPVersion int
+
+const (
+ // IPv4 is used for IP version 4 addresses
+ IPv4 IPVersion = 4
+ // IPv6 is used for IP version 6 addresses
+ IPv6 IPVersion = 6
+)
+
+// IntToPointer is a function for converting integers into integer pointers.
+// This is useful when passing in options to operations.
+func IntToPointer(i int) *int {
+ return &i
+}
+
+/*
+MaybeString is an internal function to be used by request methods in individual
+resource packages.
+
+It takes a string that might be a zero value and returns either a pointer to its
+address or nil. This is useful for allowing users to conveniently omit values
+from an options struct by leaving them zeroed, but still pass nil to the JSON
+serializer so they'll be omitted from the request body.
+*/
+func MaybeString(original string) *string {
+ if original != "" {
+ return &original
+ }
+ return nil
+}
+
+/*
+MaybeInt is an internal function to be used by request methods in individual
+resource packages.
+
+Like MaybeString, it accepts an int that may or may not be a zero value, and
+returns either a pointer to its address or nil. It's intended to hint that the
+JSON serializer should omit its field.
+*/
+func MaybeInt(original int) *int {
+ if original != 0 {
+ return &original
+ }
+ return nil
+}
+
+/*
+func isUnderlyingStructZero(v reflect.Value) bool {
+ switch v.Kind() {
+ case reflect.Ptr:
+ return isUnderlyingStructZero(v.Elem())
+ default:
+ return isZero(v)
+ }
+}
+*/
+
+var t time.Time
+
+func isZero(v reflect.Value) bool {
+ //fmt.Printf("\n\nchecking isZero for value: %+v\n", v)
+ switch v.Kind() {
+ case reflect.Ptr:
+ if v.IsNil() {
+ return true
+ }
+ return false
+ case reflect.Func, reflect.Map, reflect.Slice:
+ return v.IsNil()
+ case reflect.Array:
+ z := true
+ for i := 0; i < v.Len(); i++ {
+ z = z && isZero(v.Index(i))
+ }
+ return z
+ case reflect.Struct:
+ if v.Type() == reflect.TypeOf(t) {
+ if v.Interface().(time.Time).IsZero() {
+ return true
+ }
+ return false
+ }
+ z := true
+ for i := 0; i < v.NumField(); i++ {
+ z = z && isZero(v.Field(i))
+ }
+ return z
+ }
+ // Compare other types directly:
+ z := reflect.Zero(v.Type())
+ //fmt.Printf("zero type for value: %+v\n\n\n", z)
+ return v.Interface() == z.Interface()
+}
+
+/*
+BuildQueryString is an internal function to be used by request methods in
+individual resource packages.
+
+It accepts a tagged structure and expands it into a URL struct. Field names are
+converted into query parameters based on a "q" tag. For example:
+
+ type struct Something {
+ Bar string `q:"x_bar"`
+ Baz int `q:"lorem_ipsum"`
+ }
+
+ instance := Something{
+ Bar: "AAA",
+ Baz: "BBB",
+ }
+
+will be converted into "?x_bar=AAA&lorem_ipsum=BBB".
+
+The struct's fields may be strings, integers, slices, or boolean values. Fields
+left at their type's zero value will be omitted from the query.
+
+Slice are handled in one of two ways:
+
+ type struct Something {
+ Bar []string `q:"bar"` // E.g. ?bar=1&bar=2
+ Baz []int `q:"baz" format="comma-separated"` // E.g. ?baz=1,2
+ }
+*/
+func BuildQueryString(opts interface{}) (*url.URL, error) {
+ optsValue := reflect.ValueOf(opts)
+ if optsValue.Kind() == reflect.Ptr {
+ optsValue = optsValue.Elem()
+ }
+
+ optsType := reflect.TypeOf(opts)
+ if optsType.Kind() == reflect.Ptr {
+ optsType = optsType.Elem()
+ }
+
+ params := url.Values{}
+
+ if optsValue.Kind() == reflect.Struct {
+ for i := 0; i < optsValue.NumField(); i++ {
+ v := optsValue.Field(i)
+ f := optsType.Field(i)
+ qTag := f.Tag.Get("q")
+
+ // if the field has a 'q' tag, it goes in the query string
+ if qTag != "" {
+ tags := strings.Split(qTag, ",")
+
+ // if the field is set, add it to the slice of query pieces
+ if !isZero(v) {
+ loop:
+ switch v.Kind() {
+ case reflect.Ptr:
+ v = v.Elem()
+ goto loop
+ case reflect.String:
+ params.Add(tags[0], v.String())
+ case reflect.Int:
+ params.Add(tags[0], strconv.FormatInt(v.Int(), 10))
+ case reflect.Bool:
+ params.Add(tags[0], strconv.FormatBool(v.Bool()))
+ case reflect.Slice:
+ var values []string
+ switch v.Type().Elem() {
+ case reflect.TypeOf(0):
+ for i := 0; i < v.Len(); i++ {
+ values = append(values, strconv.FormatInt(v.Index(i).Int(), 10))
+ }
+ default:
+ for i := 0; i < v.Len(); i++ {
+ values = append(values, v.Index(i).String())
+ }
+ }
+ if sliceFormat := f.Tag.Get("format"); sliceFormat == "comma-separated" {
+ params.Add(tags[0], strings.Join(values, ","))
+ } else {
+ params[tags[0]] = append(params[tags[0]], values...)
+ }
+ case reflect.Map:
+ if v.Type().Key().Kind() == reflect.String && v.Type().Elem().Kind() == reflect.String {
+ var s []string
+ for _, k := range v.MapKeys() {
+ value := v.MapIndex(k).String()
+ s = append(s, fmt.Sprintf("'%s':'%s'", k.String(), value))
+ }
+ params.Add(tags[0], fmt.Sprintf("{%s}", strings.Join(s, ", ")))
+ }
+ }
+ } else {
+ // if the field has a 'required' tag, it can't have a zero-value
+ if requiredTag := f.Tag.Get("required"); requiredTag == "true" {
+ return &url.URL{}, fmt.Errorf("Required query parameter [%s] not set.", f.Name)
+ }
+ }
+ }
+ }
+
+ return &url.URL{RawQuery: params.Encode()}, nil
+ }
+ // Return an error if the underlying type of 'opts' isn't a struct.
+ return nil, fmt.Errorf("Options type is not a struct.")
+}
+
+/*
+BuildHeaders is an internal function to be used by request methods in
+individual resource packages.
+
+It accepts an arbitrary tagged structure and produces a string map that's
+suitable for use as the HTTP headers of an outgoing request. Field names are
+mapped to header names based in "h" tags.
+
+ type struct Something {
+ Bar string `h:"x_bar"`
+ Baz int `h:"lorem_ipsum"`
+ }
+
+ instance := Something{
+ Bar: "AAA",
+ Baz: "BBB",
+ }
+
+will be converted into:
+
+ map[string]string{
+ "x_bar": "AAA",
+ "lorem_ipsum": "BBB",
+ }
+
+Untagged fields and fields left at their zero values are skipped. Integers,
+booleans and string values are supported.
+*/
+func BuildHeaders(opts interface{}) (map[string]string, error) {
+ optsValue := reflect.ValueOf(opts)
+ if optsValue.Kind() == reflect.Ptr {
+ optsValue = optsValue.Elem()
+ }
+
+ optsType := reflect.TypeOf(opts)
+ if optsType.Kind() == reflect.Ptr {
+ optsType = optsType.Elem()
+ }
+
+ optsMap := make(map[string]string)
+ if optsValue.Kind() == reflect.Struct {
+ for i := 0; i < optsValue.NumField(); i++ {
+ v := optsValue.Field(i)
+ f := optsType.Field(i)
+ hTag := f.Tag.Get("h")
+
+ // if the field has a 'h' tag, it goes in the header
+ if hTag != "" {
+ tags := strings.Split(hTag, ",")
+
+ // if the field is set, add it to the slice of query pieces
+ if !isZero(v) {
+ if v.Kind() == reflect.Ptr {
+ v = v.Elem()
+ }
+ switch v.Kind() {
+ case reflect.String:
+ optsMap[tags[0]] = v.String()
+ case reflect.Int:
+ optsMap[tags[0]] = strconv.FormatInt(v.Int(), 10)
+ case reflect.Int64:
+ optsMap[tags[0]] = strconv.FormatInt(v.Int(), 10)
+ case reflect.Bool:
+ optsMap[tags[0]] = strconv.FormatBool(v.Bool())
+ }
+ } else {
+ // if the field has a 'required' tag, it can't have a zero-value
+ if requiredTag := f.Tag.Get("required"); requiredTag == "true" {
+ return optsMap, fmt.Errorf("Required header [%s] not set.", f.Name)
+ }
+ }
+ }
+
+ }
+ return optsMap, nil
+ }
+ // Return an error if the underlying type of 'opts' isn't a struct.
+ return optsMap, fmt.Errorf("Options type is not a struct.")
+}
+
+// IDSliceToQueryString takes a slice of elements and converts them into a query
+// string. For example, if name=foo and slice=[]int{20, 40, 60}, then the
+// result would be `?name=20&name=40&name=60'
+func IDSliceToQueryString(name string, ids []int) string {
+ str := ""
+ for k, v := range ids {
+ if k == 0 {
+ str += "?"
+ } else {
+ str += "&"
+ }
+ str += fmt.Sprintf("%s=%s", name, strconv.Itoa(v))
+ }
+ return str
+}
+
+// IntWithinRange returns TRUE if an integer falls within a defined range, and
+// FALSE if not.
+func IntWithinRange(val, min, max int) bool {
+ return val > min && val < max
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/provider_client.go b/vendor/github.com/gophercloud/gophercloud/provider_client.go
new file mode 100644
index 0000000000..7e25882c87
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/provider_client.go
@@ -0,0 +1,652 @@
+package gophercloud
+
+import (
+ "bytes"
+ "context"
+ "encoding/json"
+ "errors"
+ "io"
+ "io/ioutil"
+ "net/http"
+ "strings"
+ "sync"
+)
+
+// DefaultUserAgent is the default User-Agent string set in the request header.
+const (
+ DefaultUserAgent = "gophercloud/v1.14.1"
+ DefaultMaxBackoffRetries = 60
+)
+
+// UserAgent represents a User-Agent header.
+type UserAgent struct {
+ // prepend is the slice of User-Agent strings to prepend to DefaultUserAgent.
+ // All the strings to prepend are accumulated and prepended in the Join method.
+ prepend []string
+}
+
+type RetryBackoffFunc func(context.Context, *ErrUnexpectedResponseCode, error, uint) error
+
+// RetryFunc is a catch-all function for retrying failed API requests.
+// If it returns nil, the request will be retried. If it returns an error,
+// the request method will exit with that error. failCount is the number of
+// times the request has failed (starting at 1).
+type RetryFunc func(context context.Context, method, url string, options *RequestOpts, err error, failCount uint) error
+
+// Prepend prepends a user-defined string to the default User-Agent string. Users
+// may pass in one or more strings to prepend.
+func (ua *UserAgent) Prepend(s ...string) {
+ ua.prepend = append(s, ua.prepend...)
+}
+
+// Join concatenates all the user-defined User-Agend strings with the default
+// Gophercloud User-Agent string.
+func (ua *UserAgent) Join() string {
+ uaSlice := append(ua.prepend, DefaultUserAgent)
+ return strings.Join(uaSlice, " ")
+}
+
+// ProviderClient stores details that are required to interact with any
+// services within a specific provider's API.
+//
+// Generally, you acquire a ProviderClient by calling the NewClient method in
+// the appropriate provider's child package, providing whatever authentication
+// credentials are required.
+type ProviderClient struct {
+ // IdentityBase is the base URL used for a particular provider's identity
+ // service - it will be used when issuing authenticatation requests. It
+ // should point to the root resource of the identity service, not a specific
+ // identity version.
+ IdentityBase string
+
+ // IdentityEndpoint is the identity endpoint. This may be a specific version
+ // of the identity service. If this is the case, this endpoint is used rather
+ // than querying versions first.
+ IdentityEndpoint string
+
+ // TokenID is the ID of the most recently issued valid token.
+ // NOTE: Aside from within a custom ReauthFunc, this field shouldn't be set by an application.
+ // To safely read or write this value, call `Token` or `SetToken`, respectively
+ TokenID string
+
+ // EndpointLocator describes how this provider discovers the endpoints for
+ // its constituent services.
+ EndpointLocator EndpointLocator
+
+ // HTTPClient allows users to interject arbitrary http, https, or other transit behaviors.
+ HTTPClient http.Client
+
+ // UserAgent represents the User-Agent header in the HTTP request.
+ UserAgent UserAgent
+
+ // ReauthFunc is the function used to re-authenticate the user if the request
+ // fails with a 401 HTTP response code. This a needed because there may be multiple
+ // authentication functions for different Identity service versions.
+ ReauthFunc func() error
+
+ // Throwaway determines whether if this client is a throw-away client. It's a copy of user's provider client
+ // with the token and reauth func zeroed. Such client can be used to perform reauthorization.
+ Throwaway bool
+
+ // Context is the context passed to the HTTP request.
+ Context context.Context
+
+ // Retry backoff func is called when rate limited.
+ RetryBackoffFunc RetryBackoffFunc
+
+ // MaxBackoffRetries set the maximum number of backoffs. When not set, defaults to DefaultMaxBackoffRetries
+ MaxBackoffRetries uint
+
+ // A general failed request handler method - this is always called in the end if a request failed. Leave as nil
+ // to abort when an error is encountered.
+ RetryFunc RetryFunc
+
+ // mut is a mutex for the client. It protects read and write access to client attributes such as getting
+ // and setting the TokenID.
+ mut *sync.RWMutex
+
+ // reauthmut is a mutex for reauthentication it attempts to ensure that only one reauthentication
+ // attempt happens at one time.
+ reauthmut *reauthlock
+
+ authResult AuthResult
+}
+
+// reauthlock represents a set of attributes used to help in the reauthentication process.
+type reauthlock struct {
+ sync.RWMutex
+ ongoing *reauthFuture
+}
+
+// reauthFuture represents future result of the reauthentication process.
+// while done channel is not closed, reauthentication is in progress.
+// when done channel is closed, err contains the result of reauthentication.
+type reauthFuture struct {
+ done chan struct{}
+ err error
+}
+
+func newReauthFuture() *reauthFuture {
+ return &reauthFuture{
+ make(chan struct{}),
+ nil,
+ }
+}
+
+func (f *reauthFuture) Set(err error) {
+ f.err = err
+ close(f.done)
+}
+
+func (f *reauthFuture) Get() error {
+ <-f.done
+ return f.err
+}
+
+// AuthenticatedHeaders returns a map of HTTP headers that are common for all
+// authenticated service requests. Blocks if Reauthenticate is in progress.
+func (client *ProviderClient) AuthenticatedHeaders() (m map[string]string) {
+ if client.IsThrowaway() {
+ return
+ }
+ if client.reauthmut != nil {
+ // If a Reauthenticate is in progress, wait for it to complete.
+ client.reauthmut.Lock()
+ ongoing := client.reauthmut.ongoing
+ client.reauthmut.Unlock()
+ if ongoing != nil {
+ _ = ongoing.Get()
+ }
+ }
+ t := client.Token()
+ if t == "" {
+ return
+ }
+ return map[string]string{"X-Auth-Token": t}
+}
+
+// UseTokenLock creates a mutex that is used to allow safe concurrent access to the auth token.
+// If the application's ProviderClient is not used concurrently, this doesn't need to be called.
+func (client *ProviderClient) UseTokenLock() {
+ client.mut = new(sync.RWMutex)
+ client.reauthmut = new(reauthlock)
+}
+
+// GetAuthResult returns the result from the request that was used to obtain a
+// provider client's Keystone token.
+//
+// The result is nil when authentication has not yet taken place, when the token
+// was set manually with SetToken(), or when a ReauthFunc was used that does not
+// record the AuthResult.
+func (client *ProviderClient) GetAuthResult() AuthResult {
+ if client.mut != nil {
+ client.mut.RLock()
+ defer client.mut.RUnlock()
+ }
+ return client.authResult
+}
+
+// Token safely reads the value of the auth token from the ProviderClient. Applications should
+// call this method to access the token instead of the TokenID field
+func (client *ProviderClient) Token() string {
+ if client.mut != nil {
+ client.mut.RLock()
+ defer client.mut.RUnlock()
+ }
+ return client.TokenID
+}
+
+// SetToken safely sets the value of the auth token in the ProviderClient. Applications may
+// use this method in a custom ReauthFunc.
+//
+// WARNING: This function is deprecated. Use SetTokenAndAuthResult() instead.
+func (client *ProviderClient) SetToken(t string) {
+ if client.mut != nil {
+ client.mut.Lock()
+ defer client.mut.Unlock()
+ }
+ client.TokenID = t
+ client.authResult = nil
+}
+
+// SetTokenAndAuthResult safely sets the value of the auth token in the
+// ProviderClient and also records the AuthResult that was returned from the
+// token creation request. Applications may call this in a custom ReauthFunc.
+func (client *ProviderClient) SetTokenAndAuthResult(r AuthResult) error {
+ tokenID := ""
+ var err error
+ if r != nil {
+ tokenID, err = r.ExtractTokenID()
+ if err != nil {
+ return err
+ }
+ }
+
+ if client.mut != nil {
+ client.mut.Lock()
+ defer client.mut.Unlock()
+ }
+ client.TokenID = tokenID
+ client.authResult = r
+ return nil
+}
+
+// CopyTokenFrom safely copies the token from another ProviderClient into the
+// this one.
+func (client *ProviderClient) CopyTokenFrom(other *ProviderClient) {
+ if client.mut != nil {
+ client.mut.Lock()
+ defer client.mut.Unlock()
+ }
+ if other.mut != nil && other.mut != client.mut {
+ other.mut.RLock()
+ defer other.mut.RUnlock()
+ }
+ client.TokenID = other.TokenID
+ client.authResult = other.authResult
+}
+
+// IsThrowaway safely reads the value of the client Throwaway field.
+func (client *ProviderClient) IsThrowaway() bool {
+ if client.reauthmut != nil {
+ client.reauthmut.RLock()
+ defer client.reauthmut.RUnlock()
+ }
+ return client.Throwaway
+}
+
+// SetThrowaway safely sets the value of the client Throwaway field.
+func (client *ProviderClient) SetThrowaway(v bool) {
+ if client.reauthmut != nil {
+ client.reauthmut.Lock()
+ defer client.reauthmut.Unlock()
+ }
+ client.Throwaway = v
+}
+
+// Reauthenticate calls client.ReauthFunc in a thread-safe way. If this is
+// called because of a 401 response, the caller may pass the previous token. In
+// this case, the reauthentication can be skipped if another thread has already
+// reauthenticated in the meantime. If no previous token is known, an empty
+// string should be passed instead to force unconditional reauthentication.
+func (client *ProviderClient) Reauthenticate(previousToken string) error {
+ if client.ReauthFunc == nil {
+ return nil
+ }
+
+ if client.reauthmut == nil {
+ return client.ReauthFunc()
+ }
+
+ future := newReauthFuture()
+
+ // Check if a Reauthenticate is in progress, or start one if not.
+ client.reauthmut.Lock()
+ ongoing := client.reauthmut.ongoing
+ if ongoing == nil {
+ client.reauthmut.ongoing = future
+ }
+ client.reauthmut.Unlock()
+
+ // If Reauthenticate is running elsewhere, wait for its result.
+ if ongoing != nil {
+ return ongoing.Get()
+ }
+
+ // Perform the actual reauthentication.
+ var err error
+ if previousToken == "" || client.TokenID == previousToken {
+ err = client.ReauthFunc()
+ } else {
+ err = nil
+ }
+
+ // Mark Reauthenticate as finished.
+ client.reauthmut.Lock()
+ client.reauthmut.ongoing.Set(err)
+ client.reauthmut.ongoing = nil
+ client.reauthmut.Unlock()
+
+ return err
+}
+
+// RequestOpts customizes the behavior of the provider.Request() method.
+type RequestOpts struct {
+ // JSONBody, if provided, will be encoded as JSON and used as the body of the HTTP request. The
+ // content type of the request will default to "application/json" unless overridden by MoreHeaders.
+ // It's an error to specify both a JSONBody and a RawBody.
+ JSONBody interface{}
+ // RawBody contains an io.Reader that will be consumed by the request directly. No content-type
+ // will be set unless one is provided explicitly by MoreHeaders.
+ RawBody io.Reader
+ // JSONResponse, if provided, will be populated with the contents of the response body parsed as
+ // JSON.
+ JSONResponse interface{}
+ // OkCodes contains a list of numeric HTTP status codes that should be interpreted as success. If
+ // the response has a different code, an error will be returned.
+ OkCodes []int
+ // MoreHeaders specifies additional HTTP headers to be provided on the request.
+ // MoreHeaders will be overridden by OmitHeaders
+ MoreHeaders map[string]string
+ // OmitHeaders specifies the HTTP headers which should be omitted.
+ // OmitHeaders will override MoreHeaders
+ OmitHeaders []string
+ // ErrorContext specifies the resource error type to return if an error is encountered.
+ // This lets resources override default error messages based on the response status code.
+ ErrorContext error
+ // KeepResponseBody specifies whether to keep the HTTP response body. Usually used, when the HTTP
+ // response body is considered for further use. Valid when JSONResponse is nil.
+ KeepResponseBody bool
+}
+
+// requestState contains temporary state for a single ProviderClient.Request() call.
+type requestState struct {
+ // This flag indicates if we have reauthenticated during this request because of a 401 response.
+ // It ensures that we don't reauthenticate multiple times for a single request. If we
+ // reauthenticate, but keep getting 401 responses with the fresh token, reauthenticating some more
+ // will just get us into an infinite loop.
+ hasReauthenticated bool
+ // Retry-After backoff counter, increments during each backoff call
+ retries uint
+}
+
+var applicationJSON = "application/json"
+
+// Request performs an HTTP request using the ProviderClient's current HTTPClient. An authentication
+// header will automatically be provided.
+func (client *ProviderClient) Request(method, url string, options *RequestOpts) (*http.Response, error) {
+ return client.doRequest(method, url, options, &requestState{
+ hasReauthenticated: false,
+ })
+}
+
+func (client *ProviderClient) doRequest(method, url string, options *RequestOpts, state *requestState) (*http.Response, error) {
+ var body io.Reader
+ var contentType *string
+
+ // Derive the content body by either encoding an arbitrary object as JSON, or by taking a provided
+ // io.ReadSeeker as-is. Default the content-type to application/json.
+ if options.JSONBody != nil {
+ if options.RawBody != nil {
+ return nil, errors.New("please provide only one of JSONBody or RawBody to gophercloud.Request()")
+ }
+
+ rendered, err := json.Marshal(options.JSONBody)
+ if err != nil {
+ return nil, err
+ }
+
+ body = bytes.NewReader(rendered)
+ contentType = &applicationJSON
+ }
+
+ // Return an error, when "KeepResponseBody" is true and "JSONResponse" is not nil
+ if options.KeepResponseBody && options.JSONResponse != nil {
+ return nil, errors.New("cannot use KeepResponseBody when JSONResponse is not nil")
+ }
+
+ if options.RawBody != nil {
+ body = options.RawBody
+ }
+
+ // Construct the http.Request.
+ req, err := http.NewRequest(method, url, body)
+ if err != nil {
+ return nil, err
+ }
+ if client.Context != nil {
+ req = req.WithContext(client.Context)
+ }
+
+ // Populate the request headers.
+ // Apply options.MoreHeaders and options.OmitHeaders, to give the caller the chance to
+ // modify or omit any header.
+ if contentType != nil {
+ req.Header.Set("Content-Type", *contentType)
+ }
+ req.Header.Set("Accept", applicationJSON)
+
+ // Set the User-Agent header
+ req.Header.Set("User-Agent", client.UserAgent.Join())
+
+ if options.MoreHeaders != nil {
+ for k, v := range options.MoreHeaders {
+ req.Header.Set(k, v)
+ }
+ }
+
+ for _, v := range options.OmitHeaders {
+ req.Header.Del(v)
+ }
+
+ // get latest token from client
+ for k, v := range client.AuthenticatedHeaders() {
+ req.Header.Set(k, v)
+ }
+
+ prereqtok := req.Header.Get("X-Auth-Token")
+
+ // Issue the request.
+ resp, err := client.HTTPClient.Do(req)
+ if err != nil {
+ if client.RetryFunc != nil {
+ var e error
+ state.retries = state.retries + 1
+ e = client.RetryFunc(client.Context, method, url, options, err, state.retries)
+ if e != nil {
+ return nil, e
+ }
+
+ return client.doRequest(method, url, options, state)
+ }
+ return nil, err
+ }
+
+ // Allow default OkCodes if none explicitly set
+ okc := options.OkCodes
+ if okc == nil {
+ okc = defaultOkCodes(method)
+ }
+
+ // Validate the HTTP response status.
+ var ok bool
+ for _, code := range okc {
+ if resp.StatusCode == code {
+ ok = true
+ break
+ }
+ }
+
+ if !ok {
+ body, _ := ioutil.ReadAll(resp.Body)
+ resp.Body.Close()
+ respErr := ErrUnexpectedResponseCode{
+ URL: url,
+ Method: method,
+ Expected: okc,
+ Actual: resp.StatusCode,
+ Body: body,
+ ResponseHeader: resp.Header,
+ }
+
+ errType := options.ErrorContext
+ switch resp.StatusCode {
+ case http.StatusBadRequest:
+ err = ErrDefault400{respErr}
+ if error400er, ok := errType.(Err400er); ok {
+ err = error400er.Error400(respErr)
+ }
+ case http.StatusUnauthorized:
+ if client.ReauthFunc != nil && !state.hasReauthenticated {
+ err = client.Reauthenticate(prereqtok)
+ if err != nil {
+ e := &ErrUnableToReauthenticate{}
+ e.ErrOriginal = respErr
+ e.ErrReauth = err
+ return nil, e
+ }
+ if options.RawBody != nil {
+ if seeker, ok := options.RawBody.(io.Seeker); ok {
+ seeker.Seek(0, 0)
+ }
+ }
+ state.hasReauthenticated = true
+ resp, err = client.doRequest(method, url, options, state)
+ if err != nil {
+ switch err.(type) {
+ case *ErrUnexpectedResponseCode:
+ e := &ErrErrorAfterReauthentication{}
+ e.ErrOriginal = err.(*ErrUnexpectedResponseCode)
+ return nil, e
+ default:
+ e := &ErrErrorAfterReauthentication{}
+ e.ErrOriginal = err
+ return nil, e
+ }
+ }
+ return resp, nil
+ }
+ err = ErrDefault401{respErr}
+ if error401er, ok := errType.(Err401er); ok {
+ err = error401er.Error401(respErr)
+ }
+ case http.StatusForbidden:
+ err = ErrDefault403{respErr}
+ if error403er, ok := errType.(Err403er); ok {
+ err = error403er.Error403(respErr)
+ }
+ case http.StatusNotFound:
+ err = ErrDefault404{respErr}
+ if error404er, ok := errType.(Err404er); ok {
+ err = error404er.Error404(respErr)
+ }
+ case http.StatusMethodNotAllowed:
+ err = ErrDefault405{respErr}
+ if error405er, ok := errType.(Err405er); ok {
+ err = error405er.Error405(respErr)
+ }
+ case http.StatusRequestTimeout:
+ err = ErrDefault408{respErr}
+ if error408er, ok := errType.(Err408er); ok {
+ err = error408er.Error408(respErr)
+ }
+ case http.StatusConflict:
+ err = ErrDefault409{respErr}
+ if error409er, ok := errType.(Err409er); ok {
+ err = error409er.Error409(respErr)
+ }
+ case http.StatusTooManyRequests, 498:
+ err = ErrDefault429{respErr}
+ if error429er, ok := errType.(Err429er); ok {
+ err = error429er.Error429(respErr)
+ }
+
+ maxTries := client.MaxBackoffRetries
+ if maxTries == 0 {
+ maxTries = DefaultMaxBackoffRetries
+ }
+
+ if f := client.RetryBackoffFunc; f != nil && state.retries < maxTries {
+ var e error
+
+ state.retries = state.retries + 1
+ e = f(client.Context, &respErr, err, state.retries)
+
+ if e != nil {
+ return resp, e
+ }
+
+ return client.doRequest(method, url, options, state)
+ }
+ case http.StatusInternalServerError:
+ err = ErrDefault500{respErr}
+ if error500er, ok := errType.(Err500er); ok {
+ err = error500er.Error500(respErr)
+ }
+ case http.StatusBadGateway:
+ err = ErrDefault502{respErr}
+ if error502er, ok := errType.(Err502er); ok {
+ err = error502er.Error502(respErr)
+ }
+ case http.StatusServiceUnavailable:
+ err = ErrDefault503{respErr}
+ if error503er, ok := errType.(Err503er); ok {
+ err = error503er.Error503(respErr)
+ }
+ case http.StatusGatewayTimeout:
+ err = ErrDefault504{respErr}
+ if error504er, ok := errType.(Err504er); ok {
+ err = error504er.Error504(respErr)
+ }
+ }
+
+ if err == nil {
+ err = respErr
+ }
+
+ if err != nil && client.RetryFunc != nil {
+ var e error
+ state.retries = state.retries + 1
+ e = client.RetryFunc(client.Context, method, url, options, err, state.retries)
+ if e != nil {
+ return resp, e
+ }
+
+ return client.doRequest(method, url, options, state)
+ }
+
+ return resp, err
+ }
+
+ // Parse the response body as JSON, if requested to do so.
+ if options.JSONResponse != nil {
+ defer resp.Body.Close()
+ // Don't decode JSON when there is no content
+ if resp.StatusCode == http.StatusNoContent {
+ // read till EOF, otherwise the connection will be closed and cannot be reused
+ _, err = io.Copy(ioutil.Discard, resp.Body)
+ return resp, err
+ }
+ if err := json.NewDecoder(resp.Body).Decode(options.JSONResponse); err != nil {
+ if client.RetryFunc != nil {
+ var e error
+ state.retries = state.retries + 1
+ e = client.RetryFunc(client.Context, method, url, options, err, state.retries)
+ if e != nil {
+ return resp, e
+ }
+
+ return client.doRequest(method, url, options, state)
+ }
+ return nil, err
+ }
+ }
+
+ // Close unused body to allow the HTTP connection to be reused
+ if !options.KeepResponseBody && options.JSONResponse == nil {
+ defer resp.Body.Close()
+ // read till EOF, otherwise the connection will be closed and cannot be reused
+ if _, err := io.Copy(ioutil.Discard, resp.Body); err != nil {
+ return nil, err
+ }
+ }
+
+ return resp, nil
+}
+
+func defaultOkCodes(method string) []int {
+ switch method {
+ case "GET", "HEAD":
+ return []int{200}
+ case "POST":
+ return []int{201, 202}
+ case "PUT":
+ return []int{201, 202}
+ case "PATCH":
+ return []int{200, 202, 204}
+ case "DELETE":
+ return []int{202, 204}
+ }
+
+ return []int{}
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/results.go b/vendor/github.com/gophercloud/gophercloud/results.go
new file mode 100644
index 0000000000..b3ee9d5682
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/results.go
@@ -0,0 +1,465 @@
+package gophercloud
+
+import (
+ "bytes"
+ "encoding/json"
+ "fmt"
+ "io"
+ "net/http"
+ "reflect"
+ "strconv"
+ "time"
+)
+
+/*
+Result is an internal type to be used by individual resource packages, but its
+methods will be available on a wide variety of user-facing embedding types.
+
+It acts as a base struct that other Result types, returned from request
+functions, can embed for convenience. All Results capture basic information
+from the HTTP transaction that was performed, including the response body,
+HTTP headers, and any errors that happened.
+
+Generally, each Result type will have an Extract method that can be used to
+further interpret the result's payload in a specific context. Extensions or
+providers can then provide additional extraction functions to pull out
+provider- or extension-specific information as well.
+*/
+type Result struct {
+ // Body is the payload of the HTTP response from the server. In most cases,
+ // this will be the deserialized JSON structure.
+ Body interface{}
+
+ // StatusCode is the HTTP status code of the original response. Will be
+ // one of the OkCodes defined on the gophercloud.RequestOpts that was
+ // used in the request.
+ StatusCode int
+
+ // Header contains the HTTP header structure from the original response.
+ Header http.Header
+
+ // Err is an error that occurred during the operation. It's deferred until
+ // extraction to make it easier to chain the Extract call.
+ Err error
+}
+
+// ExtractInto allows users to provide an object into which `Extract` will extract
+// the `Result.Body`. This would be useful for OpenStack providers that have
+// different fields in the response object than OpenStack proper.
+func (r Result) ExtractInto(to interface{}) error {
+ if r.Err != nil {
+ return r.Err
+ }
+
+ if reader, ok := r.Body.(io.Reader); ok {
+ if readCloser, ok := reader.(io.Closer); ok {
+ defer readCloser.Close()
+ }
+ return json.NewDecoder(reader).Decode(to)
+ }
+
+ b, err := json.Marshal(r.Body)
+ if err != nil {
+ return err
+ }
+ err = json.Unmarshal(b, to)
+
+ return err
+}
+
+func (r Result) extractIntoPtr(to interface{}, label string) error {
+ if label == "" {
+ return r.ExtractInto(&to)
+ }
+
+ var m map[string]interface{}
+ err := r.ExtractInto(&m)
+ if err != nil {
+ return err
+ }
+
+ b, err := json.Marshal(m[label])
+ if err != nil {
+ return err
+ }
+
+ toValue := reflect.ValueOf(to)
+ if toValue.Kind() == reflect.Ptr {
+ toValue = toValue.Elem()
+ }
+
+ switch toValue.Kind() {
+ case reflect.Slice:
+ typeOfV := toValue.Type().Elem()
+ if typeOfV.Kind() == reflect.Struct {
+ if typeOfV.NumField() > 0 && typeOfV.Field(0).Anonymous {
+ newSlice := reflect.MakeSlice(reflect.SliceOf(typeOfV), 0, 0)
+
+ if mSlice, ok := m[label].([]interface{}); ok {
+ for _, v := range mSlice {
+ // For each iteration of the slice, we create a new struct.
+ // This is to work around a bug where elements of a slice
+ // are reused and not overwritten when the same copy of the
+ // struct is used:
+ //
+ // https://github.com/golang/go/issues/21092
+ // https://github.com/golang/go/issues/24155
+ // https://play.golang.org/p/NHo3ywlPZli
+ newType := reflect.New(typeOfV).Elem()
+
+ b, err := json.Marshal(v)
+ if err != nil {
+ return err
+ }
+
+ // This is needed for structs with an UnmarshalJSON method.
+ // Technically this is just unmarshalling the response into
+ // a struct that is never used, but it's good enough to
+ // trigger the UnmarshalJSON method.
+ for i := 0; i < newType.NumField(); i++ {
+ s := newType.Field(i).Addr().Interface()
+
+ // Unmarshal is used rather than NewDecoder to also work
+ // around the above-mentioned bug.
+ err = json.Unmarshal(b, s)
+ if err != nil {
+ return err
+ }
+ }
+
+ newSlice = reflect.Append(newSlice, newType)
+ }
+ }
+
+ // "to" should now be properly modeled to receive the
+ // JSON response body and unmarshal into all the correct
+ // fields of the struct or composed extension struct
+ // at the end of this method.
+ toValue.Set(newSlice)
+
+ // jtopjian: This was put into place to resolve the issue
+ // described at
+ // https://github.com/gophercloud/gophercloud/issues/1963
+ //
+ // This probably isn't the best fix, but it appears to
+ // be resolving the issue, so I'm going to implement it
+ // for now.
+ //
+ // For future readers, this entire case statement could
+ // use a review.
+ return nil
+ }
+ }
+ case reflect.Struct:
+ typeOfV := toValue.Type()
+ if typeOfV.NumField() > 0 && typeOfV.Field(0).Anonymous {
+ for i := 0; i < toValue.NumField(); i++ {
+ toField := toValue.Field(i)
+ if toField.Kind() == reflect.Struct {
+ s := toField.Addr().Interface()
+ err = json.NewDecoder(bytes.NewReader(b)).Decode(s)
+ if err != nil {
+ return err
+ }
+ }
+ }
+ }
+ }
+
+ err = json.Unmarshal(b, &to)
+ return err
+}
+
+// ExtractIntoStructPtr will unmarshal the Result (r) into the provided
+// interface{} (to).
+//
+// NOTE: For internal use only
+//
+// `to` must be a pointer to an underlying struct type
+//
+// If provided, `label` will be filtered out of the response
+// body prior to `r` being unmarshalled into `to`.
+func (r Result) ExtractIntoStructPtr(to interface{}, label string) error {
+ if r.Err != nil {
+ return r.Err
+ }
+
+ t := reflect.TypeOf(to)
+ if k := t.Kind(); k != reflect.Ptr {
+ return fmt.Errorf("Expected pointer, got %v", k)
+ }
+ switch t.Elem().Kind() {
+ case reflect.Struct:
+ return r.extractIntoPtr(to, label)
+ default:
+ return fmt.Errorf("Expected pointer to struct, got: %v", t)
+ }
+}
+
+// ExtractIntoSlicePtr will unmarshal the Result (r) into the provided
+// interface{} (to).
+//
+// NOTE: For internal use only
+//
+// `to` must be a pointer to an underlying slice type
+//
+// If provided, `label` will be filtered out of the response
+// body prior to `r` being unmarshalled into `to`.
+func (r Result) ExtractIntoSlicePtr(to interface{}, label string) error {
+ if r.Err != nil {
+ return r.Err
+ }
+
+ t := reflect.TypeOf(to)
+ if k := t.Kind(); k != reflect.Ptr {
+ return fmt.Errorf("Expected pointer, got %v", k)
+ }
+ switch t.Elem().Kind() {
+ case reflect.Slice:
+ return r.extractIntoPtr(to, label)
+ default:
+ return fmt.Errorf("Expected pointer to slice, got: %v", t)
+ }
+}
+
+// PrettyPrintJSON creates a string containing the full response body as
+// pretty-printed JSON. It's useful for capturing test fixtures and for
+// debugging extraction bugs. If you include its output in an issue related to
+// a buggy extraction function, we will all love you forever.
+func (r Result) PrettyPrintJSON() string {
+ pretty, err := json.MarshalIndent(r.Body, "", " ")
+ if err != nil {
+ panic(err.Error())
+ }
+ return string(pretty)
+}
+
+// ErrResult is an internal type to be used by individual resource packages, but
+// its methods will be available on a wide variety of user-facing embedding
+// types.
+//
+// It represents results that only contain a potential error and
+// nothing else. Usually, if the operation executed successfully, the Err field
+// will be nil; otherwise it will be stocked with a relevant error. Use the
+// ExtractErr method
+// to cleanly pull it out.
+type ErrResult struct {
+ Result
+}
+
+// ExtractErr is a function that extracts error information, or nil, from a result.
+func (r ErrResult) ExtractErr() error {
+ return r.Err
+}
+
+/*
+HeaderResult is an internal type to be used by individual resource packages, but
+its methods will be available on a wide variety of user-facing embedding types.
+
+It represents a result that only contains an error (possibly nil) and an
+http.Header. This is used, for example, by the objectstorage packages in
+openstack, because most of the operations don't return response bodies, but do
+have relevant information in headers.
+*/
+type HeaderResult struct {
+ Result
+}
+
+// ExtractInto allows users to provide an object into which `Extract` will
+// extract the http.Header headers of the result.
+func (r HeaderResult) ExtractInto(to interface{}) error {
+ if r.Err != nil {
+ return r.Err
+ }
+
+ tmpHeaderMap := map[string]string{}
+ for k, v := range r.Header {
+ if len(v) > 0 {
+ tmpHeaderMap[k] = v[0]
+ }
+ }
+
+ b, err := json.Marshal(tmpHeaderMap)
+ if err != nil {
+ return err
+ }
+ err = json.Unmarshal(b, to)
+
+ return err
+}
+
+// RFC3339Milli describes a common time format used by some API responses.
+const RFC3339Milli = "2006-01-02T15:04:05.999999Z"
+
+type JSONRFC3339Milli time.Time
+
+func (jt *JSONRFC3339Milli) UnmarshalJSON(data []byte) error {
+ b := bytes.NewBuffer(data)
+ dec := json.NewDecoder(b)
+ var s string
+ if err := dec.Decode(&s); err != nil {
+ return err
+ }
+ t, err := time.Parse(RFC3339Milli, s)
+ if err != nil {
+ return err
+ }
+ *jt = JSONRFC3339Milli(t)
+ return nil
+}
+
+const RFC3339MilliNoZ = "2006-01-02T15:04:05.999999"
+
+type JSONRFC3339MilliNoZ time.Time
+
+func (jt *JSONRFC3339MilliNoZ) UnmarshalJSON(data []byte) error {
+ var s string
+ if err := json.Unmarshal(data, &s); err != nil {
+ return err
+ }
+ if s == "" {
+ return nil
+ }
+ t, err := time.Parse(RFC3339MilliNoZ, s)
+ if err != nil {
+ return err
+ }
+ *jt = JSONRFC3339MilliNoZ(t)
+ return nil
+}
+
+type JSONRFC1123 time.Time
+
+func (jt *JSONRFC1123) UnmarshalJSON(data []byte) error {
+ var s string
+ if err := json.Unmarshal(data, &s); err != nil {
+ return err
+ }
+ if s == "" {
+ return nil
+ }
+ t, err := time.Parse(time.RFC1123, s)
+ if err != nil {
+ return err
+ }
+ *jt = JSONRFC1123(t)
+ return nil
+}
+
+type JSONUnix time.Time
+
+func (jt *JSONUnix) UnmarshalJSON(data []byte) error {
+ var s string
+ if err := json.Unmarshal(data, &s); err != nil {
+ return err
+ }
+ if s == "" {
+ return nil
+ }
+ unix, err := strconv.ParseInt(s, 10, 64)
+ if err != nil {
+ return err
+ }
+ t = time.Unix(unix, 0)
+ *jt = JSONUnix(t)
+ return nil
+}
+
+// RFC3339NoZ is the time format used in Heat (Orchestration).
+const RFC3339NoZ = "2006-01-02T15:04:05"
+
+type JSONRFC3339NoZ time.Time
+
+func (jt *JSONRFC3339NoZ) UnmarshalJSON(data []byte) error {
+ var s string
+ if err := json.Unmarshal(data, &s); err != nil {
+ return err
+ }
+ if s == "" {
+ return nil
+ }
+ t, err := time.Parse(RFC3339NoZ, s)
+ if err != nil {
+ return err
+ }
+ *jt = JSONRFC3339NoZ(t)
+ return nil
+}
+
+// RFC3339ZNoT is the time format used in Zun (Containers Service).
+const RFC3339ZNoT = "2006-01-02 15:04:05-07:00"
+
+type JSONRFC3339ZNoT time.Time
+
+func (jt *JSONRFC3339ZNoT) UnmarshalJSON(data []byte) error {
+ var s string
+ if err := json.Unmarshal(data, &s); err != nil {
+ return err
+ }
+ if s == "" {
+ return nil
+ }
+ t, err := time.Parse(RFC3339ZNoT, s)
+ if err != nil {
+ return err
+ }
+ *jt = JSONRFC3339ZNoT(t)
+ return nil
+}
+
+// RFC3339ZNoTNoZ is another time format used in Zun (Containers Service).
+const RFC3339ZNoTNoZ = "2006-01-02 15:04:05"
+
+type JSONRFC3339ZNoTNoZ time.Time
+
+func (jt *JSONRFC3339ZNoTNoZ) UnmarshalJSON(data []byte) error {
+ var s string
+ if err := json.Unmarshal(data, &s); err != nil {
+ return err
+ }
+ if s == "" {
+ return nil
+ }
+ t, err := time.Parse(RFC3339ZNoTNoZ, s)
+ if err != nil {
+ return err
+ }
+ *jt = JSONRFC3339ZNoTNoZ(t)
+ return nil
+}
+
+/*
+Link is an internal type to be used in packages of collection resources that are
+paginated in a certain way.
+
+It's a response substructure common to many paginated collection results that is
+used to point to related pages. Usually, the one we care about is the one with
+Rel field set to "next".
+*/
+type Link struct {
+ Href string `json:"href"`
+ Rel string `json:"rel"`
+}
+
+/*
+ExtractNextURL is an internal function useful for packages of collection
+resources that are paginated in a certain way.
+
+It attempts to extract the "next" URL from slice of Link structs, or
+"" if no such URL is present.
+*/
+func ExtractNextURL(links []Link) (string, error) {
+ var url string
+
+ for _, l := range links {
+ if l.Rel == "next" {
+ url = l.Href
+ }
+ }
+
+ if url == "" {
+ return "", nil
+ }
+
+ return url, nil
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/service_client.go b/vendor/github.com/gophercloud/gophercloud/service_client.go
new file mode 100644
index 0000000000..94a161e340
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/service_client.go
@@ -0,0 +1,163 @@
+package gophercloud
+
+import (
+ "io"
+ "net/http"
+ "strings"
+)
+
+// ServiceClient stores details required to interact with a specific service API implemented by a provider.
+// Generally, you'll acquire these by calling the appropriate `New` method on a ProviderClient.
+type ServiceClient struct {
+ // ProviderClient is a reference to the provider that implements this service.
+ *ProviderClient
+
+ // Endpoint is the base URL of the service's API, acquired from a service catalog.
+ // It MUST end with a /.
+ Endpoint string
+
+ // ResourceBase is the base URL shared by the resources within a service's API. It should include
+ // the API version and, like Endpoint, MUST end with a / if set. If not set, the Endpoint is used
+ // as-is, instead.
+ ResourceBase string
+
+ // This is the service client type (e.g. compute, sharev2).
+ // NOTE: FOR INTERNAL USE ONLY. DO NOT SET. GOPHERCLOUD WILL SET THIS.
+ // It is only exported because it gets set in a different package.
+ Type string
+
+ // The microversion of the service to use. Set this to use a particular microversion.
+ Microversion string
+
+ // MoreHeaders allows users (or Gophercloud) to set service-wide headers on requests. Put another way,
+ // values set in this field will be set on all the HTTP requests the service client sends.
+ MoreHeaders map[string]string
+}
+
+// ResourceBaseURL returns the base URL of any resources used by this service. It MUST end with a /.
+func (client *ServiceClient) ResourceBaseURL() string {
+ if client.ResourceBase != "" {
+ return client.ResourceBase
+ }
+ return client.Endpoint
+}
+
+// ServiceURL constructs a URL for a resource belonging to this provider.
+func (client *ServiceClient) ServiceURL(parts ...string) string {
+ return client.ResourceBaseURL() + strings.Join(parts, "/")
+}
+
+func (client *ServiceClient) initReqOpts(JSONBody interface{}, JSONResponse interface{}, opts *RequestOpts) {
+ if v, ok := (JSONBody).(io.Reader); ok {
+ opts.RawBody = v
+ } else if JSONBody != nil {
+ opts.JSONBody = JSONBody
+ }
+
+ if JSONResponse != nil {
+ opts.JSONResponse = JSONResponse
+ }
+}
+
+// Get calls `Request` with the "GET" HTTP verb.
+func (client *ServiceClient) Get(url string, JSONResponse interface{}, opts *RequestOpts) (*http.Response, error) {
+ if opts == nil {
+ opts = new(RequestOpts)
+ }
+ client.initReqOpts(nil, JSONResponse, opts)
+ return client.Request("GET", url, opts)
+}
+
+// Post calls `Request` with the "POST" HTTP verb.
+func (client *ServiceClient) Post(url string, JSONBody interface{}, JSONResponse interface{}, opts *RequestOpts) (*http.Response, error) {
+ if opts == nil {
+ opts = new(RequestOpts)
+ }
+ client.initReqOpts(JSONBody, JSONResponse, opts)
+ return client.Request("POST", url, opts)
+}
+
+// Put calls `Request` with the "PUT" HTTP verb.
+func (client *ServiceClient) Put(url string, JSONBody interface{}, JSONResponse interface{}, opts *RequestOpts) (*http.Response, error) {
+ if opts == nil {
+ opts = new(RequestOpts)
+ }
+ client.initReqOpts(JSONBody, JSONResponse, opts)
+ return client.Request("PUT", url, opts)
+}
+
+// Patch calls `Request` with the "PATCH" HTTP verb.
+func (client *ServiceClient) Patch(url string, JSONBody interface{}, JSONResponse interface{}, opts *RequestOpts) (*http.Response, error) {
+ if opts == nil {
+ opts = new(RequestOpts)
+ }
+ client.initReqOpts(JSONBody, JSONResponse, opts)
+ return client.Request("PATCH", url, opts)
+}
+
+// Delete calls `Request` with the "DELETE" HTTP verb.
+func (client *ServiceClient) Delete(url string, opts *RequestOpts) (*http.Response, error) {
+ if opts == nil {
+ opts = new(RequestOpts)
+ }
+ client.initReqOpts(nil, nil, opts)
+ return client.Request("DELETE", url, opts)
+}
+
+// Head calls `Request` with the "HEAD" HTTP verb.
+func (client *ServiceClient) Head(url string, opts *RequestOpts) (*http.Response, error) {
+ if opts == nil {
+ opts = new(RequestOpts)
+ }
+ client.initReqOpts(nil, nil, opts)
+ return client.Request("HEAD", url, opts)
+}
+
+func (client *ServiceClient) setMicroversionHeader(opts *RequestOpts) {
+ switch client.Type {
+ case "compute":
+ opts.MoreHeaders["X-OpenStack-Nova-API-Version"] = client.Microversion
+ case "sharev2":
+ opts.MoreHeaders["X-OpenStack-Manila-API-Version"] = client.Microversion
+ case "volume":
+ opts.MoreHeaders["X-OpenStack-Volume-API-Version"] = client.Microversion
+ case "baremetal":
+ opts.MoreHeaders["X-OpenStack-Ironic-API-Version"] = client.Microversion
+ case "baremetal-introspection":
+ opts.MoreHeaders["X-OpenStack-Ironic-Inspector-API-Version"] = client.Microversion
+ }
+
+ if client.Type != "" {
+ opts.MoreHeaders["OpenStack-API-Version"] = client.Type + " " + client.Microversion
+ }
+}
+
+// Request carries out the HTTP operation for the service client
+func (client *ServiceClient) Request(method, url string, options *RequestOpts) (*http.Response, error) {
+ if options.MoreHeaders == nil {
+ options.MoreHeaders = make(map[string]string)
+ }
+
+ if client.Microversion != "" {
+ client.setMicroversionHeader(options)
+ }
+
+ if len(client.MoreHeaders) > 0 {
+ if options == nil {
+ options = new(RequestOpts)
+ }
+
+ for k, v := range client.MoreHeaders {
+ options.MoreHeaders[k] = v
+ }
+ }
+ return client.ProviderClient.Request(method, url, options)
+}
+
+// ParseResponse is a helper function to parse http.Response to constituents.
+func ParseResponse(resp *http.Response, err error) (io.ReadCloser, http.Header, error) {
+ if resp != nil {
+ return resp.Body, resp.Header, err
+ }
+ return nil, nil, err
+}
diff --git a/vendor/github.com/gophercloud/gophercloud/util.go b/vendor/github.com/gophercloud/gophercloud/util.go
new file mode 100644
index 0000000000..2740c301e5
--- /dev/null
+++ b/vendor/github.com/gophercloud/gophercloud/util.go
@@ -0,0 +1,130 @@
+package gophercloud
+
+import (
+ "fmt"
+ "net/url"
+ "path/filepath"
+ "reflect"
+ "strings"
+ "time"
+)
+
+// NormalizePathURL is used to convert rawPath to a fqdn, using basePath as
+// a reference in the filesystem, if necessary. basePath is assumed to contain
+// either '.' when first used, or the file:// type fqdn of the parent resource.
+// e.g. myFavScript.yaml => file://opt/lib/myFavScript.yaml
+func NormalizePathURL(basePath, rawPath string) (string, error) {
+ u, err := url.Parse(rawPath)
+ if err != nil {
+ return "", err
+ }
+ // if a scheme is defined, it must be a fqdn already
+ if u.Scheme != "" {
+ return u.String(), nil
+ }
+ // if basePath is a url, then child resources are assumed to be relative to it
+ bu, err := url.Parse(basePath)
+ if err != nil {
+ return "", err
+ }
+ var basePathSys, absPathSys string
+ if bu.Scheme != "" {
+ basePathSys = filepath.FromSlash(bu.Path)
+ absPathSys = filepath.Join(basePathSys, rawPath)
+ bu.Path = filepath.ToSlash(absPathSys)
+ return bu.String(), nil
+ }
+
+ absPathSys = filepath.Join(basePath, rawPath)
+ u.Path = filepath.ToSlash(absPathSys)
+ if err != nil {
+ return "", err
+ }
+ u.Scheme = "file"
+ return u.String(), nil
+}
+
+// NormalizeURL is an internal function to be used by provider clients.
+//
+// It ensures that each endpoint URL has a closing `/`, as expected by
+// ServiceClient's methods.
+func NormalizeURL(url string) string {
+ if !strings.HasSuffix(url, "/") {
+ return url + "/"
+ }
+ return url
+}
+
+// RemainingKeys will inspect a struct and compare it to a map. Any struct
+// field that does not have a JSON tag that matches a key in the map or
+// a matching lower-case field in the map will be returned as an extra.
+//
+// This is useful for determining the extra fields returned in response bodies
+// for resources that can contain an arbitrary or dynamic number of fields.
+func RemainingKeys(s interface{}, m map[string]interface{}) (extras map[string]interface{}) {
+ extras = make(map[string]interface{})
+ for k, v := range m {
+ extras[k] = v
+ }
+
+ valueOf := reflect.ValueOf(s)
+ typeOf := reflect.TypeOf(s)
+ for i := 0; i < valueOf.NumField(); i++ {
+ field := typeOf.Field(i)
+
+ lowerField := strings.ToLower(field.Name)
+ delete(extras, lowerField)
+
+ if tagValue := field.Tag.Get("json"); tagValue != "" && tagValue != "-" {
+ delete(extras, tagValue)
+ }
+ }
+
+ return
+}
+
+// WaitFor polls a predicate function, once per second, up to a timeout limit.
+// This is useful to wait for a resource to transition to a certain state.
+// To handle situations when the predicate might hang indefinitely, the
+// predicate will be prematurely cancelled after the timeout.
+// Resource packages will wrap this in a more convenient function that's
+// specific to a certain resource, but it can also be useful on its own.
+func WaitFor(timeout int, predicate func() (bool, error)) error {
+ type WaitForResult struct {
+ Success bool
+ Error error
+ }
+
+ start := time.Now().Unix()
+
+ for {
+ // If a timeout is set, and that's been exceeded, shut it down.
+ if timeout >= 0 && time.Now().Unix()-start >= int64(timeout) {
+ return fmt.Errorf("A timeout occurred")
+ }
+
+ time.Sleep(1 * time.Second)
+
+ var result WaitForResult
+ ch := make(chan bool, 1)
+ go func() {
+ defer close(ch)
+ satisfied, err := predicate()
+ result.Success = satisfied
+ result.Error = err
+ }()
+
+ select {
+ case <-ch:
+ if result.Error != nil {
+ return result.Error
+ }
+ if result.Success {
+ return nil
+ }
+ // If the predicate has not finished by the timeout, cancel it.
+ case <-time.After(time.Duration(timeout) * time.Second):
+ return fmt.Errorf("A timeout occurred")
+ }
+ }
+}
diff --git a/vendor/go.opentelemetry.io/otel/.codespellignore b/vendor/go.opentelemetry.io/otel/.codespellignore
index a6d0cbcc9e..2b53a25e1e 100644
--- a/vendor/go.opentelemetry.io/otel/.codespellignore
+++ b/vendor/go.opentelemetry.io/otel/.codespellignore
@@ -8,4 +8,3 @@ nam
valu
thirdparty
addOpt
-observ
diff --git a/vendor/go.opentelemetry.io/otel/.golangci.yml b/vendor/go.opentelemetry.io/otel/.golangci.yml
index 1b1b2aff9a..b01762ffcc 100644
--- a/vendor/go.opentelemetry.io/otel/.golangci.yml
+++ b/vendor/go.opentelemetry.io/otel/.golangci.yml
@@ -197,9 +197,6 @@ linters:
- float-compare
- go-require
- require-error
- usetesting:
- context-background: true
- context-todo: true
exclusions:
generated: lax
presets:
diff --git a/vendor/go.opentelemetry.io/otel/.lycheeignore b/vendor/go.opentelemetry.io/otel/.lycheeignore
index 994b677df7..5328505888 100644
--- a/vendor/go.opentelemetry.io/otel/.lycheeignore
+++ b/vendor/go.opentelemetry.io/otel/.lycheeignore
@@ -1,5 +1,4 @@
http://localhost
-https://localhost
http://jaeger-collector
https://github.com/open-telemetry/opentelemetry-go/milestone/
https://github.com/open-telemetry/opentelemetry-go/projects
@@ -7,7 +6,4 @@ https://github.com/open-telemetry/opentelemetry-go/projects
https?:\/\/github\.com\/open-telemetry\/semantic-conventions\/archive\/refs\/tags\/[^.]+\.zip\[[^]]+]
file:///home/runner/work/opentelemetry-go/opentelemetry-go/libraries
file:///home/runner/work/opentelemetry-go/opentelemetry-go/manual
-http://4.3.2.1:78/user/123
-file:///home/runner/work/opentelemetry-go/opentelemetry-go/exporters/otlp/otlptrace/otlptracegrpc/internal/observ/dns:/:4317
-# URL works, but it has blocked link checkers.
-https://dl.acm.org/doi/10.1145/198429.198435
+http://4.3.2.1:78/user/123
\ No newline at end of file
diff --git a/vendor/go.opentelemetry.io/otel/CHANGELOG.md b/vendor/go.opentelemetry.io/otel/CHANGELOG.md
index ecbe0582c4..f3abcfdc2e 100644
--- a/vendor/go.opentelemetry.io/otel/CHANGELOG.md
+++ b/vendor/go.opentelemetry.io/otel/CHANGELOG.md
@@ -11,74 +11,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
-## [1.39.0/0.61.0/0.15.0/0.0.14] 2025-12-05
-
-### Added
-
-- Greatly reduce the cost of recording metrics in `go.opentelemetry.io/otel/sdk/metric` using hashing for map keys. (#7175)
-- Add `WithInstrumentationAttributeSet` option to `go.opentelemetry.io/otel/log`, `go.opentelemetry.io/otel/metric`, and `go.opentelemetry.io/otel/trace` packages.
- This provides a concurrent-safe and performant alternative to `WithInstrumentationAttributes` by accepting a pre-constructed `attribute.Set`. (#7287)
-- Add experimental observability for the Prometheus exporter in `go.opentelemetry.io/otel/exporters/prometheus`.
- Check the `go.opentelemetry.io/otel/exporters/prometheus/internal/x` package documentation for more information. (#7345)
-- Add experimental observability metrics in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc`. (#7353)
-- Add temporality selector functions `DeltaTemporalitySelector`, `CumulativeTemporalitySelector`, `LowMemoryTemporalitySelector` to `go.opentelemetry.io/otel/sdk/metric`. (#7434)
-- Add experimental observability metrics for simple log processor in `go.opentelemetry.io/otel/sdk/log`. (#7548)
-- Add experimental observability metrics in `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc`. (#7459)
-- Add experimental observability metrics in `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp`. (#7486)
-- Add experimental observability metrics for simple span processor in `go.opentelemetry.io/otel/sdk/trace`. (#7374)
-- Add experimental observability metrics in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`. (#7512)
-- Add experimental observability metrics for manual reader in `go.opentelemetry.io/otel/sdk/metric`. (#7524)
-- Add experimental observability metrics for periodic reader in `go.opentelemetry.io/otel/sdk/metric`. (#7571)
-- Support `OTEL_EXPORTER_OTLP_LOGS_INSECURE` and `OTEL_EXPORTER_OTLP_INSECURE` environmental variables in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`. (#7608)
-- Add `Enabled` method to the `Processor` interface in `go.opentelemetry.io/otel/sdk/log`.
- All `Processor` implementations now include an `Enabled` method. (#7639)
-- The `go.opentelemetry.io/otel/semconv/v1.38.0` package.
- The package contains semantic conventions from the `v1.38.0` version of the OpenTelemetry Semantic Conventions.
- See the [migration documentation](./semconv/v1.38.0/MIGRATION.md) for information on how to upgrade from `go.opentelemetry.io/otel/semconv/v1.37.0.`(#7648)
-
-### Changed
-
-- `Distinct` in `go.opentelemetry.io/otel/attribute` is no longer guaranteed to uniquely identify an attribute set.
- Collisions between `Distinct` values for different Sets are possible with extremely high cardinality (billions of series per instrument), but are highly unlikely. (#7175)
-- `WithInstrumentationAttributes` in `go.opentelemetry.io/otel/trace` synchronously de-duplicates the passed attributes instead of delegating it to the returned `TracerOption`. (#7266)
-- `WithInstrumentationAttributes` in `go.opentelemetry.io/otel/meter` synchronously de-duplicates the passed attributes instead of delegating it to the returned `MeterOption`. (#7266)
-- `WithInstrumentationAttributes` in `go.opentelemetry.io/otel/log` synchronously de-duplicates the passed attributes instead of delegating it to the returned `LoggerOption`. (#7266)
-- Rename the `OTEL_GO_X_SELF_OBSERVABILITY` environment variable to `OTEL_GO_X_OBSERVABILITY` in `go.opentelemetry.io/otel/sdk/trace`, `go.opentelemetry.io/otel/sdk/log`, and `go.opentelemetry.io/otel/exporters/stdout/stdouttrace`. (#7302)
-- Improve performance of histogram `Record` in `go.opentelemetry.io/otel/sdk/metric` when min and max are disabled using `NoMinMax`. (#7306)
-- Improve error handling for dropped data during translation by using `prometheus.NewInvalidMetric` in `go.opentelemetry.io/otel/exporters/prometheus`.
- ⚠️ **Breaking Change:** Previously, these cases were only logged and scrapes succeeded.
- Now, when translation would drop data (e.g., invalid label/value), the exporter emits a `NewInvalidMetric`, and Prometheus scrapes **fail with HTTP 500** by default.
- To preserve the prior behavior (scrapes succeed while errors are logged), configure your Prometheus HTTP handler with: `promhttp.HandlerOpts{ ErrorHandling: promhttp.ContinueOnError }`. (#7363)
-- Replace fnv hash with xxhash in `go.opentelemetry.io/otel/attribute` for better performance. (#7371)
-- The default `TranslationStrategy` in `go.opentelemetry.io/exporters/prometheus` is changed from `otlptranslator.NoUTF8EscapingWithSuffixes` to `otlptranslator.UnderscoreEscapingWithSuffixes`. (#7421)
-- Improve performance of concurrent measurements in `go.opentelemetry.io/otel/sdk/metric`. (#7427)
-- Include W3C TraceFlags (bits 0–7) in the OTLP `Span.Flags` field in `go.opentelemetry.io/exporters/otlp/otlptrace/otlptracehttp` and `go.opentelemetry.io/exporters/otlp/otlptrace/otlptracegrpc`. (#7438)
-- The `ErrorType` function in `go.opentelemetry.io/otel/semconv/v1.37.0` now handles custom error types.
- If an error implements an `ErrorType() string` method, the return value of that method will be used as the error type. (#7442)
-
-### Fixed
-
-- Fix `WithInstrumentationAttributes` options in `go.opentelemetry.io/otel/trace`, `go.opentelemetry.io/otel/metric`, and `go.opentelemetry.io/otel/log` to properly merge attributes when passed multiple times instead of replacing them.
- Attributes with duplicate keys will use the last value passed. (#7300)
-- The equality of `attribute.Set` when using the `Equal` method is not affected by the user overriding the empty set pointed to by `attribute.EmptySet` in `go.opentelemetry.io/otel/attribute`. (#7357)
-- Return partial OTLP export errors to the caller in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc`. (#7372)
-- Return partial OTLP export errors to the caller in `go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp`. (#7372)
-- Return partial OTLP export errors to the caller in `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc`. (#7372)
-- Return partial OTLP export errors to the caller in `go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp`. (#7372)
-- Return partial OTLP export errors to the caller in `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc`. (#7372)
-- Return partial OTLP export errors to the caller in `go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp`. (#7372)
-- Fix `AddAttributes`, `SetAttributes`, `SetBody` on `Record` in `go.opentelemetry.io/otel/sdk/log` to not mutate input. (#7403)
-- Do not double record measurements of `RecordSet` methods in `go.opentelemetry.io/otel/semconv/v1.37.0`. (#7655)
-- Do not double record measurements of `RecordSet` methods in `go.opentelemetry.io/otel/semconv/v1.36.0`. (#7656)
-
-### Removed
-
-- Drop support for [Go 1.23]. (#7274)
-- Remove the `FilterProcessor` interface in `go.opentelemetry.io/otel/sdk/log`.
- The `Enabled` method has been added to the `Processor` interface instead.
- All `Processor` implementations must now implement the `Enabled` method.
- Custom processors that do not filter records can implement `Enabled` to return `true`. (#7639)
-
## [1.38.0/0.60.0/0.14.0/0.0.13] 2025-08-29
This release is the last to support [Go 1.23].
@@ -3498,10 +3430,8 @@ It contains api and sdk for trace and meter.
- CircleCI build CI manifest files.
- CODEOWNERS file to track owners of this project.
-[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.39.0...HEAD
-[1.39.0/0.61.0/0.15.0/0.0.14]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.39.0
+[Unreleased]: https://github.com/open-telemetry/opentelemetry-go/compare/v1.38.0...HEAD
[1.38.0/0.60.0/0.14.0/0.0.13]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.38.0
-[0.59.1]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/exporters/prometheus/v0.59.1
[1.37.0/0.59.0/0.13.0]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/v1.37.0
[0.12.2]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/log/v0.12.2
[0.12.1]: https://github.com/open-telemetry/opentelemetry-go/releases/tag/log/v0.12.1
diff --git a/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md b/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
index ff5e1f76ec..0b3ae855c1 100644
--- a/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
+++ b/vendor/go.opentelemetry.io/otel/CONTRIBUTING.md
@@ -54,8 +54,8 @@ go get -d go.opentelemetry.io/otel
(This may print some warning about "build constraints exclude all Go
files", just ignore it.)
-This will put the project in `${GOPATH}/src/go.opentelemetry.io/otel`.
-Alternatively, you can use `git` directly with:
+This will put the project in `${GOPATH}/src/go.opentelemetry.io/otel`. You
+can alternatively use `git` directly with:
```sh
git clone https://github.com/open-telemetry/opentelemetry-go
@@ -65,7 +65,8 @@ git clone https://github.com/open-telemetry/opentelemetry-go
that name is a kind of a redirector to GitHub that `go get` can
understand, but `git` does not.)
-This will add the project as `opentelemetry-go` within the current directory.
+This would put the project in the `opentelemetry-go` directory in
+current working directory.
Enter the newly created directory and add your fork as a new remote:
@@ -108,7 +109,7 @@ A PR is considered **ready to merge** when:
This is not enforced through automation, but needs to be validated by the
maintainer merging.
- * At least one of the qualified approvals needs to be from an
+ * At least one of the qualified approvals need to be from an
[Approver]/[Maintainer] affiliated with a different company than the author
of the PR.
* PRs introducing changes that have already been discussed and consensus
@@ -165,11 +166,11 @@ guidelines](https://opentelemetry.io/docs/specs/otel/library-guidelines).
### Focus on Capabilities, Not Structure Compliance
OpenTelemetry is an evolving specification, one where the desires and
-use cases are clear, but the methods to satisfy those use cases are
+use cases are clear, but the method to satisfy those uses cases are
not.
As such, Contributions should provide functionality and behavior that
-conforms to the specification, but the interface and structure are
+conforms to the specification, but the interface and structure is
flexible.
It is preferable to have contributions follow the idioms of the
@@ -216,7 +217,7 @@ about dependency compatibility.
This project does not partition dependencies based on the environment (i.e.
`development`, `staging`, `production`).
-Only the dependencies explicitly included in the released modules have been
+Only the dependencies explicitly included in the released modules have be
tested and verified to work with the released code. No other guarantee is made
about the compatibility of other dependencies.
@@ -634,8 +635,8 @@ is not in their root name.
The use of internal packages should be scoped to a single module. A sub-module
should never import from a parent internal package. This creates a coupling
-between the two modules where a user can upgrade the parent without the child,
-and if the internal package API has changed, it will fail to upgrade[^3].
+between the two modules where a user can upgrade the parent without the child
+and if the internal package API has changed it will fail to upgrade[^3].
There are two known exceptions to this rule:
@@ -656,7 +657,7 @@ this.
### Ignoring context cancellation
-OpenTelemetry API implementations need to ignore the cancellation of the context that is
+OpenTelemetry API implementations need to ignore the cancellation of the context that are
passed when recording a value (e.g. starting a span, recording a measurement, emitting a log).
Recording methods should not return an error describing the cancellation state of the context
when they complete, nor should they abort any work.
@@ -674,441 +675,6 @@ force flushing telemetry, shutting down a signal provider) the context cancellat
should be honored. This means all work done on behalf of the user provided context
should be canceled.
-### Observability
-
-OpenTelemetry Go SDK components should be instrumented to enable users observability for the health and performance of the telemetry pipeline itself.
-This allows operators to understand how well their observability infrastructure is functioning and to identify potential issues before they impact their applications.
-
-This section outlines the best practices for building instrumentation in OpenTelemetry Go SDK components.
-
-#### Environment Variable Activation
-
-Observability features are currently experimental.
-They should be disabled by default and activated through the `OTEL_GO_X_OBSERVABILITY` environment variable.
-This follows the established experimental feature pattern used throughout the SDK.
-
-Components should check for this environment variable using a consistent pattern:
-
-```go
-import "go.opentelemetry.io/otel/*/internal/x"
-
-if x.Observability.Enabled() {
- // Initialize observability metrics
-}
-```
-
-**References**:
-
-- [stdouttrace exporter](./exporters/stdout/stdouttrace/internal/x/x.go)
-- [sdk](./sdk/internal/x/x.go)
-
-#### Encapsulation
-
-Instrumentation should be encapsulated within a dedicated `struct` (e.g. `instrumentation`).
-It should not be mixed into the instrumented component.
-
-Prefer this:
-
-```go
-type SDKComponent struct {
- inst *instrumentation
-}
-
-type instrumentation struct {
- inflight otelconv.SDKComponentInflight
- exported otelconv.SDKComponentExported
-}
-```
-
-To this:
-
-```go
-// ❌ Avoid this pattern.
-type SDKComponent struct {
- /* other SDKComponent fields... */
-
- inflight otelconv.SDKComponentInflight
- exported otelconv.SDKComponentExported
-}
-```
-
-The instrumentation code should not bloat the code being instrumented.
-Likely, this means its own file, or its own package if it is complex or reused.
-
-#### Initialization
-
-Instrumentation setup should be explicit, side-effect free, and local to the relevant component.
-Avoid relying on global or implicit [side effects][side-effect] for initialization.
-
-Encapsulate setup in constructor functions, ensuring clear ownership and scope:
-
-```go
-import (
- "errors"
-
- semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
- "go.opentelemetry.io/otel/semconv/v1.37.0/otelconv"
-)
-
-type SDKComponent struct {
- inst *instrumentation
-}
-
-func NewSDKComponent(config Config) (*SDKComponent, error) {
- inst, err := newInstrumentation()
- if err != nil {
- return nil, err
- }
- return &SDKComponent{inst: inst}, nil
-}
-
-type instrumentation struct {
- inflight otelconv.SDKComponentInflight
- exported otelconv.SDKComponentExported
-}
-
-func newInstrumentation() (*instrumentation, error) {
- if !x.Observability.Enabled() {
- return nil, nil
- }
-
- meter := otel.GetMeterProvider().Meter(
- "",
- metric.WithInstrumentationVersion(sdk.Version()),
- metric.WithSchemaURL(semconv.SchemaURL),
- )
-
- inst := &instrumentation{}
-
- var err, e error
- inst.inflight, e = otelconv.NewSDKComponentInflight(meter)
- err = errors.Join(err, e)
-
- inst.exported, e = otelconv.NewSDKComponentExported(meter)
- err = errors.Join(err, e)
-
- return inst, err
-}
-```
-
-```go
-// ❌ Avoid this pattern.
-func (c *Component) initObservability() {
- // Initialize observability metrics
- if !x.Observability.Enabled() {
- return
- }
-
- // Initialize observability metrics
- c.inst = &instrumentation{/* ... */}
-}
-```
-
-[side-effect]: https://en.wikipedia.org/wiki/Side_effect_(computer_science)
-
-#### Performance
-
-When observability is disabled there should be little to no overhead.
-
-```go
-func (e *Exporter) ExportSpans(ctx context.Context, spans []trace.ReadOnlySpan) error {
- if e.inst != nil {
- attrs := expensiveOperation()
- e.inst.recordSpanInflight(ctx, int64(len(spans)), attrs...)
- }
- // Export spans...
-}
-```
-
-```go
-// ❌ Avoid this pattern.
-func (e *Exporter) ExportSpans(ctx context.Context, spans []trace.ReadOnlySpan) error {
- attrs := expensiveOperation()
- e.inst.recordSpanInflight(ctx, int64(len(spans)), attrs...)
- // Export spans...
-}
-
-func (i *instrumentation) recordSpanInflight(ctx context.Context, count int64, attrs ...attribute.KeyValue) {
- if i == nil || i.inflight == nil {
- return
- }
- i.inflight.Add(ctx, count, metric.WithAttributes(attrs...))
-}
-```
-
-When observability is enabled, the instrumentation code paths should be optimized to reduce allocation and computation overhead.
-
-##### Attribute and Option Allocation Management
-
-Pool attribute slices and options with [`sync.Pool`] to minimize allocations in measurement calls with dynamic attributes.
-
-```go
-var (
- attrPool = sync.Pool{
- New: func() any {
- // Pre-allocate common capacity
- knownCap := 8 // Adjust based on expected usage
- s := make([]attribute.KeyValue, 0, knownCap)
- // Return a pointer to avoid extra allocation on Put().
- return &s
- },
- }
-
- addOptPool = &sync.Pool{
- New: func() any {
- const n = 1 // WithAttributeSet
- o := make([]metric.AddOption, 0, n)
- // Return a pointer to avoid extra allocation on Put().
- return &o
- },
- }
-)
-
-func (i *instrumentation) record(ctx context.Context, value int64, baseAttrs ...attribute.KeyValue) {
- attrs := attrPool.Get().(*[]attribute.KeyValue)
- defer func() {
- *attrs = (*attrs)[:0] // Reset.
- attrPool.Put(attrs)
- }()
-
- *attrs = append(*attrs, baseAttrs...)
- // Add any dynamic attributes.
- *attrs = append(*attrs, semconv.OTelComponentName("exporter-1"))
-
- addOpt := addOptPool.Get().(*[]metric.AddOption)
- defer func() {
- *addOpt = (*addOpt)[:0]
- addOptPool.Put(addOpt)
- }()
-
- set := attribute.NewSet(*attrs...)
- *addOpt = append(*addOpt, metric.WithAttributeSet(set))
-
- i.counter.Add(ctx, value, *addOpt...)
-}
-```
-
-Pools are most effective when there are many pooled objects of the same sufficiently large size, and the objects are repeatedly used.
-This amortizes the cost of allocation and synchronization.
-Ideally, the pools should be scoped to be used as widely as possible within the component to maximize this efficiency while still ensuring correctness.
-
-[`sync.Pool`]: https://pkg.go.dev/sync#Pool
-
-##### Cache common attribute sets for repeated measurements
-
-If a static set of attributes are used for measurements and they are known at compile time, pre-compute and cache these attributes.
-
-```go
-type spanLiveSetKey struct {
- sampled bool
-}
-
-var spanLiveSetCache = map[spanLiveSetKey]attribute.Set{
- {true}: attribute.NewSet(
- otelconv.SDKSpanLive{}.AttrSpanSamplingResult(
- otelconv.SpanSamplingResultRecordAndSample,
- ),
- ),
- {false}: attribute.NewSet(
- otelconv.SDKSpanLive{}.AttrSpanSamplingResult(
- otelconv.SpanSamplingResultRecordOnly,
- ),
- ),
-}
-
-func spanLiveSet(sampled bool) attribute.Set {
- key := spanLiveSetKey{sampled: sampled}
- return spanLiveSetCache[key]
-}
-```
-
-##### Benchmarking
-
-Always provide benchmarks when introducing or refactoring instrumentation.
-Demonstrate the impact (allocs/op, B/op, ns/op) in enabled/disabled scenarios:
-
-```go
-func BenchmarkExportSpans(b *testing.B) {
- scenarios := []struct {
- name string
- obsEnabled bool
- }{
- {"ObsDisabled", false},
- {"ObsEnabled", true},
- }
-
- for _, scenario := range scenarios {
- b.Run(scenario.name, func(b *testing.B) {
- b.Setenv(
- "OTEL_GO_X_OBSERVABILITY",
- strconv.FormatBool(scenario.obsEnabled),
- )
-
- exporter := NewExporter()
- spans := generateTestSpans(100)
-
- b.ResetTimer()
- b.ReportAllocs()
-
- for i := 0; i < b.N; i++ {
- _ = exporter.ExportSpans(context.Background(), spans)
- }
- })
- }
-}
-```
-
-#### Error Handling and Robustness
-
-Errors should be reported back to the caller if possible, and partial failures should be handled as gracefully as possible.
-
-```go
-func newInstrumentation() (*instrumentation, error) {
- if !x.Observability.Enabled() {
- return nil, nil
- }
-
- m := otel.GetMeterProvider().Meter(/* initialize meter */)
- counter, err := otelconv.NewSDKComponentCounter(m)
- // Use the partially initialized counter if available.
- i := &instrumentation{counter: counter}
- // Return any error to the caller.
- return i, err
-}
-```
-
-```go
-// ❌ Avoid this pattern.
-func newInstrumentation() *instrumentation {
- if !x.Observability.Enabled() {
- return nil, nil
- }
-
- m := otel.GetMeterProvider().Meter(/* initialize meter */)
- counter, err := otelconv.NewSDKComponentCounter(m)
- if err != nil {
- // ❌ Do not dump the error to the OTel Handler. Return it to the
- // caller.
- otel.Handle(err)
- // ❌ Do not return nil if we can still use the partially initialized
- // counter.
- return nil
- }
- return &instrumentation{counter: counter}
-}
-```
-
-If the instrumented component cannot report the error to the user, let it report the error to `otel.Handle`.
-
-#### Context Propagation
-
-Ensure observability measurements receive the correct context, especially for trace exemplars and distributed context:
-
-```go
-func (e *Exporter) ExportSpans(ctx context.Context, spans []trace.ReadOnlySpan) error {
- // Use the provided context for observability measurements
- e.inst.recordSpanExportStarted(ctx, len(spans))
-
- err := e.doExport(ctx, spans)
-
- if err != nil {
- e.inst.recordSpanExportFailed(ctx, len(spans), err)
- } else {
- e.inst.recordSpanExportSucceeded(ctx, len(spans))
- }
-
- return err
-}
-```
-
-```go
-// ❌ Avoid this pattern.
-func (e *Exporter) ExportSpans(ctx context.Context, spans []trace.ReadOnlySpan) error {
- // ❌ Do not break the context propagation.
- e.inst.recordSpanExportStarted(context.Background(), len(spans))
-
- err := e.doExport(ctx, spans)
-
- /* ... */
-
- return err
-}
-```
-
-#### Semantic Conventions Compliance
-
-All observability metrics should follow the [OpenTelemetry Semantic Conventions for SDK metrics](https://github.com/open-telemetry/semantic-conventions/blob/1cf2476ae5e518225a766990a28a6d5602bd5a30/docs/otel/sdk-metrics.md).
-
-Use the metric semantic conventions convenience package [otelconv](./semconv/v1.37.0/otelconv/metric.go).
-
-##### Component Identification
-
-Component names and types should follow [semantic convention](https://github.com/open-telemetry/semantic-conventions/blob/1cf2476ae5e518225a766990a28a6d5602bd5a30/docs/registry/attributes/otel.md#otel-component-attributes).
-
-If a component is not a well-known type specified in the semantic conventions, use the package path scope type as a stable identifier.
-
-```go
-componentType := "go.opentelemetry.io/otel/sdk/trace.Span"
-```
-
-```go
-// ❌ Do not do this.
-componentType := "trace-span"
-```
-
-The component name should be a stable unique identifier for the specific instance of the component.
-
-Use a global counter to ensure uniqueness if necessary.
-
-```go
-// Unique 0-based ID counter for component instances.
-var componentIDCounter atomic.Int64
-
-// nextID returns the next unique ID for a component.
-func nextID() int64 {
- return componentIDCounter.Add(1) - 1
-}
-
-// componentName returns a unique name for the component instance.
-func componentName() attribute.KeyValue {
- id := nextID()
- name := fmt.Sprintf("%s/%d", componentType, id)
- return semconv.OTelComponentName(name)
-}
-```
-
-The component ID will need to be resettable for deterministic testing.
-If tests are in a different package than the component being tested (i.e. a `_test` package name), use a generated `counter` internal package to manage the counter.
-See [stdouttrace exporter example](./exporters/stdout/stdouttrace/internal/gen.go) for reference.
-
-#### Testing
-
-Use deterministic testing with isolated state:
-
-```go
-func TestObservability(t *testing.T) {
- // Restore state after test to ensure this does not affect other tests.
- prev := otel.GetMeterProvider()
- t.Cleanup(func() { otel.SetMeterProvider(prev) })
-
- // Isolate the meter provider for deterministic testing
- reader := metric.NewManualReader()
- meterProvider := metric.NewMeterProvider(metric.WithReader(reader))
- otel.SetMeterProvider(meterProvider)
-
- // Use t.Setenv to ensure environment variable is restored after test.
- t.Setenv("OTEL_GO_X_OBSERVABILITY", "true")
-
- // Reset component ID counter to ensure deterministic component names.
- componentIDCounter.Store(0)
-
- /* ... test code ... */
-}
-```
-
-Test order should not affect results.
-Ensure that any global state (e.g. component ID counters) is reset between tests.
-
## Approvers and Maintainers
### Maintainers
@@ -1130,6 +696,7 @@ For more information about the approver role, see the [community repository](htt
### Triagers
- [Alex Kats](https://github.com/akats7), Capital One
+- [Cheng-Zhen Yang](https://github.com/scorpionknifes), Independent
For more information about the triager role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#triager).
@@ -1137,7 +704,6 @@ For more information about the triager role, see the [community repository](http
- [Aaron Clawson](https://github.com/MadVikingGod)
- [Anthony Mirabella](https://github.com/Aneurysm9)
-- [Cheng-Zhen Yang](https://github.com/scorpionknifes)
- [Chester Cheung](https://github.com/hanyuancheung)
- [Evan Torrie](https://github.com/evantorrie)
- [Gustavo Silva Paiva](https://github.com/paivagustavo)
diff --git a/vendor/go.opentelemetry.io/otel/Makefile b/vendor/go.opentelemetry.io/otel/Makefile
index 44870248c3..bc0f1f92d1 100644
--- a/vendor/go.opentelemetry.io/otel/Makefile
+++ b/vendor/go.opentelemetry.io/otel/Makefile
@@ -146,12 +146,11 @@ build-tests/%:
# Tests
-TEST_TARGETS := test-default test-bench test-short test-verbose test-race test-concurrent-safe test-fuzz
+TEST_TARGETS := test-default test-bench test-short test-verbose test-race test-concurrent-safe
.PHONY: $(TEST_TARGETS) test
test-default test-race: ARGS=-race
test-bench: ARGS=-run=xxxxxMatchNothingxxxxx -test.benchtime=1ms -bench=.
test-short: ARGS=-short
-test-fuzz: ARGS=-fuzztime=10s -fuzz
test-verbose: ARGS=-v -race
test-concurrent-safe: ARGS=-run=ConcurrentSafe -count=100 -race
test-concurrent-safe: TIMEOUT=120
diff --git a/vendor/go.opentelemetry.io/otel/README.md b/vendor/go.opentelemetry.io/otel/README.md
index c633595431..6b7ab5f219 100644
--- a/vendor/go.opentelemetry.io/otel/README.md
+++ b/vendor/go.opentelemetry.io/otel/README.md
@@ -55,18 +55,25 @@ Currently, this project supports the following environments.
|----------|------------|--------------|
| Ubuntu | 1.25 | amd64 |
| Ubuntu | 1.24 | amd64 |
+| Ubuntu | 1.23 | amd64 |
| Ubuntu | 1.25 | 386 |
| Ubuntu | 1.24 | 386 |
+| Ubuntu | 1.23 | 386 |
| Ubuntu | 1.25 | arm64 |
| Ubuntu | 1.24 | arm64 |
-| macOS | 1.25 | amd64 |
-| macOS | 1.24 | amd64 |
+| Ubuntu | 1.23 | arm64 |
+| macOS 13 | 1.25 | amd64 |
+| macOS 13 | 1.24 | amd64 |
+| macOS 13 | 1.23 | amd64 |
| macOS | 1.25 | arm64 |
| macOS | 1.24 | arm64 |
+| macOS | 1.23 | arm64 |
| Windows | 1.25 | amd64 |
| Windows | 1.24 | amd64 |
+| Windows | 1.23 | amd64 |
| Windows | 1.25 | 386 |
| Windows | 1.24 | 386 |
+| Windows | 1.23 | 386 |
While this project should work for other systems, no compatibility guarantees
are made for those systems currently.
diff --git a/vendor/go.opentelemetry.io/otel/RELEASING.md b/vendor/go.opentelemetry.io/otel/RELEASING.md
index 861756fd74..1ddcdef039 100644
--- a/vendor/go.opentelemetry.io/otel/RELEASING.md
+++ b/vendor/go.opentelemetry.io/otel/RELEASING.md
@@ -24,7 +24,7 @@ Ensure things look correct before submitting a pull request to include the addit
## Breaking changes validation
-You can run `make gorelease` which runs [gorelease](https://pkg.go.dev/golang.org/x/exp/cmd/gorelease) to ensure that there are no unwanted changes made in the public API.
+You can run `make gorelease` that runs [gorelease](https://pkg.go.dev/golang.org/x/exp/cmd/gorelease) to ensure that there are no unwanted changes done in the public API.
You can check/report problems with `gorelease` [here](https://golang.org/issues/26420).
@@ -62,7 +62,7 @@ Update go.mod for submodules to depend on the new release which will happen in t
```
3. Update the [Changelog](./CHANGELOG.md).
- - Make sure all relevant changes for this release are included and are written in language that non-contributors to the project can understand.
+ - Make sure all relevant changes for this release are included and are in language that non-contributors to the project can understand.
To verify this, you can look directly at the commits since the ``.
```
@@ -107,50 +107,34 @@ It is critical you make sure the version you push upstream is correct.
...
```
-## Sign artifacts
+## Release
-To ensure we comply with CNCF best practices, we need to sign the release artifacts.
+Finally create a Release for the new `` on GitHub.
+The release body should include all the release notes from the Changelog for this release.
-Download the `.tar.gz` and `.zip` archives from the [tags page](https://github.com/open-telemetry/opentelemetry-go/tags) for the new release tag.
-Both archives need to be signed with your GPG key.
+### Sign the Release Artifact
-You can use [this script] to verify the contents of the archives before signing them.
+To ensure we comply with CNCF best practices, we need to sign the release artifact.
+The tarball attached to the GitHub release needs to be signed with your GPG key.
-To find your GPG key ID, run:
+Follow [these steps] to sign the release artifact and upload it to GitHub.
+You can use [this script] to verify the contents of the tarball before signing it.
-```terminal
-gpg --list-secret-keys --keyid-format=long
-```
-
-The key ID is the 16-character string after `sec rsa4096/` (or similar).
-
-Set environment variables and sign both artifacts:
+Be sure to use the correct GPG key when signing the release artifact.
```terminal
-export VERSION="" # e.g., v1.32.0
-export KEY_ID=""
-
-gpg --local-user $KEY_ID --armor --detach-sign opentelemetry-go-$VERSION.tar.gz
-gpg --local-user $KEY_ID --armor --detach-sign opentelemetry-go-$VERSION.zip
+gpg --local-user --armor --detach-sign opentelemetry-go-.tar.gz
```
-You can verify the signatures with:
+You can verify the signature with:
```terminal
-gpg --verify opentelemetry-go-$VERSION.tar.gz.asc opentelemetry-go-$VERSION.tar.gz
-gpg --verify opentelemetry-go-$VERSION.zip.asc opentelemetry-go-$VERSION.zip
+gpg --verify opentelemetry-go-.tar.gz.asc opentelemetry-go-.tar.gz
```
+[these steps]: https://wiki.debian.org/Creating%20signed%20GitHub%20releases
[this script]: https://github.com/MrAlias/attest-sh
-## Release
-
-Finally create a Release for the new `` on GitHub.
-The release body should include all the release notes from the Changelog for this release.
-
-***IMPORTANT***: GitHub Releases are immutable once created.
-You must upload the signed artifacts (`.tar.gz`, `.tar.gz.asc`, `.zip`, and `.zip.asc`) when creating the release, as they cannot be added or modified later.
-
## Post-Release
### Contrib Repository
@@ -176,6 +160,14 @@ This helps track what changes were included in each release.
Once all related issues and PRs have been added to the milestone, close the milestone.
+### Demo Repository
+
+Bump the dependencies in the following Go services:
+
+- [`accounting`](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/accounting)
+- [`checkoutservice`](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/checkout)
+- [`productcatalogservice`](https://github.com/open-telemetry/opentelemetry-demo/tree/main/src/product-catalog)
+
### Close the `Version Release` issue
Once the todo list in the `Version Release` issue is complete, close the issue.
diff --git a/vendor/go.opentelemetry.io/otel/VERSIONING.md b/vendor/go.opentelemetry.io/otel/VERSIONING.md
index b27c9e84f5..b8cb605c16 100644
--- a/vendor/go.opentelemetry.io/otel/VERSIONING.md
+++ b/vendor/go.opentelemetry.io/otel/VERSIONING.md
@@ -83,7 +83,7 @@ is designed so the following goals can be achieved.
in either the module path or the import path.
* In addition to public APIs, telemetry produced by stable instrumentation
will remain stable and backwards compatible. This is to avoid breaking
- alerts and dashboards.
+ alerts and dashboard.
* Modules will be used to encapsulate instrumentation, detectors, exporters,
propagators, and any other independent sets of related components.
* Experimental modules still under active development will be versioned at
diff --git a/vendor/go.opentelemetry.io/otel/attribute/encoder.go b/vendor/go.opentelemetry.io/otel/attribute/encoder.go
index 6cc1a1655c..6333d34b31 100644
--- a/vendor/go.opentelemetry.io/otel/attribute/encoder.go
+++ b/vendor/go.opentelemetry.io/otel/attribute/encoder.go
@@ -16,7 +16,7 @@ type (
// set into a wire representation.
Encoder interface {
// Encode returns the serialized encoding of the attribute set using
- // its Iterator. This result may be cached by an attribute.Set.
+ // its Iterator. This result may be cached by a attribute.Set.
Encode(iterator Iterator) string
// ID returns a value that is unique for each class of attribute
diff --git a/vendor/go.opentelemetry.io/otel/attribute/hash.go b/vendor/go.opentelemetry.io/otel/attribute/hash.go
deleted file mode 100644
index 6aa69aeaec..0000000000
--- a/vendor/go.opentelemetry.io/otel/attribute/hash.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-package attribute // import "go.opentelemetry.io/otel/attribute"
-
-import (
- "fmt"
- "reflect"
-
- "go.opentelemetry.io/otel/attribute/internal/xxhash"
-)
-
-// Type identifiers. These identifiers are hashed before the value of the
-// corresponding type. This is done to distinguish values that are hashed with
-// the same value representation (e.g. `int64(1)` and `true`, []int64{0} and
-// int64(0)).
-//
-// These are all 8 byte length strings converted to a uint64 representation. A
-// uint64 is used instead of the string directly as an optimization, it avoids
-// the for loop in [xxhash] which adds minor overhead.
-const (
- boolID uint64 = 7953749933313450591 // "_boolean" (little endian)
- int64ID uint64 = 7592915492740740150 // "64_bit_i" (little endian)
- float64ID uint64 = 7376742710626956342 // "64_bit_f" (little endian)
- stringID uint64 = 6874584755375207263 // "_string_" (little endian)
- boolSliceID uint64 = 6875993255270243167 // "_[]bool_" (little endian)
- int64SliceID uint64 = 3762322556277578591 // "_[]int64" (little endian)
- float64SliceID uint64 = 7308324551835016539 // "[]double" (little endian)
- stringSliceID uint64 = 7453010373645655387 // "[]string" (little endian)
-)
-
-// hashKVs returns a new xxHash64 hash of kvs.
-func hashKVs(kvs []KeyValue) uint64 {
- h := xxhash.New()
- for _, kv := range kvs {
- h = hashKV(h, kv)
- }
- return h.Sum64()
-}
-
-// hashKV returns the xxHash64 hash of kv with h as the base.
-func hashKV(h xxhash.Hash, kv KeyValue) xxhash.Hash {
- h = h.String(string(kv.Key))
-
- switch kv.Value.Type() {
- case BOOL:
- h = h.Uint64(boolID)
- h = h.Uint64(kv.Value.numeric)
- case INT64:
- h = h.Uint64(int64ID)
- h = h.Uint64(kv.Value.numeric)
- case FLOAT64:
- h = h.Uint64(float64ID)
- // Assumes numeric stored with math.Float64bits.
- h = h.Uint64(kv.Value.numeric)
- case STRING:
- h = h.Uint64(stringID)
- h = h.String(kv.Value.stringly)
- case BOOLSLICE:
- h = h.Uint64(boolSliceID)
- rv := reflect.ValueOf(kv.Value.slice)
- for i := 0; i < rv.Len(); i++ {
- h = h.Bool(rv.Index(i).Bool())
- }
- case INT64SLICE:
- h = h.Uint64(int64SliceID)
- rv := reflect.ValueOf(kv.Value.slice)
- for i := 0; i < rv.Len(); i++ {
- h = h.Int64(rv.Index(i).Int())
- }
- case FLOAT64SLICE:
- h = h.Uint64(float64SliceID)
- rv := reflect.ValueOf(kv.Value.slice)
- for i := 0; i < rv.Len(); i++ {
- h = h.Float64(rv.Index(i).Float())
- }
- case STRINGSLICE:
- h = h.Uint64(stringSliceID)
- rv := reflect.ValueOf(kv.Value.slice)
- for i := 0; i < rv.Len(); i++ {
- h = h.String(rv.Index(i).String())
- }
- case INVALID:
- default:
- // Logging is an alternative, but using the internal logger here
- // causes an import cycle so it is not done.
- v := kv.Value.AsInterface()
- msg := fmt.Sprintf("unknown value type: %[1]v (%[1]T)", v)
- panic(msg)
- }
- return h
-}
diff --git a/vendor/go.opentelemetry.io/otel/attribute/internal/xxhash/xxhash.go b/vendor/go.opentelemetry.io/otel/attribute/internal/xxhash/xxhash.go
deleted file mode 100644
index 113a978383..0000000000
--- a/vendor/go.opentelemetry.io/otel/attribute/internal/xxhash/xxhash.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Package xxhash provides a wrapper around the xxhash library for attribute hashing.
-package xxhash // import "go.opentelemetry.io/otel/attribute/internal/xxhash"
-
-import (
- "encoding/binary"
- "math"
-
- "github.com/cespare/xxhash/v2"
-)
-
-// Hash wraps xxhash.Digest to provide an API friendly for hashing attribute values.
-type Hash struct {
- d *xxhash.Digest
-}
-
-// New returns a new initialized xxHash64 hasher.
-func New() Hash {
- return Hash{d: xxhash.New()}
-}
-
-func (h Hash) Uint64(val uint64) Hash {
- var buf [8]byte
- binary.LittleEndian.PutUint64(buf[:], val)
- // errors from Write are always nil for xxhash
- // if it returns an err then panic
- _, err := h.d.Write(buf[:])
- if err != nil {
- panic("xxhash write of uint64 failed: " + err.Error())
- }
- return h
-}
-
-func (h Hash) Bool(val bool) Hash { // nolint:revive // This is a hashing function.
- if val {
- return h.Uint64(1)
- }
- return h.Uint64(0)
-}
-
-func (h Hash) Float64(val float64) Hash {
- return h.Uint64(math.Float64bits(val))
-}
-
-func (h Hash) Int64(val int64) Hash {
- return h.Uint64(uint64(val)) // nolint:gosec // Overflow doesn't matter since we are hashing.
-}
-
-func (h Hash) String(val string) Hash {
- // errors from WriteString are always nil for xxhash
- // if it returns an err then panic
- _, err := h.d.WriteString(val)
- if err != nil {
- panic("xxhash write of string failed: " + err.Error())
- }
- return h
-}
-
-// Sum64 returns the current hash value.
-func (h Hash) Sum64() uint64 {
- return h.d.Sum64()
-}
diff --git a/vendor/go.opentelemetry.io/otel/attribute/set.go b/vendor/go.opentelemetry.io/otel/attribute/set.go
index 911d557ee5..64735d382e 100644
--- a/vendor/go.opentelemetry.io/otel/attribute/set.go
+++ b/vendor/go.opentelemetry.io/otel/attribute/set.go
@@ -9,8 +9,6 @@ import (
"reflect"
"slices"
"sort"
-
- "go.opentelemetry.io/otel/attribute/internal/xxhash"
)
type (
@@ -25,19 +23,19 @@ type (
// the Equals method to ensure stable equivalence checking.
//
// Users should also use the Distinct returned from Equivalent as a map key
- // instead of a Set directly. Set has relatively poor performance when used
- // as a map key compared to Distinct.
+ // instead of a Set directly. In addition to that type providing guarantees
+ // on stable equivalence, it may also provide performance improvements.
Set struct {
- hash uint64
- data any
+ equivalent Distinct
}
- // Distinct is an identifier of a Set which is very likely to be unique.
+ // Distinct is a unique identifier of a Set.
//
- // Distinct should be used as a map key instead of a Set for to provide better
- // performance for map operations.
+ // Distinct is designed to ensure equivalence stability: comparisons will
+ // return the same value across versions. For this reason, Distinct should
+ // always be used as a map key instead of a Set.
Distinct struct {
- hash uint64
+ iface any
}
// Sortable implements sort.Interface, used for sorting KeyValue.
@@ -48,34 +46,15 @@ type (
Sortable []KeyValue
)
-// Compile time check these types remain comparable.
-var (
- _ = isComparable(Set{})
- _ = isComparable(Distinct{})
-)
-
-func isComparable[T comparable](t T) T { return t }
-
var (
// keyValueType is used in computeDistinctReflect.
keyValueType = reflect.TypeOf(KeyValue{})
- // emptyHash is the hash of an empty set.
- emptyHash = xxhash.New().Sum64()
-
- // userDefinedEmptySet is an empty set. It was mistakenly exposed to users
- // as something they can assign to, so it must remain addressable and
- // mutable.
- //
- // This is kept for backwards compatibility, but should not be used in new code.
- userDefinedEmptySet = &Set{
- hash: emptyHash,
- data: [0]KeyValue{},
- }
-
- emptySet = Set{
- hash: emptyHash,
- data: [0]KeyValue{},
+ // emptySet is returned for empty attribute sets.
+ emptySet = &Set{
+ equivalent: Distinct{
+ iface: [0]KeyValue{},
+ },
}
)
@@ -83,35 +62,33 @@ var (
//
// This is a convenience provided for optimized calling utility.
func EmptySet() *Set {
- // Continue to return the pointer to the user-defined empty set for
- // backwards-compatibility.
- //
- // New code should not use this, instead use emptySet.
- return userDefinedEmptySet
+ return emptySet
}
-// Valid reports whether this value refers to a valid Set.
-func (d Distinct) Valid() bool { return d.hash != 0 }
-
// reflectValue abbreviates reflect.ValueOf(d).
-func (l Set) reflectValue() reflect.Value {
- return reflect.ValueOf(l.data)
+func (d Distinct) reflectValue() reflect.Value {
+ return reflect.ValueOf(d.iface)
+}
+
+// Valid reports whether this value refers to a valid Set.
+func (d Distinct) Valid() bool {
+ return d.iface != nil
}
// Len returns the number of attributes in this set.
func (l *Set) Len() int {
- if l == nil || l.hash == 0 {
+ if l == nil || !l.equivalent.Valid() {
return 0
}
- return l.reflectValue().Len()
+ return l.equivalent.reflectValue().Len()
}
// Get returns the KeyValue at ordered position idx in this set.
func (l *Set) Get(idx int) (KeyValue, bool) {
- if l == nil || l.hash == 0 {
+ if l == nil || !l.equivalent.Valid() {
return KeyValue{}, false
}
- value := l.reflectValue()
+ value := l.equivalent.reflectValue()
if idx >= 0 && idx < value.Len() {
// Note: The Go compiler successfully avoids an allocation for
@@ -124,10 +101,10 @@ func (l *Set) Get(idx int) (KeyValue, bool) {
// Value returns the value of a specified key in this set.
func (l *Set) Value(k Key) (Value, bool) {
- if l == nil || l.hash == 0 {
+ if l == nil || !l.equivalent.Valid() {
return Value{}, false
}
- rValue := l.reflectValue()
+ rValue := l.equivalent.reflectValue()
vlen := rValue.Len()
idx := sort.Search(vlen, func(idx int) bool {
@@ -167,29 +144,20 @@ func (l *Set) ToSlice() []KeyValue {
return iter.ToSlice()
}
-// Equivalent returns a value that may be used as a map key. Equal Distinct
-// values are very likely to be equivalent attribute Sets. Distinct value of any
+// Equivalent returns a value that may be used as a map key. The Distinct type
+// guarantees that the result will equal the equivalent. Distinct value of any
// attribute set with the same elements as this, where sets are made unique by
// choosing the last value in the input for any given key.
func (l *Set) Equivalent() Distinct {
- if l == nil || l.hash == 0 {
- return Distinct{hash: emptySet.hash}
+ if l == nil || !l.equivalent.Valid() {
+ return emptySet.equivalent
}
- return Distinct{hash: l.hash}
+ return l.equivalent
}
// Equals reports whether the argument set is equivalent to this set.
func (l *Set) Equals(o *Set) bool {
- if l.Equivalent() != o.Equivalent() {
- return false
- }
- if l == nil || l.hash == 0 {
- l = &emptySet
- }
- if o == nil || o.hash == 0 {
- o = &emptySet
- }
- return l.data == o.data
+ return l.Equivalent() == o.Equivalent()
}
// Encoded returns the encoded form of this set, according to encoder.
@@ -201,6 +169,12 @@ func (l *Set) Encoded(encoder Encoder) string {
return encoder.Encode(l.Iter())
}
+func empty() Set {
+ return Set{
+ equivalent: emptySet.equivalent,
+ }
+}
+
// NewSet returns a new Set. See the documentation for
// NewSetWithSortableFiltered for more details.
//
@@ -230,7 +204,7 @@ func NewSetWithSortable(kvs []KeyValue, _ *Sortable) Set {
func NewSetWithFiltered(kvs []KeyValue, filter Filter) (Set, []KeyValue) {
// Check for empty set.
if len(kvs) == 0 {
- return emptySet, nil
+ return empty(), nil
}
// Stable sort so the following de-duplication can implement
@@ -259,10 +233,10 @@ func NewSetWithFiltered(kvs []KeyValue, filter Filter) (Set, []KeyValue) {
if filter != nil {
if div := filteredToFront(kvs, filter); div != 0 {
- return newSet(kvs[div:]), kvs[:div]
+ return Set{equivalent: computeDistinct(kvs[div:])}, kvs[:div]
}
}
- return newSet(kvs), nil
+ return Set{equivalent: computeDistinct(kvs)}, nil
}
// NewSetWithSortableFiltered returns a new Set.
@@ -342,7 +316,7 @@ func (l *Set) Filter(re Filter) (Set, []KeyValue) {
if first == 0 {
// It is safe to assume len(slice) >= 1 given we found at least one
// attribute above that needs to be filtered out.
- return newSet(slice[1:]), slice[:1]
+ return Set{equivalent: computeDistinct(slice[1:])}, slice[:1]
}
// Move the filtered slice[first] to the front (preserving order).
@@ -352,24 +326,25 @@ func (l *Set) Filter(re Filter) (Set, []KeyValue) {
// Do not re-evaluate re(slice[first+1:]).
div := filteredToFront(slice[1:first+1], re) + 1
- return newSet(slice[div:]), slice[:div]
+ return Set{equivalent: computeDistinct(slice[div:])}, slice[:div]
}
-// newSet returns a new set based on the sorted and uniqued kvs.
-func newSet(kvs []KeyValue) Set {
- s := Set{
- hash: hashKVs(kvs),
- data: computeDataFixed(kvs),
+// computeDistinct returns a Distinct using either the fixed- or
+// reflect-oriented code path, depending on the size of the input. The input
+// slice is assumed to already be sorted and de-duplicated.
+func computeDistinct(kvs []KeyValue) Distinct {
+ iface := computeDistinctFixed(kvs)
+ if iface == nil {
+ iface = computeDistinctReflect(kvs)
}
- if s.data == nil {
- s.data = computeDataReflect(kvs)
+ return Distinct{
+ iface: iface,
}
- return s
}
-// computeDataFixed computes a Set data for small slices. It returns nil if the
-// input is too large for this code path.
-func computeDataFixed(kvs []KeyValue) any {
+// computeDistinctFixed computes a Distinct for small slices. It returns nil
+// if the input is too large for this code path.
+func computeDistinctFixed(kvs []KeyValue) any {
switch len(kvs) {
case 1:
return [1]KeyValue(kvs)
@@ -396,9 +371,9 @@ func computeDataFixed(kvs []KeyValue) any {
}
}
-// computeDataReflect computes a Set data using reflection, works for any size
-// input.
-func computeDataReflect(kvs []KeyValue) any {
+// computeDistinctReflect computes a Distinct using reflection, works for any
+// size input.
+func computeDistinctReflect(kvs []KeyValue) any {
at := reflect.New(reflect.ArrayOf(len(kvs), keyValueType)).Elem()
for i, keyValue := range kvs {
*(at.Index(i).Addr().Interface().(*KeyValue)) = keyValue
@@ -408,7 +383,7 @@ func computeDataReflect(kvs []KeyValue) any {
// MarshalJSON returns the JSON encoding of the Set.
func (l *Set) MarshalJSON() ([]byte, error) {
- return json.Marshal(l.data)
+ return json.Marshal(l.equivalent.iface)
}
// MarshalLog is the marshaling function used by the logging system to represent this Set.
diff --git a/vendor/go.opentelemetry.io/otel/attribute/type_string.go b/vendor/go.opentelemetry.io/otel/attribute/type_string.go
index 24f1fa37db..e584b24776 100644
--- a/vendor/go.opentelemetry.io/otel/attribute/type_string.go
+++ b/vendor/go.opentelemetry.io/otel/attribute/type_string.go
@@ -24,9 +24,8 @@ const _Type_name = "INVALIDBOOLINT64FLOAT64STRINGBOOLSLICEINT64SLICEFLOAT64SLICE
var _Type_index = [...]uint8{0, 7, 11, 16, 23, 29, 38, 48, 60, 71}
func (i Type) String() string {
- idx := int(i) - 0
- if i < 0 || idx >= len(_Type_index)-1 {
+ if i < 0 || i >= Type(len(_Type_index)-1) {
return "Type(" + strconv.FormatInt(int64(i), 10) + ")"
}
- return _Type_name[_Type_index[idx]:_Type_index[idx+1]]
+ return _Type_name[_Type_index[i]:_Type_index[i+1]]
}
diff --git a/vendor/go.opentelemetry.io/otel/baggage/baggage.go b/vendor/go.opentelemetry.io/otel/baggage/baggage.go
index 78e98c4c0f..f83a448ec6 100644
--- a/vendor/go.opentelemetry.io/otel/baggage/baggage.go
+++ b/vendor/go.opentelemetry.io/otel/baggage/baggage.go
@@ -648,7 +648,7 @@ func parsePropertyInternal(s string) (p Property, ok bool) {
// If we couldn't find any valid key character,
// it means the key is either empty or invalid.
if keyStart == keyEnd {
- return p, ok
+ return
}
// Skip spaces after the key: " key< >= value ".
@@ -658,13 +658,13 @@ func parsePropertyInternal(s string) (p Property, ok bool) {
// A key can have no value, like: " key ".
ok = true
p.key = s[keyStart:keyEnd]
- return p, ok
+ return
}
// If we have not reached the end and we can't find the '=' delimiter,
// it means the property is invalid.
if s[index] != keyValueDelimiter[0] {
- return p, ok
+ return
}
// Attempting to parse the value.
@@ -690,14 +690,14 @@ func parsePropertyInternal(s string) (p Property, ok bool) {
// we have not reached the end, it means the property is
// invalid, something like: " key = value value1".
if index != len(s) {
- return p, ok
+ return
}
// Decode a percent-encoded value.
rawVal := s[valueStart:valueEnd]
unescapeVal, err := url.PathUnescape(rawVal)
if err != nil {
- return p, ok
+ return
}
value := replaceInvalidUTF8Sequences(len(rawVal), unescapeVal)
@@ -706,7 +706,7 @@ func parsePropertyInternal(s string) (p Property, ok bool) {
p.hasValue = true
p.value = value
- return p, ok
+ return
}
func skipSpace(s string, offset int) int {
diff --git a/vendor/go.opentelemetry.io/otel/dependencies.Dockerfile b/vendor/go.opentelemetry.io/otel/dependencies.Dockerfile
index cadb87cc0e..a311fbb483 100644
--- a/vendor/go.opentelemetry.io/otel/dependencies.Dockerfile
+++ b/vendor/go.opentelemetry.io/otel/dependencies.Dockerfile
@@ -1,4 +1,4 @@
# This is a renovate-friendly source of Docker images.
FROM python:3.13.6-slim-bullseye@sha256:e98b521460ee75bca92175c16247bdf7275637a8faaeb2bcfa19d879ae5c4b9a AS python
-FROM otel/weaver:v0.19.0@sha256:3d20814cef548f1d31f27f054fb4cd6a05125641a9f7cc29fc7eb234e8052cd9 AS weaver
+FROM otel/weaver:v0.17.1@sha256:32523b5e44fb44418786347e9f7dde187d8797adb6d57a2ee99c245346c3cdfe AS weaver
FROM avtodev/markdown-lint:v1@sha256:6aeedc2f49138ce7a1cd0adffc1b1c0321b841dc2102408967d9301c031949ee AS markdown
diff --git a/vendor/go.opentelemetry.io/otel/internal/global/meter.go b/vendor/go.opentelemetry.io/otel/internal/global/meter.go
index 6db969f73c..adb37b5b0e 100644
--- a/vendor/go.opentelemetry.io/otel/internal/global/meter.go
+++ b/vendor/go.opentelemetry.io/otel/internal/global/meter.go
@@ -105,7 +105,7 @@ type delegatedInstrument interface {
setDelegate(metric.Meter)
}
-// instID are the identifying properties of an instrument.
+// instID are the identifying properties of a instrument.
type instID struct {
// name is the name of the stream.
name string
diff --git a/vendor/go.opentelemetry.io/otel/metric.go b/vendor/go.opentelemetry.io/otel/metric.go
index 527d9aec86..1e6473b32f 100644
--- a/vendor/go.opentelemetry.io/otel/metric.go
+++ b/vendor/go.opentelemetry.io/otel/metric.go
@@ -11,7 +11,7 @@ import (
// Meter returns a Meter from the global MeterProvider. The name must be the
// name of the library providing instrumentation. This name may be the same as
// the instrumented code only if that code provides built-in instrumentation.
-// If the name is empty, then an implementation defined default name will be
+// If the name is empty, then a implementation defined default name will be
// used instead.
//
// If this is called before a global MeterProvider is registered the returned
diff --git a/vendor/go.opentelemetry.io/otel/metric/config.go b/vendor/go.opentelemetry.io/otel/metric/config.go
index e42dd6e70a..d9e3b13e4d 100644
--- a/vendor/go.opentelemetry.io/otel/metric/config.go
+++ b/vendor/go.opentelemetry.io/otel/metric/config.go
@@ -3,11 +3,7 @@
package metric // import "go.opentelemetry.io/otel/metric"
-import (
- "slices"
-
- "go.opentelemetry.io/otel/attribute"
-)
+import "go.opentelemetry.io/otel/attribute"
// MeterConfig contains options for Meters.
type MeterConfig struct {
@@ -66,38 +62,12 @@ func WithInstrumentationVersion(version string) MeterOption {
})
}
-// WithInstrumentationAttributes adds the instrumentation attributes.
-//
-// This is equivalent to calling [WithInstrumentationAttributeSet] with an
-// [attribute.Set] created from a clone of the passed attributes.
-// [WithInstrumentationAttributeSet] is recommended for more control.
+// WithInstrumentationAttributes sets the instrumentation attributes.
//
-// If multiple [WithInstrumentationAttributes] or [WithInstrumentationAttributeSet]
-// options are passed, the attributes will be merged together in the order
-// they are passed. Attributes with duplicate keys will use the last value passed.
+// The passed attributes will be de-duplicated.
func WithInstrumentationAttributes(attr ...attribute.KeyValue) MeterOption {
- set := attribute.NewSet(slices.Clone(attr)...)
- return WithInstrumentationAttributeSet(set)
-}
-
-// WithInstrumentationAttributeSet adds the instrumentation attributes.
-//
-// If multiple [WithInstrumentationAttributes] or [WithInstrumentationAttributeSet]
-// options are passed, the attributes will be merged together in the order
-// they are passed. Attributes with duplicate keys will use the last value passed.
-func WithInstrumentationAttributeSet(set attribute.Set) MeterOption {
- if set.Len() == 0 {
- return meterOptionFunc(func(config MeterConfig) MeterConfig {
- return config
- })
- }
-
return meterOptionFunc(func(config MeterConfig) MeterConfig {
- if config.attrs.Len() == 0 {
- config.attrs = set
- } else {
- config.attrs = mergeSets(config.attrs, set)
- }
+ config.attrs = attribute.NewSet(attr...)
return config
})
}
diff --git a/vendor/go.opentelemetry.io/otel/propagation/trace_context.go b/vendor/go.opentelemetry.io/otel/propagation/trace_context.go
index 271ab71f1a..6692d2665d 100644
--- a/vendor/go.opentelemetry.io/otel/propagation/trace_context.go
+++ b/vendor/go.opentelemetry.io/otel/propagation/trace_context.go
@@ -111,7 +111,7 @@ func (TraceContext) extract(carrier TextMapCarrier) trace.SpanContext {
}
// Clear all flags other than the trace-context supported sampling bit.
- scc.TraceFlags = trace.TraceFlags(opts[0]) & trace.FlagsSampled // nolint:gosec // slice size already checked.
+ scc.TraceFlags = trace.TraceFlags(opts[0]) & trace.FlagsSampled
// Ignore the error returned here. Failure to parse tracestate MUST NOT
// affect the parsing of traceparent according to the W3C tracecontext
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/env/env.go b/vendor/go.opentelemetry.io/otel/sdk/internal/env/env.go
similarity index 98%
rename from vendor/go.opentelemetry.io/otel/sdk/trace/internal/env/env.go
rename to vendor/go.opentelemetry.io/otel/sdk/internal/env/env.go
index 58f68df441..e3309231d4 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/env/env.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/internal/env/env.go
@@ -3,7 +3,7 @@
// Package env provides types and functionality for environment variable support
// in the OpenTelemetry SDK.
-package env // import "go.opentelemetry.io/otel/sdk/trace/internal/env"
+package env // import "go.opentelemetry.io/otel/sdk/internal/env"
import (
"os"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/internal/x/features.go b/vendor/go.opentelemetry.io/otel/sdk/internal/x/features.go
deleted file mode 100644
index bfeb73e811..0000000000
--- a/vendor/go.opentelemetry.io/otel/sdk/internal/x/features.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Package x documents experimental features for [go.opentelemetry.io/otel/sdk].
-package x // import "go.opentelemetry.io/otel/sdk/internal/x"
-
-import "strings"
-
-// Resource is an experimental feature flag that defines if resource detectors
-// should be included experimental semantic conventions.
-//
-// To enable this feature set the OTEL_GO_X_RESOURCE environment variable
-// to the case-insensitive string value of "true" (i.e. "True" and "TRUE"
-// will also enable this).
-var Resource = newFeature(
- []string{"RESOURCE"},
- func(v string) (string, bool) {
- if strings.EqualFold(v, "true") {
- return v, true
- }
- return "", false
- },
-)
-
-// Observability is an experimental feature flag that determines if SDK
-// observability metrics are enabled.
-//
-// To enable this feature set the OTEL_GO_X_OBSERVABILITY environment variable
-// to the case-insensitive string value of "true" (i.e. "True" and "TRUE"
-// will also enable this).
-var Observability = newFeature(
- []string{"OBSERVABILITY", "SELF_OBSERVABILITY"},
- func(v string) (string, bool) {
- if strings.EqualFold(v, "true") {
- return v, true
- }
- return "", false
- },
-)
diff --git a/vendor/go.opentelemetry.io/otel/sdk/internal/x/x.go b/vendor/go.opentelemetry.io/otel/sdk/internal/x/x.go
index 13347e5605..1be472e917 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/internal/x/x.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/internal/x/x.go
@@ -1,38 +1,48 @@
-// Code generated by gotmpl. DO NOT MODIFY.
-// source: internal/shared/x/x.go.tmpl
-
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
-// Package x documents experimental features for [go.opentelemetry.io/otel/sdk].
+// Package x contains support for OTel SDK experimental features.
+//
+// This package should only be used for features defined in the specification.
+// It should not be used for experiments or new project ideas.
package x // import "go.opentelemetry.io/otel/sdk/internal/x"
import (
"os"
+ "strings"
)
+// Resource is an experimental feature flag that defines if resource detectors
+// should be included experimental semantic conventions.
+//
+// To enable this feature set the OTEL_GO_X_RESOURCE environment variable
+// to the case-insensitive string value of "true" (i.e. "True" and "TRUE"
+// will also enable this).
+var Resource = newFeature("RESOURCE", func(v string) (string, bool) {
+ if strings.EqualFold(v, "true") {
+ return v, true
+ }
+ return "", false
+})
+
// Feature is an experimental feature control flag. It provides a uniform way
// to interact with these feature flags and parse their values.
type Feature[T any] struct {
- keys []string
+ key string
parse func(v string) (T, bool)
}
-func newFeature[T any](suffix []string, parse func(string) (T, bool)) Feature[T] {
+func newFeature[T any](suffix string, parse func(string) (T, bool)) Feature[T] {
const envKeyRoot = "OTEL_GO_X_"
- keys := make([]string, 0, len(suffix))
- for _, s := range suffix {
- keys = append(keys, envKeyRoot+s)
- }
return Feature[T]{
- keys: keys,
+ key: envKeyRoot + suffix,
parse: parse,
}
}
-// Keys returns the environment variable keys that can be set to enable the
+// Key returns the environment variable key that needs to be set to enable the
// feature.
-func (f Feature[T]) Keys() []string { return f.keys }
+func (f Feature[T]) Key() string { return f.key }
// Lookup returns the user configured value for the feature and true if the
// user has enabled the feature. Otherwise, if the feature is not enabled, a
@@ -42,13 +52,11 @@ func (f Feature[T]) Lookup() (v T, ok bool) {
//
// > The SDK MUST interpret an empty value of an environment variable the
// > same way as when the variable is unset.
- for _, key := range f.keys {
- vRaw := os.Getenv(key)
- if vRaw != "" {
- return f.parse(vRaw)
- }
+ vRaw := os.Getenv(f.key)
+ if vRaw == "" {
+ return v, ok
}
- return v, ok
+ return f.parse(vRaw)
}
// Enabled reports whether the feature is enabled.
diff --git a/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_bsd.go b/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_bsd.go
index 4c1c30f256..cc8b8938ed 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_bsd.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_bsd.go
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//go:build dragonfly || freebsd || netbsd || openbsd || solaris
+// +build dragonfly freebsd netbsd openbsd solaris
package resource // import "go.opentelemetry.io/otel/sdk/resource"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_linux.go b/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_linux.go
index 4a26096c8d..f84f173240 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_linux.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_linux.go
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//go:build linux
+// +build linux
package resource // import "go.opentelemetry.io/otel/sdk/resource"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_unsupported.go b/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_unsupported.go
index 63ad2fa4e0..df12c44c56 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_unsupported.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_unsupported.go
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows
+// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows
package resource // import "go.opentelemetry.io/otel/sdk/resource"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_windows.go b/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_windows.go
index 2b8ca20b38..3677c83d7d 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_windows.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/resource/host_id_windows.go
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//go:build windows
+// +build windows
package resource // import "go.opentelemetry.io/otel/sdk/resource"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/resource/os_release_unix.go b/vendor/go.opentelemetry.io/otel/sdk/resource/os_release_unix.go
index a1763267c2..7252af79fc 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/resource/os_release_unix.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/resource/os_release_unix.go
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//go:build aix || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix dragonfly freebsd linux netbsd openbsd solaris zos
package resource // import "go.opentelemetry.io/otel/sdk/resource"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/resource/os_unix.go b/vendor/go.opentelemetry.io/otel/sdk/resource/os_unix.go
index 6c50ab6867..a6ff26a4d2 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/resource/os_unix.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/resource/os_unix.go
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
+// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
package resource // import "go.opentelemetry.io/otel/sdk/resource"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/resource/os_unsupported.go b/vendor/go.opentelemetry.io/otel/sdk/resource/os_unsupported.go
index 25f629532a..a77742b077 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/resource/os_unsupported.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/resource/os_unsupported.go
@@ -2,6 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !windows && !zos
+// +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows,!zos
package resource // import "go.opentelemetry.io/otel/sdk/resource"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/batch_span_processor.go b/vendor/go.opentelemetry.io/otel/sdk/trace/batch_span_processor.go
index 7d15cbb9c0..9bc3e525d1 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/batch_span_processor.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/trace/batch_span_processor.go
@@ -6,14 +6,20 @@ package trace // import "go.opentelemetry.io/otel/sdk/trace"
import (
"context"
"errors"
+ "fmt"
"sync"
"sync/atomic"
"time"
"go.opentelemetry.io/otel"
+ "go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/internal/global"
- "go.opentelemetry.io/otel/sdk/trace/internal/env"
- "go.opentelemetry.io/otel/sdk/trace/internal/observ"
+ "go.opentelemetry.io/otel/metric"
+ "go.opentelemetry.io/otel/sdk"
+ "go.opentelemetry.io/otel/sdk/internal/env"
+ "go.opentelemetry.io/otel/sdk/trace/internal/x"
+ semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
+ "go.opentelemetry.io/otel/semconv/v1.37.0/otelconv"
"go.opentelemetry.io/otel/trace"
)
@@ -27,6 +33,8 @@ const (
DefaultMaxExportBatchSize = 512
)
+var queueFull = otelconv.ErrorTypeAttr("queue_full")
+
// BatchSpanProcessorOption configures a BatchSpanProcessor.
type BatchSpanProcessorOption func(o *BatchSpanProcessorOptions)
@@ -70,7 +78,10 @@ type batchSpanProcessor struct {
queue chan ReadOnlySpan
dropped uint32
- inst *observ.BSP
+ selfObservabilityEnabled bool
+ callbackRegistration metric.Registration
+ spansProcessedCounter otelconv.SDKProcessorSpanProcessed
+ componentNameAttr attribute.KeyValue
batch []ReadOnlySpan
batchMutex sync.Mutex
@@ -113,14 +124,19 @@ func NewBatchSpanProcessor(exporter SpanExporter, options ...BatchSpanProcessorO
stopCh: make(chan struct{}),
}
- var err error
- bsp.inst, err = observ.NewBSP(
- nextProcessorID(),
- func() int64 { return int64(len(bsp.queue)) },
- int64(bsp.o.MaxQueueSize),
- )
- if err != nil {
- otel.Handle(err)
+ if x.SelfObservability.Enabled() {
+ bsp.selfObservabilityEnabled = true
+ bsp.componentNameAttr = componentName()
+
+ var err error
+ bsp.spansProcessedCounter, bsp.callbackRegistration, err = newBSPObs(
+ bsp.componentNameAttr,
+ func() int64 { return int64(len(bsp.queue)) },
+ int64(bsp.o.MaxQueueSize),
+ )
+ if err != nil {
+ otel.Handle(err)
+ }
}
bsp.stopWait.Add(1)
@@ -141,6 +157,51 @@ func nextProcessorID() int64 {
return processorIDCounter.Add(1) - 1
}
+func componentName() attribute.KeyValue {
+ id := nextProcessorID()
+ name := fmt.Sprintf("%s/%d", otelconv.ComponentTypeBatchingSpanProcessor, id)
+ return semconv.OTelComponentName(name)
+}
+
+// newBSPObs creates and returns a new set of metrics instruments and a
+// registration for a BatchSpanProcessor. It is the caller's responsibility
+// to unregister the registration when it is no longer needed.
+func newBSPObs(
+ cmpnt attribute.KeyValue,
+ qLen func() int64,
+ qMax int64,
+) (otelconv.SDKProcessorSpanProcessed, metric.Registration, error) {
+ meter := otel.GetMeterProvider().Meter(
+ selfObsScopeName,
+ metric.WithInstrumentationVersion(sdk.Version()),
+ metric.WithSchemaURL(semconv.SchemaURL),
+ )
+
+ qCap, err := otelconv.NewSDKProcessorSpanQueueCapacity(meter)
+
+ qSize, e := otelconv.NewSDKProcessorSpanQueueSize(meter)
+ err = errors.Join(err, e)
+
+ spansProcessed, e := otelconv.NewSDKProcessorSpanProcessed(meter)
+ err = errors.Join(err, e)
+
+ cmpntT := semconv.OTelComponentTypeBatchingSpanProcessor
+ attrs := metric.WithAttributes(cmpnt, cmpntT)
+
+ reg, e := meter.RegisterCallback(
+ func(_ context.Context, o metric.Observer) error {
+ o.ObserveInt64(qSize.Inst(), qLen(), attrs)
+ o.ObserveInt64(qCap.Inst(), qMax, attrs)
+ return nil
+ },
+ qSize.Inst(),
+ qCap.Inst(),
+ )
+ err = errors.Join(err, e)
+
+ return spansProcessed, reg, err
+}
+
// OnStart method does nothing.
func (*batchSpanProcessor) OnStart(context.Context, ReadWriteSpan) {}
@@ -181,8 +242,8 @@ func (bsp *batchSpanProcessor) Shutdown(ctx context.Context) error {
case <-ctx.Done():
err = ctx.Err()
}
- if bsp.inst != nil {
- err = errors.Join(err, bsp.inst.Shutdown())
+ if bsp.selfObservabilityEnabled {
+ err = errors.Join(err, bsp.callbackRegistration.Unregister())
}
})
return err
@@ -296,8 +357,10 @@ func (bsp *batchSpanProcessor) exportSpans(ctx context.Context) error {
if l := len(bsp.batch); l > 0 {
global.Debug("exporting spans", "count", len(bsp.batch), "total_dropped", atomic.LoadUint32(&bsp.dropped))
- if bsp.inst != nil {
- bsp.inst.Processed(ctx, int64(l))
+ if bsp.selfObservabilityEnabled {
+ bsp.spansProcessedCounter.Add(ctx, int64(l),
+ bsp.componentNameAttr,
+ bsp.spansProcessedCounter.AttrComponentType(otelconv.ComponentTypeBatchingSpanProcessor))
}
err := bsp.e.ExportSpans(ctx, bsp.batch)
@@ -407,8 +470,11 @@ func (bsp *batchSpanProcessor) enqueueBlockOnQueueFull(ctx context.Context, sd R
case bsp.queue <- sd:
return true
case <-ctx.Done():
- if bsp.inst != nil {
- bsp.inst.ProcessedQueueFull(ctx, 1)
+ if bsp.selfObservabilityEnabled {
+ bsp.spansProcessedCounter.Add(ctx, 1,
+ bsp.componentNameAttr,
+ bsp.spansProcessedCounter.AttrComponentType(otelconv.ComponentTypeBatchingSpanProcessor),
+ bsp.spansProcessedCounter.AttrErrorType(queueFull))
}
return false
}
@@ -424,8 +490,11 @@ func (bsp *batchSpanProcessor) enqueueDrop(ctx context.Context, sd ReadOnlySpan)
return true
default:
atomic.AddUint32(&bsp.dropped, 1)
- if bsp.inst != nil {
- bsp.inst.ProcessedQueueFull(ctx, 1)
+ if bsp.selfObservabilityEnabled {
+ bsp.spansProcessedCounter.Add(ctx, 1,
+ bsp.componentNameAttr,
+ bsp.spansProcessedCounter.AttrComponentType(otelconv.ComponentTypeBatchingSpanProcessor),
+ bsp.spansProcessedCounter.AttrErrorType(queueFull))
}
}
return false
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/doc.go b/vendor/go.opentelemetry.io/otel/sdk/trace/doc.go
index b502c7d479..e58e7f6ed7 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/doc.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/trace/doc.go
@@ -7,7 +7,7 @@ Package trace contains support for OpenTelemetry distributed tracing.
The following assumes a basic familiarity with OpenTelemetry concepts.
See https://opentelemetry.io.
-See [go.opentelemetry.io/otel/sdk/internal/x] for information about
+See [go.opentelemetry.io/otel/sdk/trace/internal/x] for information about
the experimental features.
*/
package trace // import "go.opentelemetry.io/otel/sdk/trace"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/batch_span_processor.go b/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/batch_span_processor.go
deleted file mode 100644
index bd7fe23629..0000000000
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/batch_span_processor.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-package observ // import "go.opentelemetry.io/otel/sdk/trace/internal/observ"
-
-import (
- "context"
- "errors"
- "fmt"
-
- "go.opentelemetry.io/otel"
- "go.opentelemetry.io/otel/attribute"
- "go.opentelemetry.io/otel/metric"
- "go.opentelemetry.io/otel/sdk"
- "go.opentelemetry.io/otel/sdk/internal/x"
- semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
- "go.opentelemetry.io/otel/semconv/v1.37.0/otelconv"
-)
-
-const (
- // ScopeName is the name of the instrumentation scope.
- ScopeName = "go.opentelemetry.io/otel/sdk/trace/internal/observ"
-
- // SchemaURL is the schema URL of the instrumentation.
- SchemaURL = semconv.SchemaURL
-)
-
-// ErrQueueFull is the attribute value for the "queue_full" error type.
-var ErrQueueFull = otelconv.SDKProcessorSpanProcessed{}.AttrErrorType(
- otelconv.ErrorTypeAttr("queue_full"),
-)
-
-// BSPComponentName returns the component name attribute for a
-// BatchSpanProcessor with the given ID.
-func BSPComponentName(id int64) attribute.KeyValue {
- t := otelconv.ComponentTypeBatchingSpanProcessor
- name := fmt.Sprintf("%s/%d", t, id)
- return semconv.OTelComponentName(name)
-}
-
-// BSP is the instrumentation for an OTel SDK BatchSpanProcessor.
-type BSP struct {
- reg metric.Registration
-
- processed metric.Int64Counter
- processedOpts []metric.AddOption
- processedQueueFullOpts []metric.AddOption
-}
-
-func NewBSP(id int64, qLen func() int64, qMax int64) (*BSP, error) {
- if !x.Observability.Enabled() {
- return nil, nil
- }
-
- meter := otel.GetMeterProvider().Meter(
- ScopeName,
- metric.WithInstrumentationVersion(sdk.Version()),
- metric.WithSchemaURL(SchemaURL),
- )
-
- qCap, err := otelconv.NewSDKProcessorSpanQueueCapacity(meter)
- if err != nil {
- err = fmt.Errorf("failed to create BSP queue capacity metric: %w", err)
- }
- qCapInst := qCap.Inst()
-
- qSize, e := otelconv.NewSDKProcessorSpanQueueSize(meter)
- if e != nil {
- e := fmt.Errorf("failed to create BSP queue size metric: %w", e)
- err = errors.Join(err, e)
- }
- qSizeInst := qSize.Inst()
-
- cmpntT := semconv.OTelComponentTypeBatchingSpanProcessor
- cmpnt := BSPComponentName(id)
- set := attribute.NewSet(cmpnt, cmpntT)
-
- obsOpts := []metric.ObserveOption{metric.WithAttributeSet(set)}
- reg, e := meter.RegisterCallback(
- func(_ context.Context, o metric.Observer) error {
- o.ObserveInt64(qSizeInst, qLen(), obsOpts...)
- o.ObserveInt64(qCapInst, qMax, obsOpts...)
- return nil
- },
- qSizeInst,
- qCapInst,
- )
- if e != nil {
- e := fmt.Errorf("failed to register BSP queue size/capacity callback: %w", e)
- err = errors.Join(err, e)
- }
-
- processed, e := otelconv.NewSDKProcessorSpanProcessed(meter)
- if e != nil {
- e := fmt.Errorf("failed to create BSP processed spans metric: %w", e)
- err = errors.Join(err, e)
- }
- processedOpts := []metric.AddOption{metric.WithAttributeSet(set)}
-
- set = attribute.NewSet(cmpnt, cmpntT, ErrQueueFull)
- processedQueueFullOpts := []metric.AddOption{metric.WithAttributeSet(set)}
-
- return &BSP{
- reg: reg,
- processed: processed.Inst(),
- processedOpts: processedOpts,
- processedQueueFullOpts: processedQueueFullOpts,
- }, err
-}
-
-func (b *BSP) Shutdown() error { return b.reg.Unregister() }
-
-func (b *BSP) Processed(ctx context.Context, n int64) {
- b.processed.Add(ctx, n, b.processedOpts...)
-}
-
-func (b *BSP) ProcessedQueueFull(ctx context.Context, n int64) {
- b.processed.Add(ctx, n, b.processedQueueFullOpts...)
-}
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/doc.go b/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/doc.go
deleted file mode 100644
index b542121e6a..0000000000
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/doc.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-// Package observ provides observability instrumentation for the OTel trace SDK
-// package.
-package observ // import "go.opentelemetry.io/otel/sdk/trace/internal/observ"
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/simple_span_processor.go b/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/simple_span_processor.go
deleted file mode 100644
index 7d33870613..0000000000
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/simple_span_processor.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-package observ // import "go.opentelemetry.io/otel/sdk/trace/internal/observ"
-
-import (
- "context"
- "fmt"
- "sync"
-
- "go.opentelemetry.io/otel"
- "go.opentelemetry.io/otel/attribute"
- "go.opentelemetry.io/otel/metric"
- "go.opentelemetry.io/otel/sdk"
- "go.opentelemetry.io/otel/sdk/internal/x"
- semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
- "go.opentelemetry.io/otel/semconv/v1.37.0/otelconv"
-)
-
-var measureAttrsPool = sync.Pool{
- New: func() any {
- // "component.name" + "component.type" + "error.type"
- const n = 1 + 1 + 1
- s := make([]attribute.KeyValue, 0, n)
- // Return a pointer to a slice instead of a slice itself
- // to avoid allocations on every call.
- return &s
- },
-}
-
-// SSP is the instrumentation for an OTel SDK SimpleSpanProcessor.
-type SSP struct {
- spansProcessedCounter metric.Int64Counter
- addOpts []metric.AddOption
- attrs []attribute.KeyValue
-}
-
-// SSPComponentName returns the component name attribute for a
-// SimpleSpanProcessor with the given ID.
-func SSPComponentName(id int64) attribute.KeyValue {
- t := otelconv.ComponentTypeSimpleSpanProcessor
- name := fmt.Sprintf("%s/%d", t, id)
- return semconv.OTelComponentName(name)
-}
-
-// NewSSP returns instrumentation for an OTel SDK SimpleSpanProcessor with the
-// provided ID.
-//
-// If the experimental observability is disabled, nil is returned.
-func NewSSP(id int64) (*SSP, error) {
- if !x.Observability.Enabled() {
- return nil, nil
- }
-
- meter := otel.GetMeterProvider().Meter(
- ScopeName,
- metric.WithInstrumentationVersion(sdk.Version()),
- metric.WithSchemaURL(SchemaURL),
- )
- spansProcessedCounter, err := otelconv.NewSDKProcessorSpanProcessed(meter)
- if err != nil {
- err = fmt.Errorf("failed to create SSP processed spans metric: %w", err)
- }
-
- componentName := SSPComponentName(id)
- componentType := spansProcessedCounter.AttrComponentType(otelconv.ComponentTypeSimpleSpanProcessor)
- attrs := []attribute.KeyValue{componentName, componentType}
- addOpts := []metric.AddOption{metric.WithAttributeSet(attribute.NewSet(attrs...))}
-
- return &SSP{
- spansProcessedCounter: spansProcessedCounter.Inst(),
- addOpts: addOpts,
- attrs: attrs,
- }, err
-}
-
-// SpanProcessed records that a span has been processed by the SimpleSpanProcessor.
-// If err is non-nil, it records the processing error as an attribute.
-func (ssp *SSP) SpanProcessed(ctx context.Context, err error) {
- ssp.spansProcessedCounter.Add(ctx, 1, ssp.addOption(err)...)
-}
-
-func (ssp *SSP) addOption(err error) []metric.AddOption {
- if err == nil {
- return ssp.addOpts
- }
- attrs := measureAttrsPool.Get().(*[]attribute.KeyValue)
- defer func() {
- *attrs = (*attrs)[:0] // reset the slice for reuse
- measureAttrsPool.Put(attrs)
- }()
- *attrs = append(*attrs, ssp.attrs...)
- *attrs = append(*attrs, semconv.ErrorType(err))
- // Do not inefficiently make a copy of attrs by using
- // WithAttributes instead of WithAttributeSet.
- return []metric.AddOption{metric.WithAttributeSet(attribute.NewSet(*attrs...))}
-}
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/tracer.go b/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/tracer.go
deleted file mode 100644
index a8a1645898..0000000000
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/observ/tracer.go
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright The OpenTelemetry Authors
-// SPDX-License-Identifier: Apache-2.0
-
-package observ // import "go.opentelemetry.io/otel/sdk/trace/internal/observ"
-
-import (
- "context"
- "errors"
- "fmt"
-
- "go.opentelemetry.io/otel"
- "go.opentelemetry.io/otel/attribute"
- "go.opentelemetry.io/otel/metric"
- "go.opentelemetry.io/otel/sdk"
- "go.opentelemetry.io/otel/sdk/internal/x"
- "go.opentelemetry.io/otel/semconv/v1.37.0/otelconv"
- "go.opentelemetry.io/otel/trace"
-)
-
-var meterOpts = []metric.MeterOption{
- metric.WithInstrumentationVersion(sdk.Version()),
- metric.WithSchemaURL(SchemaURL),
-}
-
-// Tracer is instrumentation for an OTel SDK Tracer.
-type Tracer struct {
- enabled bool
-
- live metric.Int64UpDownCounter
- started metric.Int64Counter
-}
-
-func NewTracer() (Tracer, error) {
- if !x.Observability.Enabled() {
- return Tracer{}, nil
- }
- meter := otel.GetMeterProvider().Meter(ScopeName, meterOpts...)
-
- var err error
- l, e := otelconv.NewSDKSpanLive(meter)
- if e != nil {
- e = fmt.Errorf("failed to create span live metric: %w", e)
- err = errors.Join(err, e)
- }
-
- s, e := otelconv.NewSDKSpanStarted(meter)
- if e != nil {
- e = fmt.Errorf("failed to create span started metric: %w", e)
- err = errors.Join(err, e)
- }
-
- return Tracer{enabled: true, live: l.Inst(), started: s.Inst()}, err
-}
-
-func (t Tracer) Enabled() bool { return t.enabled }
-
-func (t Tracer) SpanStarted(ctx context.Context, psc trace.SpanContext, span trace.Span) {
- key := spanStartedKey{
- parent: parentStateNoParent,
- sampling: samplingStateDrop,
- }
-
- if psc.IsValid() {
- if psc.IsRemote() {
- key.parent = parentStateRemoteParent
- } else {
- key.parent = parentStateLocalParent
- }
- }
-
- if span.IsRecording() {
- if span.SpanContext().IsSampled() {
- key.sampling = samplingStateRecordAndSample
- } else {
- key.sampling = samplingStateRecordOnly
- }
- }
-
- opts := spanStartedOpts[key]
- t.started.Add(ctx, 1, opts...)
-}
-
-func (t Tracer) SpanLive(ctx context.Context, span trace.Span) {
- t.spanLive(ctx, 1, span)
-}
-
-func (t Tracer) SpanEnded(ctx context.Context, span trace.Span) {
- t.spanLive(ctx, -1, span)
-}
-
-func (t Tracer) spanLive(ctx context.Context, value int64, span trace.Span) {
- key := spanLiveKey{sampled: span.SpanContext().IsSampled()}
- opts := spanLiveOpts[key]
- t.live.Add(ctx, value, opts...)
-}
-
-type parentState int
-
-const (
- parentStateNoParent parentState = iota
- parentStateLocalParent
- parentStateRemoteParent
-)
-
-type samplingState int
-
-const (
- samplingStateDrop samplingState = iota
- samplingStateRecordOnly
- samplingStateRecordAndSample
-)
-
-type spanStartedKey struct {
- parent parentState
- sampling samplingState
-}
-
-var spanStartedOpts = map[spanStartedKey][]metric.AddOption{
- {
- parentStateNoParent,
- samplingStateDrop,
- }: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginNone),
- otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultDrop),
- )),
- },
- {
- parentStateLocalParent,
- samplingStateDrop,
- }: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginLocal),
- otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultDrop),
- )),
- },
- {
- parentStateRemoteParent,
- samplingStateDrop,
- }: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginRemote),
- otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultDrop),
- )),
- },
-
- {
- parentStateNoParent,
- samplingStateRecordOnly,
- }: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginNone),
- otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordOnly),
- )),
- },
- {
- parentStateLocalParent,
- samplingStateRecordOnly,
- }: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginLocal),
- otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordOnly),
- )),
- },
- {
- parentStateRemoteParent,
- samplingStateRecordOnly,
- }: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginRemote),
- otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordOnly),
- )),
- },
-
- {
- parentStateNoParent,
- samplingStateRecordAndSample,
- }: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginNone),
- otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordAndSample),
- )),
- },
- {
- parentStateLocalParent,
- samplingStateRecordAndSample,
- }: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginLocal),
- otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordAndSample),
- )),
- },
- {
- parentStateRemoteParent,
- samplingStateRecordAndSample,
- }: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginRemote),
- otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordAndSample),
- )),
- },
-}
-
-type spanLiveKey struct {
- sampled bool
-}
-
-var spanLiveOpts = map[spanLiveKey][]metric.AddOption{
- {true}: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanLive{}.AttrSpanSamplingResult(
- otelconv.SpanSamplingResultRecordAndSample,
- ),
- )),
- },
- {false}: {
- metric.WithAttributeSet(attribute.NewSet(
- otelconv.SDKSpanLive{}.AttrSpanSamplingResult(
- otelconv.SpanSamplingResultRecordOnly,
- ),
- )),
- },
-}
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/x/README.md b/vendor/go.opentelemetry.io/otel/sdk/trace/internal/x/README.md
new file mode 100644
index 0000000000..feec16fa64
--- /dev/null
+++ b/vendor/go.opentelemetry.io/otel/sdk/trace/internal/x/README.md
@@ -0,0 +1,35 @@
+# Experimental Features
+
+The Trace SDK contains features that have not yet stabilized in the OpenTelemetry specification.
+These features are added to the OpenTelemetry Go Trace SDK prior to stabilization in the specification so that users can start experimenting with them and provide feedback.
+
+These features may change in backwards incompatible ways as feedback is applied.
+See the [Compatibility and Stability](#compatibility-and-stability) section for more information.
+
+## Features
+
+- [Self-Observability](#self-observability)
+
+### Self-Observability
+
+The SDK provides a self-observability feature that allows you to monitor the SDK itself.
+
+To opt-in, set the environment variable `OTEL_GO_X_SELF_OBSERVABILITY` to `true`.
+
+When enabled, the SDK will create the following metrics using the global `MeterProvider`:
+
+- `otel.sdk.span.live`
+- `otel.sdk.span.started`
+
+Please see the [Semantic conventions for OpenTelemetry SDK metrics] documentation for more details on these metrics.
+
+[Semantic conventions for OpenTelemetry SDK metrics]: https://github.com/open-telemetry/semantic-conventions/blob/v1.36.0/docs/otel/sdk-metrics.md
+
+## Compatibility and Stability
+
+Experimental features do not fall within the scope of the OpenTelemetry Go versioning and stability [policy](../../../../VERSIONING.md).
+These features may be removed or modified in successive version releases, including patch versions.
+
+When an experimental feature is promoted to a stable feature, a migration path will be included in the changelog entry of the release.
+There is no guarantee that any environment variable feature flags that enabled the experimental feature will be supported by the stable version.
+If they are supported, they may be accompanied with a deprecation notice stating a timeline for the removal of that support.
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/internal/x/x.go b/vendor/go.opentelemetry.io/otel/sdk/trace/internal/x/x.go
new file mode 100644
index 0000000000..2fcbbcc66e
--- /dev/null
+++ b/vendor/go.opentelemetry.io/otel/sdk/trace/internal/x/x.go
@@ -0,0 +1,63 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+// Package x documents experimental features for [go.opentelemetry.io/otel/sdk/trace].
+package x // import "go.opentelemetry.io/otel/sdk/trace/internal/x"
+
+import (
+ "os"
+ "strings"
+)
+
+// SelfObservability is an experimental feature flag that determines if SDK
+// self-observability metrics are enabled.
+//
+// To enable this feature set the OTEL_GO_X_SELF_OBSERVABILITY environment variable
+// to the case-insensitive string value of "true" (i.e. "True" and "TRUE"
+// will also enable this).
+var SelfObservability = newFeature("SELF_OBSERVABILITY", func(v string) (string, bool) {
+ if strings.EqualFold(v, "true") {
+ return v, true
+ }
+ return "", false
+})
+
+// Feature is an experimental feature control flag. It provides a uniform way
+// to interact with these feature flags and parse their values.
+type Feature[T any] struct {
+ key string
+ parse func(v string) (T, bool)
+}
+
+func newFeature[T any](suffix string, parse func(string) (T, bool)) Feature[T] {
+ const envKeyRoot = "OTEL_GO_X_"
+ return Feature[T]{
+ key: envKeyRoot + suffix,
+ parse: parse,
+ }
+}
+
+// Key returns the environment variable key that needs to be set to enable the
+// feature.
+func (f Feature[T]) Key() string { return f.key }
+
+// Lookup returns the user configured value for the feature and true if the
+// user has enabled the feature. Otherwise, if the feature is not enabled, a
+// zero-value and false are returned.
+func (f Feature[T]) Lookup() (v T, ok bool) {
+ // https://github.com/open-telemetry/opentelemetry-specification/blob/62effed618589a0bec416a87e559c0a9d96289bb/specification/configuration/sdk-environment-variables.md#parsing-empty-value
+ //
+ // > The SDK MUST interpret an empty value of an environment variable the
+ // > same way as when the variable is unset.
+ vRaw := os.Getenv(f.key)
+ if vRaw == "" {
+ return v, ok
+ }
+ return f.parse(vRaw)
+}
+
+// Enabled reports whether the feature is enabled.
+func (f Feature[T]) Enabled() bool {
+ _, ok := f.Lookup()
+ return ok
+}
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/provider.go b/vendor/go.opentelemetry.io/otel/sdk/trace/provider.go
index d2cf4ebd3e..37ce2ac876 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/provider.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/trace/provider.go
@@ -5,21 +5,29 @@ package trace // import "go.opentelemetry.io/otel/sdk/trace"
import (
"context"
+ "errors"
"fmt"
"sync"
"sync/atomic"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/internal/global"
+ "go.opentelemetry.io/otel/metric"
+ "go.opentelemetry.io/otel/sdk"
"go.opentelemetry.io/otel/sdk/instrumentation"
"go.opentelemetry.io/otel/sdk/resource"
- "go.opentelemetry.io/otel/sdk/trace/internal/observ"
+ "go.opentelemetry.io/otel/sdk/trace/internal/x"
+ semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
+ "go.opentelemetry.io/otel/semconv/v1.37.0/otelconv"
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/embedded"
"go.opentelemetry.io/otel/trace/noop"
)
-const defaultTracerName = "go.opentelemetry.io/otel/sdk/tracer"
+const (
+ defaultTracerName = "go.opentelemetry.io/otel/sdk/tracer"
+ selfObsScopeName = "go.opentelemetry.io/otel/sdk/trace"
+)
// tracerProviderConfig.
type tracerProviderConfig struct {
@@ -155,16 +163,19 @@ func (p *TracerProvider) Tracer(name string, opts ...trace.TracerOption) trace.T
t, ok := p.namedTracer[is]
if !ok {
t = &tracer{
- provider: p,
- instrumentationScope: is,
+ provider: p,
+ instrumentationScope: is,
+ selfObservabilityEnabled: x.SelfObservability.Enabled(),
}
-
- var err error
- t.inst, err = observ.NewTracer()
- if err != nil {
- otel.Handle(err)
+ if t.selfObservabilityEnabled {
+ var err error
+ t.spanLiveMetric, t.spanStartedMetric, err = newInst()
+ if err != nil {
+ msg := "failed to create self-observability metrics for tracer: %w"
+ err := fmt.Errorf(msg, err)
+ otel.Handle(err)
+ }
}
-
p.namedTracer[is] = t
}
return t, ok
@@ -190,6 +201,23 @@ func (p *TracerProvider) Tracer(name string, opts ...trace.TracerOption) trace.T
return t
}
+func newInst() (otelconv.SDKSpanLive, otelconv.SDKSpanStarted, error) {
+ m := otel.GetMeterProvider().Meter(
+ selfObsScopeName,
+ metric.WithInstrumentationVersion(sdk.Version()),
+ metric.WithSchemaURL(semconv.SchemaURL),
+ )
+
+ var err error
+ spanLiveMetric, e := otelconv.NewSDKSpanLive(m)
+ err = errors.Join(err, e)
+
+ spanStartedMetric, e := otelconv.NewSDKSpanStarted(m)
+ err = errors.Join(err, e)
+
+ return spanLiveMetric, spanStartedMetric, err
+}
+
// RegisterSpanProcessor adds the given SpanProcessor to the list of SpanProcessors.
func (p *TracerProvider) RegisterSpanProcessor(sp SpanProcessor) {
// This check prevents calls during a shutdown.
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/simple_span_processor.go b/vendor/go.opentelemetry.io/otel/sdk/trace/simple_span_processor.go
index 771e427a4c..411d9ccdd7 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/simple_span_processor.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/trace/simple_span_processor.go
@@ -6,12 +6,9 @@ package trace // import "go.opentelemetry.io/otel/sdk/trace"
import (
"context"
"sync"
- "sync/atomic"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/internal/global"
- "go.opentelemetry.io/otel/sdk/trace/internal/observ"
- "go.opentelemetry.io/otel/trace"
)
// simpleSpanProcessor is a SpanProcessor that synchronously sends all
@@ -20,8 +17,6 @@ type simpleSpanProcessor struct {
exporterMu sync.Mutex
exporter SpanExporter
stopOnce sync.Once
-
- inst *observ.SSP
}
var _ SpanProcessor = (*simpleSpanProcessor)(nil)
@@ -38,26 +33,11 @@ func NewSimpleSpanProcessor(exporter SpanExporter) SpanProcessor {
ssp := &simpleSpanProcessor{
exporter: exporter,
}
-
- var err error
- ssp.inst, err = observ.NewSSP(nextSimpleProcessorID())
- if err != nil {
- otel.Handle(err)
- }
-
global.Warn("SimpleSpanProcessor is not recommended for production use, consider using BatchSpanProcessor instead.")
return ssp
}
-var simpleProcessorIDCounter atomic.Int64
-
-// nextSimpleProcessorID returns an identifier for this simple span processor,
-// starting with 0 and incrementing by 1 each time it is called.
-func nextSimpleProcessorID() int64 {
- return simpleProcessorIDCounter.Add(1) - 1
-}
-
// OnStart does nothing.
func (*simpleSpanProcessor) OnStart(context.Context, ReadWriteSpan) {}
@@ -66,20 +46,11 @@ func (ssp *simpleSpanProcessor) OnEnd(s ReadOnlySpan) {
ssp.exporterMu.Lock()
defer ssp.exporterMu.Unlock()
- var err error
if ssp.exporter != nil && s.SpanContext().TraceFlags().IsSampled() {
- err = ssp.exporter.ExportSpans(context.Background(), []ReadOnlySpan{s})
- if err != nil {
+ if err := ssp.exporter.ExportSpans(context.Background(), []ReadOnlySpan{s}); err != nil {
otel.Handle(err)
}
}
-
- if ssp.inst != nil {
- // Add the span to the context to ensure the metric is recorded
- // with the correct span context.
- ctx := trace.ContextWithSpanContext(context.Background(), s.SpanContext())
- ssp.inst.SpanProcessed(ctx, err)
- }
}
// Shutdown shuts down the exporter this SimpleSpanProcessor exports to.
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/span.go b/vendor/go.opentelemetry.io/otel/sdk/trace/span.go
index 8cfd9f62e3..b376051fbb 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/span.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/trace/span.go
@@ -151,12 +151,6 @@ type recordingSpan struct {
// tracer is the SDK tracer that created this span.
tracer *tracer
-
- // origCtx is the context used when starting this span that has the
- // recordingSpan instance set as the active span. If not nil, it is used
- // when ending the span to ensure any metrics are recorded with a context
- // containing this span without requiring an additional allocation.
- origCtx context.Context
}
var (
@@ -164,10 +158,6 @@ var (
_ runtimeTracer = (*recordingSpan)(nil)
)
-func (s *recordingSpan) setOrigCtx(ctx context.Context) {
- s.origCtx = ctx
-}
-
// SpanContext returns the SpanContext of this span.
func (s *recordingSpan) SpanContext() trace.SpanContext {
if s == nil {
@@ -506,15 +496,14 @@ func (s *recordingSpan) End(options ...trace.SpanEndOption) {
}
s.mu.Unlock()
- if s.tracer.inst.Enabled() {
- ctx := s.origCtx
- if ctx == nil {
- // This should not happen as the origCtx should be set, but
- // ensure trace information is propagated in the case of an
- // error.
- ctx = trace.ContextWithSpan(context.Background(), s)
- }
- defer s.tracer.inst.SpanEnded(ctx, s)
+ if s.tracer.selfObservabilityEnabled {
+ defer func() {
+ // Add the span to the context to ensure the metric is recorded
+ // with the correct span context.
+ ctx := trace.ContextWithSpan(context.Background(), s)
+ set := spanLiveSet(s.spanContext.IsSampled())
+ s.tracer.spanLiveMetric.AddSet(ctx, -1, set)
+ }()
}
sps := s.tracer.provider.getSpanProcessors()
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/span_limits.go b/vendor/go.opentelemetry.io/otel/sdk/trace/span_limits.go
index 321d974305..bec5e20978 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/span_limits.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/trace/span_limits.go
@@ -3,7 +3,7 @@
package trace // import "go.opentelemetry.io/otel/sdk/trace"
-import "go.opentelemetry.io/otel/sdk/trace/internal/env"
+import "go.opentelemetry.io/otel/sdk/internal/env"
const (
// DefaultAttributeValueLengthLimit is the default maximum allowed
diff --git a/vendor/go.opentelemetry.io/otel/sdk/trace/tracer.go b/vendor/go.opentelemetry.io/otel/sdk/trace/tracer.go
index e1d08fd4d8..e965c4cce8 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/trace/tracer.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/trace/tracer.go
@@ -7,8 +7,9 @@ import (
"context"
"time"
+ "go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/sdk/instrumentation"
- "go.opentelemetry.io/otel/sdk/trace/internal/observ"
+ "go.opentelemetry.io/otel/semconv/v1.37.0/otelconv"
"go.opentelemetry.io/otel/trace"
"go.opentelemetry.io/otel/trace/embedded"
)
@@ -19,7 +20,9 @@ type tracer struct {
provider *TracerProvider
instrumentationScope instrumentation.Scope
- inst observ.Tracer
+ selfObservabilityEnabled bool
+ spanLiveMetric otelconv.SDKSpanLive
+ spanStartedMetric otelconv.SDKSpanStarted
}
var _ trace.Tracer = &tracer{}
@@ -50,17 +53,10 @@ func (tr *tracer) Start(
s := tr.newSpan(ctx, name, &config)
newCtx := trace.ContextWithSpan(ctx, s)
- if tr.inst.Enabled() {
- if o, ok := s.(interface{ setOrigCtx(context.Context) }); ok {
- // If this is a recording span, store the original context.
- // This allows later retrieval of baggage and other information
- // that may have been stored in the context at span start time and
- // to avoid the allocation of repeatedly calling
- // trace.ContextWithSpan.
- o.setOrigCtx(newCtx)
- }
+ if tr.selfObservabilityEnabled {
psc := trace.SpanContextFromContext(ctx)
- tr.inst.SpanStarted(newCtx, psc, s)
+ set := spanStartedSet(psc, s)
+ tr.spanStartedMetric.AddSet(newCtx, 1, set)
}
if rw, ok := s.(ReadWriteSpan); ok && s.IsRecording() {
@@ -172,11 +168,12 @@ func (tr *tracer) newRecordingSpan(
s.SetAttributes(sr.Attributes...)
s.SetAttributes(config.Attributes()...)
- if tr.inst.Enabled() {
+ if tr.selfObservabilityEnabled {
// Propagate any existing values from the context with the new span to
// the measurement context.
ctx = trace.ContextWithSpan(ctx, s)
- tr.inst.SpanLive(ctx, s)
+ set := spanLiveSet(s.spanContext.IsSampled())
+ tr.spanLiveMetric.AddSet(ctx, 1, set)
}
return s
@@ -186,3 +183,112 @@ func (tr *tracer) newRecordingSpan(
func (tr *tracer) newNonRecordingSpan(sc trace.SpanContext) nonRecordingSpan {
return nonRecordingSpan{tracer: tr, sc: sc}
}
+
+type parentState int
+
+const (
+ parentStateNoParent parentState = iota
+ parentStateLocalParent
+ parentStateRemoteParent
+)
+
+type samplingState int
+
+const (
+ samplingStateDrop samplingState = iota
+ samplingStateRecordOnly
+ samplingStateRecordAndSample
+)
+
+type spanStartedSetKey struct {
+ parent parentState
+ sampling samplingState
+}
+
+var spanStartedSetCache = map[spanStartedSetKey]attribute.Set{
+ {parentStateNoParent, samplingStateDrop}: attribute.NewSet(
+ otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginNone),
+ otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultDrop),
+ ),
+ {parentStateLocalParent, samplingStateDrop}: attribute.NewSet(
+ otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginLocal),
+ otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultDrop),
+ ),
+ {parentStateRemoteParent, samplingStateDrop}: attribute.NewSet(
+ otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginRemote),
+ otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultDrop),
+ ),
+
+ {parentStateNoParent, samplingStateRecordOnly}: attribute.NewSet(
+ otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginNone),
+ otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordOnly),
+ ),
+ {parentStateLocalParent, samplingStateRecordOnly}: attribute.NewSet(
+ otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginLocal),
+ otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordOnly),
+ ),
+ {parentStateRemoteParent, samplingStateRecordOnly}: attribute.NewSet(
+ otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginRemote),
+ otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordOnly),
+ ),
+
+ {parentStateNoParent, samplingStateRecordAndSample}: attribute.NewSet(
+ otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginNone),
+ otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordAndSample),
+ ),
+ {parentStateLocalParent, samplingStateRecordAndSample}: attribute.NewSet(
+ otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginLocal),
+ otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordAndSample),
+ ),
+ {parentStateRemoteParent, samplingStateRecordAndSample}: attribute.NewSet(
+ otelconv.SDKSpanStarted{}.AttrSpanParentOrigin(otelconv.SpanParentOriginRemote),
+ otelconv.SDKSpanStarted{}.AttrSpanSamplingResult(otelconv.SpanSamplingResultRecordAndSample),
+ ),
+}
+
+func spanStartedSet(psc trace.SpanContext, span trace.Span) attribute.Set {
+ key := spanStartedSetKey{
+ parent: parentStateNoParent,
+ sampling: samplingStateDrop,
+ }
+
+ if psc.IsValid() {
+ if psc.IsRemote() {
+ key.parent = parentStateRemoteParent
+ } else {
+ key.parent = parentStateLocalParent
+ }
+ }
+
+ if span.IsRecording() {
+ if span.SpanContext().IsSampled() {
+ key.sampling = samplingStateRecordAndSample
+ } else {
+ key.sampling = samplingStateRecordOnly
+ }
+ }
+
+ return spanStartedSetCache[key]
+}
+
+type spanLiveSetKey struct {
+ sampled bool
+}
+
+var spanLiveSetCache = map[spanLiveSetKey]attribute.Set{
+ {true}: attribute.NewSet(
+ otelconv.SDKSpanLive{}.AttrSpanSamplingResult(
+ otelconv.SpanSamplingResultRecordAndSample,
+ ),
+ ),
+ {false}: attribute.NewSet(
+ otelconv.SDKSpanLive{}.AttrSpanSamplingResult(
+ otelconv.SpanSamplingResultRecordOnly,
+ ),
+ ),
+}
+
+func spanLiveSet(sampled bool) attribute.Set {
+ key := spanLiveSetKey{sampled: sampled}
+ return spanLiveSetCache[key]
+}
diff --git a/vendor/go.opentelemetry.io/otel/sdk/version.go b/vendor/go.opentelemetry.io/otel/sdk/version.go
index 0a3b366191..7f97cc31e5 100644
--- a/vendor/go.opentelemetry.io/otel/sdk/version.go
+++ b/vendor/go.opentelemetry.io/otel/sdk/version.go
@@ -6,5 +6,5 @@ package sdk // import "go.opentelemetry.io/otel/sdk"
// Version is the current release version of the OpenTelemetry SDK in use.
func Version() string {
- return "1.39.0"
+ return "1.38.0"
}
diff --git a/vendor/go.opentelemetry.io/otel/semconv/internal/http.go b/vendor/go.opentelemetry.io/otel/semconv/internal/http.go
index f18d6e3f22..58b5eddef6 100644
--- a/vendor/go.opentelemetry.io/otel/semconv/internal/http.go
+++ b/vendor/go.opentelemetry.io/otel/semconv/internal/http.go
@@ -121,7 +121,7 @@ func hostIPNamePort(hostWithPort string) (ip, name string, port int) {
if parsedPort, err = strconv.ParseUint(portPart, 10, 16); err == nil {
port = int(parsedPort) // nolint: gosec // Bit size of 16 checked above.
}
- return ip, name, port
+ return
}
// EndUserAttributesFromHTTPRequest generates attributes of the
diff --git a/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/error_type.go b/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/error_type.go
index 267979c051..666bded4ba 100644
--- a/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/error_type.go
+++ b/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/error_type.go
@@ -4,53 +4,28 @@
package semconv // import "go.opentelemetry.io/otel/semconv/v1.37.0"
import (
+ "fmt"
"reflect"
"go.opentelemetry.io/otel/attribute"
)
// ErrorType returns an [attribute.KeyValue] identifying the error type of err.
-//
-// If err is nil, the returned attribute has the default value
-// [ErrorTypeOther].
-//
-// If err's type has the method
-//
-// ErrorType() string
-//
-// then the returned attribute has the value of err.ErrorType(). Otherwise, the
-// returned attribute has a value derived from the concrete type of err.
-//
-// The key of the returned attribute is [ErrorTypeKey].
func ErrorType(err error) attribute.KeyValue {
if err == nil {
return ErrorTypeOther
}
-
- return ErrorTypeKey.String(errorType(err))
-}
-
-func errorType(err error) string {
- var s string
- if et, ok := err.(interface{ ErrorType() string }); ok {
- // Prioritize the ErrorType method if available.
- s = et.ErrorType()
+ t := reflect.TypeOf(err)
+ var value string
+ if t.PkgPath() == "" && t.Name() == "" {
+ // Likely a builtin type.
+ value = t.String()
+ } else {
+ value = fmt.Sprintf("%s.%s", t.PkgPath(), t.Name())
}
- if s == "" {
- // Fallback to reflection if the ErrorType method is not supported or
- // returns an empty value.
- t := reflect.TypeOf(err)
- pkg, name := t.PkgPath(), t.Name()
- if pkg != "" && name != "" {
- s = pkg + "." + name
- } else {
- // The type has no package path or name (predeclared, not-defined,
- // or alias for a not-defined type).
- //
- // This is not guaranteed to be unique, but is a best effort.
- s = t.String()
- }
+ if value == "" {
+ return ErrorTypeOther
}
- return s
+ return ErrorTypeKey.String(value)
}
diff --git a/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/httpconv/metric.go b/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/httpconv/metric.go
index a0ddf652d3..55bde895dd 100644
--- a/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/httpconv/metric.go
+++ b/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/httpconv/metric.go
@@ -91,11 +91,6 @@ type ClientActiveRequests struct {
metric.Int64UpDownCounter
}
-var newClientActiveRequestsOpts = []metric.Int64UpDownCounterOption{
- metric.WithDescription("Number of active HTTP requests."),
- metric.WithUnit("{request}"),
-}
-
// NewClientActiveRequests returns a new ClientActiveRequests instrument.
func NewClientActiveRequests(
m metric.Meter,
@@ -106,18 +101,15 @@ func NewClientActiveRequests(
return ClientActiveRequests{noop.Int64UpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newClientActiveRequestsOpts
- } else {
- opt = append(opt, newClientActiveRequestsOpts...)
- }
-
i, err := m.Int64UpDownCounter(
"http.client.active_requests",
- opt...,
+ append([]metric.Int64UpDownCounterOption{
+ metric.WithDescription("Number of active HTTP requests."),
+ metric.WithUnit("{request}"),
+ }, opt...)...,
)
if err != nil {
- return ClientActiveRequests{noop.Int64UpDownCounter{}}, err
+ return ClientActiveRequests{noop.Int64UpDownCounter{}}, err
}
return ClientActiveRequests{i}, nil
}
@@ -231,11 +223,6 @@ type ClientConnectionDuration struct {
metric.Float64Histogram
}
-var newClientConnectionDurationOpts = []metric.Float64HistogramOption{
- metric.WithDescription("The duration of the successfully established outbound HTTP connections."),
- metric.WithUnit("s"),
-}
-
// NewClientConnectionDuration returns a new ClientConnectionDuration instrument.
func NewClientConnectionDuration(
m metric.Meter,
@@ -246,18 +233,15 @@ func NewClientConnectionDuration(
return ClientConnectionDuration{noop.Float64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newClientConnectionDurationOpts
- } else {
- opt = append(opt, newClientConnectionDurationOpts...)
- }
-
i, err := m.Float64Histogram(
"http.client.connection.duration",
- opt...,
+ append([]metric.Float64HistogramOption{
+ metric.WithDescription("The duration of the successfully established outbound HTTP connections."),
+ metric.WithUnit("s"),
+ }, opt...)...,
)
if err != nil {
- return ClientConnectionDuration{noop.Float64Histogram{}}, err
+ return ClientConnectionDuration{noop.Float64Histogram{}}, err
}
return ClientConnectionDuration{i}, nil
}
@@ -326,7 +310,6 @@ func (m ClientConnectionDuration) Record(
func (m ClientConnectionDuration) RecordSet(ctx context.Context, val float64, set attribute.Set) {
if set.Len() == 0 {
m.Float64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -370,11 +353,6 @@ type ClientOpenConnections struct {
metric.Int64UpDownCounter
}
-var newClientOpenConnectionsOpts = []metric.Int64UpDownCounterOption{
- metric.WithDescription("Number of outbound HTTP connections that are currently active or idle on the client."),
- metric.WithUnit("{connection}"),
-}
-
// NewClientOpenConnections returns a new ClientOpenConnections instrument.
func NewClientOpenConnections(
m metric.Meter,
@@ -385,18 +363,15 @@ func NewClientOpenConnections(
return ClientOpenConnections{noop.Int64UpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newClientOpenConnectionsOpts
- } else {
- opt = append(opt, newClientOpenConnectionsOpts...)
- }
-
i, err := m.Int64UpDownCounter(
"http.client.open_connections",
- opt...,
+ append([]metric.Int64UpDownCounterOption{
+ metric.WithDescription("Number of outbound HTTP connections that are currently active or idle on the client."),
+ metric.WithUnit("{connection}"),
+ }, opt...)...,
)
if err != nil {
- return ClientOpenConnections{noop.Int64UpDownCounter{}}, err
+ return ClientOpenConnections{noop.Int64UpDownCounter{}}, err
}
return ClientOpenConnections{i}, nil
}
@@ -513,11 +488,6 @@ type ClientRequestBodySize struct {
metric.Int64Histogram
}
-var newClientRequestBodySizeOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Size of HTTP client request bodies."),
- metric.WithUnit("By"),
-}
-
// NewClientRequestBodySize returns a new ClientRequestBodySize instrument.
func NewClientRequestBodySize(
m metric.Meter,
@@ -528,18 +498,15 @@ func NewClientRequestBodySize(
return ClientRequestBodySize{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newClientRequestBodySizeOpts
- } else {
- opt = append(opt, newClientRequestBodySizeOpts...)
- }
-
i, err := m.Int64Histogram(
"http.client.request.body.size",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Size of HTTP client request bodies."),
+ metric.WithUnit("By"),
+ }, opt...)...,
)
if err != nil {
- return ClientRequestBodySize{noop.Int64Histogram{}}, err
+ return ClientRequestBodySize{noop.Int64Histogram{}}, err
}
return ClientRequestBodySize{i}, nil
}
@@ -626,7 +593,6 @@ func (m ClientRequestBodySize) Record(
func (m ClientRequestBodySize) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -696,11 +662,6 @@ type ClientRequestDuration struct {
metric.Float64Histogram
}
-var newClientRequestDurationOpts = []metric.Float64HistogramOption{
- metric.WithDescription("Duration of HTTP client requests."),
- metric.WithUnit("s"),
-}
-
// NewClientRequestDuration returns a new ClientRequestDuration instrument.
func NewClientRequestDuration(
m metric.Meter,
@@ -711,18 +672,15 @@ func NewClientRequestDuration(
return ClientRequestDuration{noop.Float64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newClientRequestDurationOpts
- } else {
- opt = append(opt, newClientRequestDurationOpts...)
- }
-
i, err := m.Float64Histogram(
"http.client.request.duration",
- opt...,
+ append([]metric.Float64HistogramOption{
+ metric.WithDescription("Duration of HTTP client requests."),
+ metric.WithUnit("s"),
+ }, opt...)...,
)
if err != nil {
- return ClientRequestDuration{noop.Float64Histogram{}}, err
+ return ClientRequestDuration{noop.Float64Histogram{}}, err
}
return ClientRequestDuration{i}, nil
}
@@ -795,7 +753,6 @@ func (m ClientRequestDuration) Record(
func (m ClientRequestDuration) RecordSet(ctx context.Context, val float64, set attribute.Set) {
if set.Len() == 0 {
m.Float64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -865,11 +822,6 @@ type ClientResponseBodySize struct {
metric.Int64Histogram
}
-var newClientResponseBodySizeOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Size of HTTP client response bodies."),
- metric.WithUnit("By"),
-}
-
// NewClientResponseBodySize returns a new ClientResponseBodySize instrument.
func NewClientResponseBodySize(
m metric.Meter,
@@ -880,18 +832,15 @@ func NewClientResponseBodySize(
return ClientResponseBodySize{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newClientResponseBodySizeOpts
- } else {
- opt = append(opt, newClientResponseBodySizeOpts...)
- }
-
i, err := m.Int64Histogram(
"http.client.response.body.size",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Size of HTTP client response bodies."),
+ metric.WithUnit("By"),
+ }, opt...)...,
)
if err != nil {
- return ClientResponseBodySize{noop.Int64Histogram{}}, err
+ return ClientResponseBodySize{noop.Int64Histogram{}}, err
}
return ClientResponseBodySize{i}, nil
}
@@ -978,7 +927,6 @@ func (m ClientResponseBodySize) Record(
func (m ClientResponseBodySize) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -1048,11 +996,6 @@ type ServerActiveRequests struct {
metric.Int64UpDownCounter
}
-var newServerActiveRequestsOpts = []metric.Int64UpDownCounterOption{
- metric.WithDescription("Number of active HTTP server requests."),
- metric.WithUnit("{request}"),
-}
-
// NewServerActiveRequests returns a new ServerActiveRequests instrument.
func NewServerActiveRequests(
m metric.Meter,
@@ -1063,18 +1006,15 @@ func NewServerActiveRequests(
return ServerActiveRequests{noop.Int64UpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newServerActiveRequestsOpts
- } else {
- opt = append(opt, newServerActiveRequestsOpts...)
- }
-
i, err := m.Int64UpDownCounter(
"http.server.active_requests",
- opt...,
+ append([]metric.Int64UpDownCounterOption{
+ metric.WithDescription("Number of active HTTP server requests."),
+ metric.WithUnit("{request}"),
+ }, opt...)...,
)
if err != nil {
- return ServerActiveRequests{noop.Int64UpDownCounter{}}, err
+ return ServerActiveRequests{noop.Int64UpDownCounter{}}, err
}
return ServerActiveRequests{i}, nil
}
@@ -1178,11 +1118,6 @@ type ServerRequestBodySize struct {
metric.Int64Histogram
}
-var newServerRequestBodySizeOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Size of HTTP server request bodies."),
- metric.WithUnit("By"),
-}
-
// NewServerRequestBodySize returns a new ServerRequestBodySize instrument.
func NewServerRequestBodySize(
m metric.Meter,
@@ -1193,18 +1128,15 @@ func NewServerRequestBodySize(
return ServerRequestBodySize{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newServerRequestBodySizeOpts
- } else {
- opt = append(opt, newServerRequestBodySizeOpts...)
- }
-
i, err := m.Int64Histogram(
"http.server.request.body.size",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Size of HTTP server request bodies."),
+ metric.WithUnit("By"),
+ }, opt...)...,
)
if err != nil {
- return ServerRequestBodySize{noop.Int64Histogram{}}, err
+ return ServerRequestBodySize{noop.Int64Histogram{}}, err
}
return ServerRequestBodySize{i}, nil
}
@@ -1288,7 +1220,6 @@ func (m ServerRequestBodySize) Record(
func (m ServerRequestBodySize) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -1368,11 +1299,6 @@ type ServerRequestDuration struct {
metric.Float64Histogram
}
-var newServerRequestDurationOpts = []metric.Float64HistogramOption{
- metric.WithDescription("Duration of HTTP server requests."),
- metric.WithUnit("s"),
-}
-
// NewServerRequestDuration returns a new ServerRequestDuration instrument.
func NewServerRequestDuration(
m metric.Meter,
@@ -1383,18 +1309,15 @@ func NewServerRequestDuration(
return ServerRequestDuration{noop.Float64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newServerRequestDurationOpts
- } else {
- opt = append(opt, newServerRequestDurationOpts...)
- }
-
i, err := m.Float64Histogram(
"http.server.request.duration",
- opt...,
+ append([]metric.Float64HistogramOption{
+ metric.WithDescription("Duration of HTTP server requests."),
+ metric.WithUnit("s"),
+ }, opt...)...,
)
if err != nil {
- return ServerRequestDuration{noop.Float64Histogram{}}, err
+ return ServerRequestDuration{noop.Float64Histogram{}}, err
}
return ServerRequestDuration{i}, nil
}
@@ -1464,7 +1387,6 @@ func (m ServerRequestDuration) Record(
func (m ServerRequestDuration) RecordSet(ctx context.Context, val float64, set attribute.Set) {
if set.Len() == 0 {
m.Float64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -1544,11 +1466,6 @@ type ServerResponseBodySize struct {
metric.Int64Histogram
}
-var newServerResponseBodySizeOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Size of HTTP server response bodies."),
- metric.WithUnit("By"),
-}
-
// NewServerResponseBodySize returns a new ServerResponseBodySize instrument.
func NewServerResponseBodySize(
m metric.Meter,
@@ -1559,18 +1476,15 @@ func NewServerResponseBodySize(
return ServerResponseBodySize{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newServerResponseBodySizeOpts
- } else {
- opt = append(opt, newServerResponseBodySizeOpts...)
- }
-
i, err := m.Int64Histogram(
"http.server.response.body.size",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Size of HTTP server response bodies."),
+ metric.WithUnit("By"),
+ }, opt...)...,
)
if err != nil {
- return ServerResponseBodySize{noop.Int64Histogram{}}, err
+ return ServerResponseBodySize{noop.Int64Histogram{}}, err
}
return ServerResponseBodySize{i}, nil
}
@@ -1654,7 +1568,6 @@ func (m ServerResponseBodySize) Record(
func (m ServerResponseBodySize) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -1725,4 +1638,4 @@ func (ServerResponseBodySize) AttrServerPort(val int) attribute.KeyValue {
// the category of synthetic traffic, such as tests or bots.
func (ServerResponseBodySize) AttrUserAgentSyntheticType(val UserAgentSyntheticTypeAttr) attribute.KeyValue {
return attribute.String("user_agent.synthetic.type", string(val))
-}
+}
\ No newline at end of file
diff --git a/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/otelconv/metric.go b/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/otelconv/metric.go
index fd064530c3..a78eafd1fa 100644
--- a/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/otelconv/metric.go
+++ b/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/otelconv/metric.go
@@ -3,7 +3,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
-// Package otelconv provides types and functionality for OpenTelemetry semantic
+// Package httpconv provides types and functionality for OpenTelemetry semantic
// conventions in the "otel" namespace.
package otelconv
@@ -172,11 +172,6 @@ type SDKExporterLogExported struct {
metric.Int64Counter
}
-var newSDKExporterLogExportedOpts = []metric.Int64CounterOption{
- metric.WithDescription("The number of log records for which the export has finished, either successful or failed."),
- metric.WithUnit("{log_record}"),
-}
-
// NewSDKExporterLogExported returns a new SDKExporterLogExported instrument.
func NewSDKExporterLogExported(
m metric.Meter,
@@ -187,18 +182,15 @@ func NewSDKExporterLogExported(
return SDKExporterLogExported{noop.Int64Counter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKExporterLogExportedOpts
- } else {
- opt = append(opt, newSDKExporterLogExportedOpts...)
- }
-
i, err := m.Int64Counter(
"otel.sdk.exporter.log.exported",
- opt...,
+ append([]metric.Int64CounterOption{
+ metric.WithDescription("The number of log records for which the export has finished, either successful or failed."),
+ metric.WithUnit("{log_record}"),
+ }, opt...)...,
)
if err != nil {
- return SDKExporterLogExported{noop.Int64Counter{}}, err
+ return SDKExporterLogExported{noop.Int64Counter{}}, err
}
return SDKExporterLogExported{i}, nil
}
@@ -327,11 +319,6 @@ type SDKExporterLogInflight struct {
metric.Int64UpDownCounter
}
-var newSDKExporterLogInflightOpts = []metric.Int64UpDownCounterOption{
- metric.WithDescription("The number of log records which were passed to the exporter, but that have not been exported yet (neither successful, nor failed)."),
- metric.WithUnit("{log_record}"),
-}
-
// NewSDKExporterLogInflight returns a new SDKExporterLogInflight instrument.
func NewSDKExporterLogInflight(
m metric.Meter,
@@ -342,18 +329,15 @@ func NewSDKExporterLogInflight(
return SDKExporterLogInflight{noop.Int64UpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKExporterLogInflightOpts
- } else {
- opt = append(opt, newSDKExporterLogInflightOpts...)
- }
-
i, err := m.Int64UpDownCounter(
"otel.sdk.exporter.log.inflight",
- opt...,
+ append([]metric.Int64UpDownCounterOption{
+ metric.WithDescription("The number of log records which were passed to the exporter, but that have not been exported yet (neither successful, nor failed)."),
+ metric.WithUnit("{log_record}"),
+ }, opt...)...,
)
if err != nil {
- return SDKExporterLogInflight{noop.Int64UpDownCounter{}}, err
+ return SDKExporterLogInflight{noop.Int64UpDownCounter{}}, err
}
return SDKExporterLogInflight{i}, nil
}
@@ -465,11 +449,6 @@ type SDKExporterMetricDataPointExported struct {
metric.Int64Counter
}
-var newSDKExporterMetricDataPointExportedOpts = []metric.Int64CounterOption{
- metric.WithDescription("The number of metric data points for which the export has finished, either successful or failed."),
- metric.WithUnit("{data_point}"),
-}
-
// NewSDKExporterMetricDataPointExported returns a new
// SDKExporterMetricDataPointExported instrument.
func NewSDKExporterMetricDataPointExported(
@@ -481,18 +460,15 @@ func NewSDKExporterMetricDataPointExported(
return SDKExporterMetricDataPointExported{noop.Int64Counter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKExporterMetricDataPointExportedOpts
- } else {
- opt = append(opt, newSDKExporterMetricDataPointExportedOpts...)
- }
-
i, err := m.Int64Counter(
"otel.sdk.exporter.metric_data_point.exported",
- opt...,
+ append([]metric.Int64CounterOption{
+ metric.WithDescription("The number of metric data points for which the export has finished, either successful or failed."),
+ metric.WithUnit("{data_point}"),
+ }, opt...)...,
)
if err != nil {
- return SDKExporterMetricDataPointExported{noop.Int64Counter{}}, err
+ return SDKExporterMetricDataPointExported{noop.Int64Counter{}}, err
}
return SDKExporterMetricDataPointExported{i}, nil
}
@@ -622,11 +598,6 @@ type SDKExporterMetricDataPointInflight struct {
metric.Int64UpDownCounter
}
-var newSDKExporterMetricDataPointInflightOpts = []metric.Int64UpDownCounterOption{
- metric.WithDescription("The number of metric data points which were passed to the exporter, but that have not been exported yet (neither successful, nor failed)."),
- metric.WithUnit("{data_point}"),
-}
-
// NewSDKExporterMetricDataPointInflight returns a new
// SDKExporterMetricDataPointInflight instrument.
func NewSDKExporterMetricDataPointInflight(
@@ -638,18 +609,15 @@ func NewSDKExporterMetricDataPointInflight(
return SDKExporterMetricDataPointInflight{noop.Int64UpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKExporterMetricDataPointInflightOpts
- } else {
- opt = append(opt, newSDKExporterMetricDataPointInflightOpts...)
- }
-
i, err := m.Int64UpDownCounter(
"otel.sdk.exporter.metric_data_point.inflight",
- opt...,
+ append([]metric.Int64UpDownCounterOption{
+ metric.WithDescription("The number of metric data points which were passed to the exporter, but that have not been exported yet (neither successful, nor failed)."),
+ metric.WithUnit("{data_point}"),
+ }, opt...)...,
)
if err != nil {
- return SDKExporterMetricDataPointInflight{noop.Int64UpDownCounter{}}, err
+ return SDKExporterMetricDataPointInflight{noop.Int64UpDownCounter{}}, err
}
return SDKExporterMetricDataPointInflight{i}, nil
}
@@ -760,11 +728,6 @@ type SDKExporterOperationDuration struct {
metric.Float64Histogram
}
-var newSDKExporterOperationDurationOpts = []metric.Float64HistogramOption{
- metric.WithDescription("The duration of exporting a batch of telemetry records."),
- metric.WithUnit("s"),
-}
-
// NewSDKExporterOperationDuration returns a new SDKExporterOperationDuration
// instrument.
func NewSDKExporterOperationDuration(
@@ -776,18 +739,15 @@ func NewSDKExporterOperationDuration(
return SDKExporterOperationDuration{noop.Float64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKExporterOperationDurationOpts
- } else {
- opt = append(opt, newSDKExporterOperationDurationOpts...)
- }
-
i, err := m.Float64Histogram(
"otel.sdk.exporter.operation.duration",
- opt...,
+ append([]metric.Float64HistogramOption{
+ metric.WithDescription("The duration of exporting a batch of telemetry records."),
+ metric.WithUnit("s"),
+ }, opt...)...,
)
if err != nil {
- return SDKExporterOperationDuration{noop.Float64Histogram{}}, err
+ return SDKExporterOperationDuration{noop.Float64Histogram{}}, err
}
return SDKExporterOperationDuration{i}, nil
}
@@ -865,7 +825,6 @@ func (m SDKExporterOperationDuration) Record(
func (m SDKExporterOperationDuration) RecordSet(ctx context.Context, val float64, set attribute.Set) {
if set.Len() == 0 {
m.Float64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -934,11 +893,6 @@ type SDKExporterSpanExported struct {
metric.Int64Counter
}
-var newSDKExporterSpanExportedOpts = []metric.Int64CounterOption{
- metric.WithDescription("The number of spans for which the export has finished, either successful or failed."),
- metric.WithUnit("{span}"),
-}
-
// NewSDKExporterSpanExported returns a new SDKExporterSpanExported instrument.
func NewSDKExporterSpanExported(
m metric.Meter,
@@ -949,18 +903,15 @@ func NewSDKExporterSpanExported(
return SDKExporterSpanExported{noop.Int64Counter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKExporterSpanExportedOpts
- } else {
- opt = append(opt, newSDKExporterSpanExportedOpts...)
- }
-
i, err := m.Int64Counter(
"otel.sdk.exporter.span.exported",
- opt...,
+ append([]metric.Int64CounterOption{
+ metric.WithDescription("The number of spans for which the export has finished, either successful or failed."),
+ metric.WithUnit("{span}"),
+ }, opt...)...,
)
if err != nil {
- return SDKExporterSpanExported{noop.Int64Counter{}}, err
+ return SDKExporterSpanExported{noop.Int64Counter{}}, err
}
return SDKExporterSpanExported{i}, nil
}
@@ -1089,11 +1040,6 @@ type SDKExporterSpanInflight struct {
metric.Int64UpDownCounter
}
-var newSDKExporterSpanInflightOpts = []metric.Int64UpDownCounterOption{
- metric.WithDescription("The number of spans which were passed to the exporter, but that have not been exported yet (neither successful, nor failed)."),
- metric.WithUnit("{span}"),
-}
-
// NewSDKExporterSpanInflight returns a new SDKExporterSpanInflight instrument.
func NewSDKExporterSpanInflight(
m metric.Meter,
@@ -1104,18 +1050,15 @@ func NewSDKExporterSpanInflight(
return SDKExporterSpanInflight{noop.Int64UpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKExporterSpanInflightOpts
- } else {
- opt = append(opt, newSDKExporterSpanInflightOpts...)
- }
-
i, err := m.Int64UpDownCounter(
"otel.sdk.exporter.span.inflight",
- opt...,
+ append([]metric.Int64UpDownCounterOption{
+ metric.WithDescription("The number of spans which were passed to the exporter, but that have not been exported yet (neither successful, nor failed)."),
+ metric.WithUnit("{span}"),
+ }, opt...)...,
)
if err != nil {
- return SDKExporterSpanInflight{noop.Int64UpDownCounter{}}, err
+ return SDKExporterSpanInflight{noop.Int64UpDownCounter{}}, err
}
return SDKExporterSpanInflight{i}, nil
}
@@ -1226,11 +1169,6 @@ type SDKLogCreated struct {
metric.Int64Counter
}
-var newSDKLogCreatedOpts = []metric.Int64CounterOption{
- metric.WithDescription("The number of logs submitted to enabled SDK Loggers."),
- metric.WithUnit("{log_record}"),
-}
-
// NewSDKLogCreated returns a new SDKLogCreated instrument.
func NewSDKLogCreated(
m metric.Meter,
@@ -1241,18 +1179,15 @@ func NewSDKLogCreated(
return SDKLogCreated{noop.Int64Counter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKLogCreatedOpts
- } else {
- opt = append(opt, newSDKLogCreatedOpts...)
- }
-
i, err := m.Int64Counter(
"otel.sdk.log.created",
- opt...,
+ append([]metric.Int64CounterOption{
+ metric.WithDescription("The number of logs submitted to enabled SDK Loggers."),
+ metric.WithUnit("{log_record}"),
+ }, opt...)...,
)
if err != nil {
- return SDKLogCreated{noop.Int64Counter{}}, err
+ return SDKLogCreated{noop.Int64Counter{}}, err
}
return SDKLogCreated{i}, nil
}
@@ -1319,11 +1254,6 @@ type SDKMetricReaderCollectionDuration struct {
metric.Float64Histogram
}
-var newSDKMetricReaderCollectionDurationOpts = []metric.Float64HistogramOption{
- metric.WithDescription("The duration of the collect operation of the metric reader."),
- metric.WithUnit("s"),
-}
-
// NewSDKMetricReaderCollectionDuration returns a new
// SDKMetricReaderCollectionDuration instrument.
func NewSDKMetricReaderCollectionDuration(
@@ -1335,18 +1265,15 @@ func NewSDKMetricReaderCollectionDuration(
return SDKMetricReaderCollectionDuration{noop.Float64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKMetricReaderCollectionDurationOpts
- } else {
- opt = append(opt, newSDKMetricReaderCollectionDurationOpts...)
- }
-
i, err := m.Float64Histogram(
"otel.sdk.metric_reader.collection.duration",
- opt...,
+ append([]metric.Float64HistogramOption{
+ metric.WithDescription("The duration of the collect operation of the metric reader."),
+ metric.WithUnit("s"),
+ }, opt...)...,
)
if err != nil {
- return SDKMetricReaderCollectionDuration{noop.Float64Histogram{}}, err
+ return SDKMetricReaderCollectionDuration{noop.Float64Histogram{}}, err
}
return SDKMetricReaderCollectionDuration{i}, nil
}
@@ -1416,7 +1343,6 @@ func (m SDKMetricReaderCollectionDuration) Record(
func (m SDKMetricReaderCollectionDuration) RecordSet(ctx context.Context, val float64, set attribute.Set) {
if set.Len() == 0 {
m.Float64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -1458,11 +1384,6 @@ type SDKProcessorLogProcessed struct {
metric.Int64Counter
}
-var newSDKProcessorLogProcessedOpts = []metric.Int64CounterOption{
- metric.WithDescription("The number of log records for which the processing has finished, either successful or failed."),
- metric.WithUnit("{log_record}"),
-}
-
// NewSDKProcessorLogProcessed returns a new SDKProcessorLogProcessed instrument.
func NewSDKProcessorLogProcessed(
m metric.Meter,
@@ -1473,18 +1394,15 @@ func NewSDKProcessorLogProcessed(
return SDKProcessorLogProcessed{noop.Int64Counter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKProcessorLogProcessedOpts
- } else {
- opt = append(opt, newSDKProcessorLogProcessedOpts...)
- }
-
i, err := m.Int64Counter(
"otel.sdk.processor.log.processed",
- opt...,
+ append([]metric.Int64CounterOption{
+ metric.WithDescription("The number of log records for which the processing has finished, either successful or failed."),
+ metric.WithUnit("{log_record}"),
+ }, opt...)...,
)
if err != nil {
- return SDKProcessorLogProcessed{noop.Int64Counter{}}, err
+ return SDKProcessorLogProcessed{noop.Int64Counter{}}, err
}
return SDKProcessorLogProcessed{i}, nil
}
@@ -1597,11 +1515,6 @@ type SDKProcessorLogQueueCapacity struct {
metric.Int64ObservableUpDownCounter
}
-var newSDKProcessorLogQueueCapacityOpts = []metric.Int64ObservableUpDownCounterOption{
- metric.WithDescription("The maximum number of log records the queue of a given instance of an SDK Log Record processor can hold."),
- metric.WithUnit("{log_record}"),
-}
-
// NewSDKProcessorLogQueueCapacity returns a new SDKProcessorLogQueueCapacity
// instrument.
func NewSDKProcessorLogQueueCapacity(
@@ -1613,18 +1526,15 @@ func NewSDKProcessorLogQueueCapacity(
return SDKProcessorLogQueueCapacity{noop.Int64ObservableUpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKProcessorLogQueueCapacityOpts
- } else {
- opt = append(opt, newSDKProcessorLogQueueCapacityOpts...)
- }
-
i, err := m.Int64ObservableUpDownCounter(
"otel.sdk.processor.log.queue.capacity",
- opt...,
+ append([]metric.Int64ObservableUpDownCounterOption{
+ metric.WithDescription("The maximum number of log records the queue of a given instance of an SDK Log Record processor can hold."),
+ metric.WithUnit("{log_record}"),
+ }, opt...)...,
)
if err != nil {
- return SDKProcessorLogQueueCapacity{noop.Int64ObservableUpDownCounter{}}, err
+ return SDKProcessorLogQueueCapacity{noop.Int64ObservableUpDownCounter{}}, err
}
return SDKProcessorLogQueueCapacity{i}, nil
}
@@ -1671,11 +1581,6 @@ type SDKProcessorLogQueueSize struct {
metric.Int64ObservableUpDownCounter
}
-var newSDKProcessorLogQueueSizeOpts = []metric.Int64ObservableUpDownCounterOption{
- metric.WithDescription("The number of log records in the queue of a given instance of an SDK log processor."),
- metric.WithUnit("{log_record}"),
-}
-
// NewSDKProcessorLogQueueSize returns a new SDKProcessorLogQueueSize instrument.
func NewSDKProcessorLogQueueSize(
m metric.Meter,
@@ -1686,18 +1591,15 @@ func NewSDKProcessorLogQueueSize(
return SDKProcessorLogQueueSize{noop.Int64ObservableUpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKProcessorLogQueueSizeOpts
- } else {
- opt = append(opt, newSDKProcessorLogQueueSizeOpts...)
- }
-
i, err := m.Int64ObservableUpDownCounter(
"otel.sdk.processor.log.queue.size",
- opt...,
+ append([]metric.Int64ObservableUpDownCounterOption{
+ metric.WithDescription("The number of log records in the queue of a given instance of an SDK log processor."),
+ metric.WithUnit("{log_record}"),
+ }, opt...)...,
)
if err != nil {
- return SDKProcessorLogQueueSize{noop.Int64ObservableUpDownCounter{}}, err
+ return SDKProcessorLogQueueSize{noop.Int64ObservableUpDownCounter{}}, err
}
return SDKProcessorLogQueueSize{i}, nil
}
@@ -1744,11 +1646,6 @@ type SDKProcessorSpanProcessed struct {
metric.Int64Counter
}
-var newSDKProcessorSpanProcessedOpts = []metric.Int64CounterOption{
- metric.WithDescription("The number of spans for which the processing has finished, either successful or failed."),
- metric.WithUnit("{span}"),
-}
-
// NewSDKProcessorSpanProcessed returns a new SDKProcessorSpanProcessed
// instrument.
func NewSDKProcessorSpanProcessed(
@@ -1760,18 +1657,15 @@ func NewSDKProcessorSpanProcessed(
return SDKProcessorSpanProcessed{noop.Int64Counter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKProcessorSpanProcessedOpts
- } else {
- opt = append(opt, newSDKProcessorSpanProcessedOpts...)
- }
-
i, err := m.Int64Counter(
"otel.sdk.processor.span.processed",
- opt...,
+ append([]metric.Int64CounterOption{
+ metric.WithDescription("The number of spans for which the processing has finished, either successful or failed."),
+ metric.WithUnit("{span}"),
+ }, opt...)...,
)
if err != nil {
- return SDKProcessorSpanProcessed{noop.Int64Counter{}}, err
+ return SDKProcessorSpanProcessed{noop.Int64Counter{}}, err
}
return SDKProcessorSpanProcessed{i}, nil
}
@@ -1884,11 +1778,6 @@ type SDKProcessorSpanQueueCapacity struct {
metric.Int64ObservableUpDownCounter
}
-var newSDKProcessorSpanQueueCapacityOpts = []metric.Int64ObservableUpDownCounterOption{
- metric.WithDescription("The maximum number of spans the queue of a given instance of an SDK span processor can hold."),
- metric.WithUnit("{span}"),
-}
-
// NewSDKProcessorSpanQueueCapacity returns a new SDKProcessorSpanQueueCapacity
// instrument.
func NewSDKProcessorSpanQueueCapacity(
@@ -1900,18 +1789,15 @@ func NewSDKProcessorSpanQueueCapacity(
return SDKProcessorSpanQueueCapacity{noop.Int64ObservableUpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKProcessorSpanQueueCapacityOpts
- } else {
- opt = append(opt, newSDKProcessorSpanQueueCapacityOpts...)
- }
-
i, err := m.Int64ObservableUpDownCounter(
"otel.sdk.processor.span.queue.capacity",
- opt...,
+ append([]metric.Int64ObservableUpDownCounterOption{
+ metric.WithDescription("The maximum number of spans the queue of a given instance of an SDK span processor can hold."),
+ metric.WithUnit("{span}"),
+ }, opt...)...,
)
if err != nil {
- return SDKProcessorSpanQueueCapacity{noop.Int64ObservableUpDownCounter{}}, err
+ return SDKProcessorSpanQueueCapacity{noop.Int64ObservableUpDownCounter{}}, err
}
return SDKProcessorSpanQueueCapacity{i}, nil
}
@@ -1958,11 +1844,6 @@ type SDKProcessorSpanQueueSize struct {
metric.Int64ObservableUpDownCounter
}
-var newSDKProcessorSpanQueueSizeOpts = []metric.Int64ObservableUpDownCounterOption{
- metric.WithDescription("The number of spans in the queue of a given instance of an SDK span processor."),
- metric.WithUnit("{span}"),
-}
-
// NewSDKProcessorSpanQueueSize returns a new SDKProcessorSpanQueueSize
// instrument.
func NewSDKProcessorSpanQueueSize(
@@ -1974,18 +1855,15 @@ func NewSDKProcessorSpanQueueSize(
return SDKProcessorSpanQueueSize{noop.Int64ObservableUpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKProcessorSpanQueueSizeOpts
- } else {
- opt = append(opt, newSDKProcessorSpanQueueSizeOpts...)
- }
-
i, err := m.Int64ObservableUpDownCounter(
"otel.sdk.processor.span.queue.size",
- opt...,
+ append([]metric.Int64ObservableUpDownCounterOption{
+ metric.WithDescription("The number of spans in the queue of a given instance of an SDK span processor."),
+ metric.WithUnit("{span}"),
+ }, opt...)...,
)
if err != nil {
- return SDKProcessorSpanQueueSize{noop.Int64ObservableUpDownCounter{}}, err
+ return SDKProcessorSpanQueueSize{noop.Int64ObservableUpDownCounter{}}, err
}
return SDKProcessorSpanQueueSize{i}, nil
}
@@ -2032,11 +1910,6 @@ type SDKSpanLive struct {
metric.Int64UpDownCounter
}
-var newSDKSpanLiveOpts = []metric.Int64UpDownCounterOption{
- metric.WithDescription("The number of created spans with `recording=true` for which the end operation has not been called yet."),
- metric.WithUnit("{span}"),
-}
-
// NewSDKSpanLive returns a new SDKSpanLive instrument.
func NewSDKSpanLive(
m metric.Meter,
@@ -2047,18 +1920,15 @@ func NewSDKSpanLive(
return SDKSpanLive{noop.Int64UpDownCounter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKSpanLiveOpts
- } else {
- opt = append(opt, newSDKSpanLiveOpts...)
- }
-
i, err := m.Int64UpDownCounter(
"otel.sdk.span.live",
- opt...,
+ append([]metric.Int64UpDownCounterOption{
+ metric.WithDescription("The number of created spans with `recording=true` for which the end operation has not been called yet."),
+ metric.WithUnit("{span}"),
+ }, opt...)...,
)
if err != nil {
- return SDKSpanLive{noop.Int64UpDownCounter{}}, err
+ return SDKSpanLive{noop.Int64UpDownCounter{}}, err
}
return SDKSpanLive{i}, nil
}
@@ -2143,11 +2013,6 @@ type SDKSpanStarted struct {
metric.Int64Counter
}
-var newSDKSpanStartedOpts = []metric.Int64CounterOption{
- metric.WithDescription("The number of created spans."),
- metric.WithUnit("{span}"),
-}
-
// NewSDKSpanStarted returns a new SDKSpanStarted instrument.
func NewSDKSpanStarted(
m metric.Meter,
@@ -2158,18 +2023,15 @@ func NewSDKSpanStarted(
return SDKSpanStarted{noop.Int64Counter{}}, nil
}
- if len(opt) == 0 {
- opt = newSDKSpanStartedOpts
- } else {
- opt = append(opt, newSDKSpanStartedOpts...)
- }
-
i, err := m.Int64Counter(
"otel.sdk.span.started",
- opt...,
+ append([]metric.Int64CounterOption{
+ metric.WithDescription("The number of created spans."),
+ metric.WithUnit("{span}"),
+ }, opt...)...,
)
if err != nil {
- return SDKSpanStarted{noop.Int64Counter{}}, err
+ return SDKSpanStarted{noop.Int64Counter{}}, err
}
return SDKSpanStarted{i}, nil
}
@@ -2261,4 +2123,4 @@ func (SDKSpanStarted) AttrSpanParentOrigin(val SpanParentOriginAttr) attribute.K
// value of the sampler for this span.
func (SDKSpanStarted) AttrSpanSamplingResult(val SpanSamplingResultAttr) attribute.KeyValue {
return attribute.String("otel.span.sampling_result", string(val))
-}
+}
\ No newline at end of file
diff --git a/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/rpcconv/metric.go b/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/rpcconv/metric.go
index 089b0c457f..146b7eda62 100644
--- a/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/rpcconv/metric.go
+++ b/vendor/go.opentelemetry.io/otel/semconv/v1.37.0/rpcconv/metric.go
@@ -3,7 +3,7 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0
-// Package rpcconv provides types and functionality for OpenTelemetry semantic
+// Package httpconv provides types and functionality for OpenTelemetry semantic
// conventions in the "rpc" namespace.
package rpcconv
@@ -28,11 +28,6 @@ type ClientDuration struct {
metric.Float64Histogram
}
-var newClientDurationOpts = []metric.Float64HistogramOption{
- metric.WithDescription("Measures the duration of outbound RPC."),
- metric.WithUnit("ms"),
-}
-
// NewClientDuration returns a new ClientDuration instrument.
func NewClientDuration(
m metric.Meter,
@@ -43,18 +38,15 @@ func NewClientDuration(
return ClientDuration{noop.Float64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newClientDurationOpts
- } else {
- opt = append(opt, newClientDurationOpts...)
- }
-
i, err := m.Float64Histogram(
"rpc.client.duration",
- opt...,
+ append([]metric.Float64HistogramOption{
+ metric.WithDescription("Measures the duration of outbound RPC."),
+ metric.WithUnit("ms"),
+ }, opt...)...,
)
if err != nil {
- return ClientDuration{noop.Float64Histogram{}}, err
+ return ClientDuration{noop.Float64Histogram{}}, err
}
return ClientDuration{i}, nil
}
@@ -110,7 +102,6 @@ func (m ClientDuration) Record(ctx context.Context, val float64, attrs ...attrib
func (m ClientDuration) RecordSet(ctx context.Context, val float64, set attribute.Set) {
if set.Len() == 0 {
m.Float64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -130,11 +121,6 @@ type ClientRequestSize struct {
metric.Int64Histogram
}
-var newClientRequestSizeOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Measures the size of RPC request messages (uncompressed)."),
- metric.WithUnit("By"),
-}
-
// NewClientRequestSize returns a new ClientRequestSize instrument.
func NewClientRequestSize(
m metric.Meter,
@@ -145,18 +131,15 @@ func NewClientRequestSize(
return ClientRequestSize{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newClientRequestSizeOpts
- } else {
- opt = append(opt, newClientRequestSizeOpts...)
- }
-
i, err := m.Int64Histogram(
"rpc.client.request.size",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Measures the size of RPC request messages (uncompressed)."),
+ metric.WithUnit("By"),
+ }, opt...)...,
)
if err != nil {
- return ClientRequestSize{noop.Int64Histogram{}}, err
+ return ClientRequestSize{noop.Int64Histogram{}}, err
}
return ClientRequestSize{i}, nil
}
@@ -206,7 +189,6 @@ func (m ClientRequestSize) Record(ctx context.Context, val int64, attrs ...attri
func (m ClientRequestSize) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -226,11 +208,6 @@ type ClientRequestsPerRPC struct {
metric.Int64Histogram
}
-var newClientRequestsPerRPCOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Measures the number of messages received per RPC."),
- metric.WithUnit("{count}"),
-}
-
// NewClientRequestsPerRPC returns a new ClientRequestsPerRPC instrument.
func NewClientRequestsPerRPC(
m metric.Meter,
@@ -241,18 +218,15 @@ func NewClientRequestsPerRPC(
return ClientRequestsPerRPC{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newClientRequestsPerRPCOpts
- } else {
- opt = append(opt, newClientRequestsPerRPCOpts...)
- }
-
i, err := m.Int64Histogram(
"rpc.client.requests_per_rpc",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Measures the number of messages received per RPC."),
+ metric.WithUnit("{count}"),
+ }, opt...)...,
)
if err != nil {
- return ClientRequestsPerRPC{noop.Int64Histogram{}}, err
+ return ClientRequestsPerRPC{noop.Int64Histogram{}}, err
}
return ClientRequestsPerRPC{i}, nil
}
@@ -306,7 +280,6 @@ func (m ClientRequestsPerRPC) Record(ctx context.Context, val int64, attrs ...at
func (m ClientRequestsPerRPC) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -326,11 +299,6 @@ type ClientResponseSize struct {
metric.Int64Histogram
}
-var newClientResponseSizeOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Measures the size of RPC response messages (uncompressed)."),
- metric.WithUnit("By"),
-}
-
// NewClientResponseSize returns a new ClientResponseSize instrument.
func NewClientResponseSize(
m metric.Meter,
@@ -341,18 +309,15 @@ func NewClientResponseSize(
return ClientResponseSize{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newClientResponseSizeOpts
- } else {
- opt = append(opt, newClientResponseSizeOpts...)
- }
-
i, err := m.Int64Histogram(
"rpc.client.response.size",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Measures the size of RPC response messages (uncompressed)."),
+ metric.WithUnit("By"),
+ }, opt...)...,
)
if err != nil {
- return ClientResponseSize{noop.Int64Histogram{}}, err
+ return ClientResponseSize{noop.Int64Histogram{}}, err
}
return ClientResponseSize{i}, nil
}
@@ -402,7 +367,6 @@ func (m ClientResponseSize) Record(ctx context.Context, val int64, attrs ...attr
func (m ClientResponseSize) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -422,11 +386,6 @@ type ClientResponsesPerRPC struct {
metric.Int64Histogram
}
-var newClientResponsesPerRPCOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Measures the number of messages sent per RPC."),
- metric.WithUnit("{count}"),
-}
-
// NewClientResponsesPerRPC returns a new ClientResponsesPerRPC instrument.
func NewClientResponsesPerRPC(
m metric.Meter,
@@ -437,18 +396,15 @@ func NewClientResponsesPerRPC(
return ClientResponsesPerRPC{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newClientResponsesPerRPCOpts
- } else {
- opt = append(opt, newClientResponsesPerRPCOpts...)
- }
-
i, err := m.Int64Histogram(
"rpc.client.responses_per_rpc",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Measures the number of messages sent per RPC."),
+ metric.WithUnit("{count}"),
+ }, opt...)...,
)
if err != nil {
- return ClientResponsesPerRPC{noop.Int64Histogram{}}, err
+ return ClientResponsesPerRPC{noop.Int64Histogram{}}, err
}
return ClientResponsesPerRPC{i}, nil
}
@@ -502,7 +458,6 @@ func (m ClientResponsesPerRPC) Record(ctx context.Context, val int64, attrs ...a
func (m ClientResponsesPerRPC) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -522,11 +477,6 @@ type ServerDuration struct {
metric.Float64Histogram
}
-var newServerDurationOpts = []metric.Float64HistogramOption{
- metric.WithDescription("Measures the duration of inbound RPC."),
- metric.WithUnit("ms"),
-}
-
// NewServerDuration returns a new ServerDuration instrument.
func NewServerDuration(
m metric.Meter,
@@ -537,18 +487,15 @@ func NewServerDuration(
return ServerDuration{noop.Float64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newServerDurationOpts
- } else {
- opt = append(opt, newServerDurationOpts...)
- }
-
i, err := m.Float64Histogram(
"rpc.server.duration",
- opt...,
+ append([]metric.Float64HistogramOption{
+ metric.WithDescription("Measures the duration of inbound RPC."),
+ metric.WithUnit("ms"),
+ }, opt...)...,
)
if err != nil {
- return ServerDuration{noop.Float64Histogram{}}, err
+ return ServerDuration{noop.Float64Histogram{}}, err
}
return ServerDuration{i}, nil
}
@@ -604,7 +551,6 @@ func (m ServerDuration) Record(ctx context.Context, val float64, attrs ...attrib
func (m ServerDuration) RecordSet(ctx context.Context, val float64, set attribute.Set) {
if set.Len() == 0 {
m.Float64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -624,11 +570,6 @@ type ServerRequestSize struct {
metric.Int64Histogram
}
-var newServerRequestSizeOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Measures the size of RPC request messages (uncompressed)."),
- metric.WithUnit("By"),
-}
-
// NewServerRequestSize returns a new ServerRequestSize instrument.
func NewServerRequestSize(
m metric.Meter,
@@ -639,18 +580,15 @@ func NewServerRequestSize(
return ServerRequestSize{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newServerRequestSizeOpts
- } else {
- opt = append(opt, newServerRequestSizeOpts...)
- }
-
i, err := m.Int64Histogram(
"rpc.server.request.size",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Measures the size of RPC request messages (uncompressed)."),
+ metric.WithUnit("By"),
+ }, opt...)...,
)
if err != nil {
- return ServerRequestSize{noop.Int64Histogram{}}, err
+ return ServerRequestSize{noop.Int64Histogram{}}, err
}
return ServerRequestSize{i}, nil
}
@@ -700,7 +638,6 @@ func (m ServerRequestSize) Record(ctx context.Context, val int64, attrs ...attri
func (m ServerRequestSize) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -720,11 +657,6 @@ type ServerRequestsPerRPC struct {
metric.Int64Histogram
}
-var newServerRequestsPerRPCOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Measures the number of messages received per RPC."),
- metric.WithUnit("{count}"),
-}
-
// NewServerRequestsPerRPC returns a new ServerRequestsPerRPC instrument.
func NewServerRequestsPerRPC(
m metric.Meter,
@@ -735,18 +667,15 @@ func NewServerRequestsPerRPC(
return ServerRequestsPerRPC{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newServerRequestsPerRPCOpts
- } else {
- opt = append(opt, newServerRequestsPerRPCOpts...)
- }
-
i, err := m.Int64Histogram(
"rpc.server.requests_per_rpc",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Measures the number of messages received per RPC."),
+ metric.WithUnit("{count}"),
+ }, opt...)...,
)
if err != nil {
- return ServerRequestsPerRPC{noop.Int64Histogram{}}, err
+ return ServerRequestsPerRPC{noop.Int64Histogram{}}, err
}
return ServerRequestsPerRPC{i}, nil
}
@@ -800,7 +729,6 @@ func (m ServerRequestsPerRPC) Record(ctx context.Context, val int64, attrs ...at
func (m ServerRequestsPerRPC) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -820,11 +748,6 @@ type ServerResponseSize struct {
metric.Int64Histogram
}
-var newServerResponseSizeOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Measures the size of RPC response messages (uncompressed)."),
- metric.WithUnit("By"),
-}
-
// NewServerResponseSize returns a new ServerResponseSize instrument.
func NewServerResponseSize(
m metric.Meter,
@@ -835,18 +758,15 @@ func NewServerResponseSize(
return ServerResponseSize{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newServerResponseSizeOpts
- } else {
- opt = append(opt, newServerResponseSizeOpts...)
- }
-
i, err := m.Int64Histogram(
"rpc.server.response.size",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Measures the size of RPC response messages (uncompressed)."),
+ metric.WithUnit("By"),
+ }, opt...)...,
)
if err != nil {
- return ServerResponseSize{noop.Int64Histogram{}}, err
+ return ServerResponseSize{noop.Int64Histogram{}}, err
}
return ServerResponseSize{i}, nil
}
@@ -896,7 +816,6 @@ func (m ServerResponseSize) Record(ctx context.Context, val int64, attrs ...attr
func (m ServerResponseSize) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -916,11 +835,6 @@ type ServerResponsesPerRPC struct {
metric.Int64Histogram
}
-var newServerResponsesPerRPCOpts = []metric.Int64HistogramOption{
- metric.WithDescription("Measures the number of messages sent per RPC."),
- metric.WithUnit("{count}"),
-}
-
// NewServerResponsesPerRPC returns a new ServerResponsesPerRPC instrument.
func NewServerResponsesPerRPC(
m metric.Meter,
@@ -931,18 +845,15 @@ func NewServerResponsesPerRPC(
return ServerResponsesPerRPC{noop.Int64Histogram{}}, nil
}
- if len(opt) == 0 {
- opt = newServerResponsesPerRPCOpts
- } else {
- opt = append(opt, newServerResponsesPerRPCOpts...)
- }
-
i, err := m.Int64Histogram(
"rpc.server.responses_per_rpc",
- opt...,
+ append([]metric.Int64HistogramOption{
+ metric.WithDescription("Measures the number of messages sent per RPC."),
+ metric.WithUnit("{count}"),
+ }, opt...)...,
)
if err != nil {
- return ServerResponsesPerRPC{noop.Int64Histogram{}}, err
+ return ServerResponsesPerRPC{noop.Int64Histogram{}}, err
}
return ServerResponsesPerRPC{i}, nil
}
@@ -996,7 +907,6 @@ func (m ServerResponsesPerRPC) Record(ctx context.Context, val int64, attrs ...a
func (m ServerResponsesPerRPC) RecordSet(ctx context.Context, val int64, set attribute.Set) {
if set.Len() == 0 {
m.Int64Histogram.Record(ctx, val)
- return
}
o := recOptPool.Get().(*[]metric.RecordOption)
@@ -1007,4 +917,4 @@ func (m ServerResponsesPerRPC) RecordSet(ctx context.Context, val int64, set att
*o = append(*o, metric.WithAttributeSet(set))
m.Int64Histogram.Record(ctx, val, *o...)
-}
+}
\ No newline at end of file
diff --git a/vendor/go.opentelemetry.io/otel/trace/config.go b/vendor/go.opentelemetry.io/otel/trace/config.go
index d9ecef1cad..aea11a2b52 100644
--- a/vendor/go.opentelemetry.io/otel/trace/config.go
+++ b/vendor/go.opentelemetry.io/otel/trace/config.go
@@ -4,7 +4,6 @@
package trace // import "go.opentelemetry.io/otel/trace"
import (
- "slices"
"time"
"go.opentelemetry.io/otel/attribute"
@@ -305,50 +304,12 @@ func WithInstrumentationVersion(version string) TracerOption {
})
}
-// mergeSets returns the union of keys between a and b. Any duplicate keys will
-// use the value associated with b.
-func mergeSets(a, b attribute.Set) attribute.Set {
- // NewMergeIterator uses the first value for any duplicates.
- iter := attribute.NewMergeIterator(&b, &a)
- merged := make([]attribute.KeyValue, 0, a.Len()+b.Len())
- for iter.Next() {
- merged = append(merged, iter.Attribute())
- }
- return attribute.NewSet(merged...)
-}
-
-// WithInstrumentationAttributes adds the instrumentation attributes.
+// WithInstrumentationAttributes sets the instrumentation attributes.
//
-// This is equivalent to calling [WithInstrumentationAttributeSet] with an
-// [attribute.Set] created from a clone of the passed attributes.
-// [WithInstrumentationAttributeSet] is recommended for more control.
-//
-// If multiple [WithInstrumentationAttributes] or [WithInstrumentationAttributeSet]
-// options are passed, the attributes will be merged together in the order
-// they are passed. Attributes with duplicate keys will use the last value passed.
+// The passed attributes will be de-duplicated.
func WithInstrumentationAttributes(attr ...attribute.KeyValue) TracerOption {
- set := attribute.NewSet(slices.Clone(attr)...)
- return WithInstrumentationAttributeSet(set)
-}
-
-// WithInstrumentationAttributeSet adds the instrumentation attributes.
-//
-// If multiple [WithInstrumentationAttributes] or [WithInstrumentationAttributeSet]
-// options are passed, the attributes will be merged together in the order
-// they are passed. Attributes with duplicate keys will use the last value passed.
-func WithInstrumentationAttributeSet(set attribute.Set) TracerOption {
- if set.Len() == 0 {
- return tracerOptionFunc(func(config TracerConfig) TracerConfig {
- return config
- })
- }
-
return tracerOptionFunc(func(config TracerConfig) TracerConfig {
- if config.attrs.Len() == 0 {
- config.attrs = set
- } else {
- config.attrs = mergeSets(config.attrs, set)
- }
+ config.attrs = attribute.NewSet(attr...)
return config
})
}
diff --git a/vendor/go.opentelemetry.io/otel/trace/span.go b/vendor/go.opentelemetry.io/otel/trace/span.go
index d01e793664..d3aa476ee1 100644
--- a/vendor/go.opentelemetry.io/otel/trace/span.go
+++ b/vendor/go.opentelemetry.io/otel/trace/span.go
@@ -66,10 +66,6 @@ type Span interface {
// SetAttributes sets kv as attributes of the Span. If a key from kv
// already exists for an attribute of the Span it will be overwritten with
// the value contained in kv.
- //
- // Note that adding attributes at span creation using [WithAttributes] is preferred
- // to calling SetAttribute later, as samplers can only consider information
- // already present during span creation.
SetAttributes(kv ...attribute.KeyValue)
// TracerProvider returns a TracerProvider that can be used to generate
diff --git a/vendor/go.opentelemetry.io/otel/version.go b/vendor/go.opentelemetry.io/otel/version.go
index 0d5b029187..bcaa5aa537 100644
--- a/vendor/go.opentelemetry.io/otel/version.go
+++ b/vendor/go.opentelemetry.io/otel/version.go
@@ -5,5 +5,5 @@ package otel // import "go.opentelemetry.io/otel"
// Version is the current release version of OpenTelemetry in use.
func Version() string {
- return "1.39.0"
+ return "1.38.0"
}
diff --git a/vendor/go.opentelemetry.io/otel/versions.yaml b/vendor/go.opentelemetry.io/otel/versions.yaml
index f4a3893eb5..07145e254b 100644
--- a/vendor/go.opentelemetry.io/otel/versions.yaml
+++ b/vendor/go.opentelemetry.io/otel/versions.yaml
@@ -3,7 +3,7 @@
module-sets:
stable-v1:
- version: v1.39.0
+ version: v1.38.0
modules:
- go.opentelemetry.io/otel
- go.opentelemetry.io/otel/bridge/opencensus
@@ -22,11 +22,11 @@ module-sets:
- go.opentelemetry.io/otel/sdk/metric
- go.opentelemetry.io/otel/trace
experimental-metrics:
- version: v0.61.0
+ version: v0.60.0
modules:
- go.opentelemetry.io/otel/exporters/prometheus
experimental-logs:
- version: v0.15.0
+ version: v0.14.0
modules:
- go.opentelemetry.io/otel/log
- go.opentelemetry.io/otel/log/logtest
@@ -36,28 +36,9 @@ module-sets:
- go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp
- go.opentelemetry.io/otel/exporters/stdout/stdoutlog
experimental-schema:
- version: v0.0.14
+ version: v0.0.13
modules:
- go.opentelemetry.io/otel/schema
excluded-modules:
- go.opentelemetry.io/otel/internal/tools
- go.opentelemetry.io/otel/trace/internal/telemetry/test
-modules:
- go.opentelemetry.io/otel/exporters/stdout/stdouttrace:
- version-refs:
- - ./internal/version.go
- go.opentelemetry.io/otel/exporters/prometheus:
- version-refs:
- - ./internal/version.go
- go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc:
- version-refs:
- - ./internal/version.go
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc:
- version-refs:
- - ./internal/version.go
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp:
- version-refs:
- - ./internal/version.go
- go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp:
- version-refs:
- - ./internal/version.go
diff --git a/vendor/golang.org/x/crypto/chacha20/chacha_arm64.s b/vendor/golang.org/x/crypto/chacha20/chacha_arm64.s
index 769af387e2..7dd2638e88 100644
--- a/vendor/golang.org/x/crypto/chacha20/chacha_arm64.s
+++ b/vendor/golang.org/x/crypto/chacha20/chacha_arm64.s
@@ -29,7 +29,7 @@ loop:
MOVD $NUM_ROUNDS, R21
VLD1 (R11), [V30.S4, V31.S4]
- // load constants
+ // load contants
// VLD4R (R10), [V0.S4, V1.S4, V2.S4, V3.S4]
WORD $0x4D60E940
diff --git a/vendor/golang.org/x/crypto/curve25519/curve25519.go b/vendor/golang.org/x/crypto/curve25519/curve25519.go
index 048faef3a5..8ff087df4c 100644
--- a/vendor/golang.org/x/crypto/curve25519/curve25519.go
+++ b/vendor/golang.org/x/crypto/curve25519/curve25519.go
@@ -3,14 +3,11 @@
// license that can be found in the LICENSE file.
// Package curve25519 provides an implementation of the X25519 function, which
-// performs scalar multiplication on the elliptic curve known as Curve25519
-// according to [RFC 7748].
+// performs scalar multiplication on the elliptic curve known as Curve25519.
+// See RFC 7748.
//
-// The curve25519 package is a wrapper for the X25519 implementation in the
-// crypto/ecdh package. It is [frozen] and is not accepting new features.
-//
-// [RFC 7748]: https://datatracker.ietf.org/doc/html/rfc7748
-// [frozen]: https://go.dev/wiki/Frozen
+// This package is a wrapper for the X25519 implementation
+// in the crypto/ecdh package.
package curve25519
import "crypto/ecdh"
diff --git a/vendor/golang.org/x/crypto/salsa20/salsa/hsalsa20.go b/vendor/golang.org/x/crypto/salsa20/salsa/hsalsa20.go
index 75df77406d..3685b34458 100644
--- a/vendor/golang.org/x/crypto/salsa20/salsa/hsalsa20.go
+++ b/vendor/golang.org/x/crypto/salsa20/salsa/hsalsa20.go
@@ -3,10 +3,6 @@
// license that can be found in the LICENSE file.
// Package salsa provides low-level access to functions in the Salsa family.
-//
-// Deprecated: this package exposes unsafe low-level operations. New applications
-// should consider using the AEAD construction in golang.org/x/crypto/chacha20poly1305
-// instead. Existing users should migrate to golang.org/x/crypto/salsa20.
package salsa
import "math/bits"
diff --git a/vendor/golang.org/x/crypto/ssh/cipher.go b/vendor/golang.org/x/crypto/ssh/cipher.go
index 7554ed57a9..6a5b582aa9 100644
--- a/vendor/golang.org/x/crypto/ssh/cipher.go
+++ b/vendor/golang.org/x/crypto/ssh/cipher.go
@@ -8,7 +8,6 @@ import (
"crypto/aes"
"crypto/cipher"
"crypto/des"
- "crypto/fips140"
"crypto/rc4"
"crypto/subtle"
"encoding/binary"
@@ -16,7 +15,6 @@ import (
"fmt"
"hash"
"io"
- "slices"
"golang.org/x/crypto/chacha20"
"golang.org/x/crypto/internal/poly1305"
@@ -95,41 +93,41 @@ func streamCipherMode(skip int, createFunc func(key, iv []byte) (cipher.Stream,
}
// cipherModes documents properties of supported ciphers. Ciphers not included
-// are not supported and will not be negotiated, even if explicitly configured.
-// When FIPS mode is enabled, only FIPS-approved algorithms are included.
-var cipherModes = map[string]*cipherMode{}
-
-func init() {
- cipherModes[CipherAES128CTR] = &cipherMode{16, aes.BlockSize, streamCipherMode(0, newAESCTR)}
- cipherModes[CipherAES192CTR] = &cipherMode{24, aes.BlockSize, streamCipherMode(0, newAESCTR)}
- cipherModes[CipherAES256CTR] = &cipherMode{32, aes.BlockSize, streamCipherMode(0, newAESCTR)}
- // Use of GCM with arbitrary IVs is not allowed in FIPS 140-only mode,
- // we'll wire it up to NewGCMForSSH in Go 1.26.
- //
- // For now it means we'll work with fips140=on but not fips140=only.
- cipherModes[CipherAES128GCM] = &cipherMode{16, 12, newGCMCipher}
- cipherModes[CipherAES256GCM] = &cipherMode{32, 12, newGCMCipher}
-
- if fips140.Enabled() {
- defaultCiphers = slices.DeleteFunc(defaultCiphers, func(algo string) bool {
- _, ok := cipherModes[algo]
- return !ok
- })
- return
- }
-
- cipherModes[CipherChaCha20Poly1305] = &cipherMode{64, 0, newChaCha20Cipher}
- // Insecure ciphers not included in the default configuration.
- cipherModes[InsecureCipherRC4128] = &cipherMode{16, 0, streamCipherMode(1536, newRC4)}
- cipherModes[InsecureCipherRC4256] = &cipherMode{32, 0, streamCipherMode(1536, newRC4)}
- cipherModes[InsecureCipherRC4] = &cipherMode{16, 0, streamCipherMode(0, newRC4)}
+// are not supported and will not be negotiated, even if explicitly requested in
+// ClientConfig.Crypto.Ciphers.
+var cipherModes = map[string]*cipherMode{
+ // Ciphers from RFC 4344, which introduced many CTR-based ciphers. Algorithms
+ // are defined in the order specified in the RFC.
+ CipherAES128CTR: {16, aes.BlockSize, streamCipherMode(0, newAESCTR)},
+ CipherAES192CTR: {24, aes.BlockSize, streamCipherMode(0, newAESCTR)},
+ CipherAES256CTR: {32, aes.BlockSize, streamCipherMode(0, newAESCTR)},
+
+ // Ciphers from RFC 4345, which introduces security-improved arcfour ciphers.
+ // They are defined in the order specified in the RFC.
+ InsecureCipherRC4128: {16, 0, streamCipherMode(1536, newRC4)},
+ InsecureCipherRC4256: {32, 0, streamCipherMode(1536, newRC4)},
+
+ // Cipher defined in RFC 4253, which describes SSH Transport Layer Protocol.
+ // Note that this cipher is not safe, as stated in RFC 4253: "Arcfour (and
+ // RC4) has problems with weak keys, and should be used with caution."
+ // RFC 4345 introduces improved versions of Arcfour.
+ InsecureCipherRC4: {16, 0, streamCipherMode(0, newRC4)},
+
+ // AEAD ciphers
+ CipherAES128GCM: {16, 12, newGCMCipher},
+ CipherAES256GCM: {32, 12, newGCMCipher},
+ CipherChaCha20Poly1305: {64, 0, newChaCha20Cipher},
+
// CBC mode is insecure and so is not included in the default config.
// (See https://www.ieee-security.org/TC/SP2013/papers/4977a526.pdf). If absolutely
// needed, it's possible to specify a custom Config to enable it.
// You should expect that an active attacker can recover plaintext if
// you do.
- cipherModes[InsecureCipherAES128CBC] = &cipherMode{16, aes.BlockSize, newAESCBCCipher}
- cipherModes[InsecureCipherTripleDESCBC] = &cipherMode{24, des.BlockSize, newTripleDESCBCCipher}
+ InsecureCipherAES128CBC: {16, aes.BlockSize, newAESCBCCipher},
+
+ // 3des-cbc is insecure and is not included in the default
+ // config.
+ InsecureCipherTripleDESCBC: {24, des.BlockSize, newTripleDESCBCCipher},
}
// prefixLen is the length of the packet prefix that contains the packet length
diff --git a/vendor/golang.org/x/crypto/ssh/client_auth.go b/vendor/golang.org/x/crypto/ssh/client_auth.go
index 3127e49903..c12818fdc5 100644
--- a/vendor/golang.org/x/crypto/ssh/client_auth.go
+++ b/vendor/golang.org/x/crypto/ssh/client_auth.go
@@ -9,7 +9,6 @@ import (
"errors"
"fmt"
"io"
- "slices"
"strings"
)
@@ -84,7 +83,7 @@ func (c *connection) clientAuthenticate(config *ClientConfig) error {
// success
return nil
} else if ok == authFailure {
- if m := auth.method(); !slices.Contains(tried, m) {
+ if m := auth.method(); !contains(tried, m) {
tried = append(tried, m)
}
}
@@ -98,7 +97,7 @@ func (c *connection) clientAuthenticate(config *ClientConfig) error {
findNext:
for _, a := range config.Auth {
candidateMethod := a.method()
- if slices.Contains(tried, candidateMethod) {
+ if contains(tried, candidateMethod) {
continue
}
for _, meth := range methods {
@@ -118,6 +117,15 @@ func (c *connection) clientAuthenticate(config *ClientConfig) error {
return fmt.Errorf("ssh: unable to authenticate, attempted methods %v, no supported methods remain", tried)
}
+func contains(list []string, e string) bool {
+ for _, s := range list {
+ if s == e {
+ return true
+ }
+ }
+ return false
+}
+
// An AuthMethod represents an instance of an RFC 4252 authentication method.
type AuthMethod interface {
// auth authenticates user over transport t.
@@ -247,7 +255,7 @@ func pickSignatureAlgorithm(signer Signer, extensions map[string][]byte) (MultiA
// Fallback to use if there is no "server-sig-algs" extension or a
// common algorithm cannot be found. We use the public key format if the
// MultiAlgorithmSigner supports it, otherwise we return an error.
- if !slices.Contains(as.Algorithms(), underlyingAlgo(keyFormat)) {
+ if !contains(as.Algorithms(), underlyingAlgo(keyFormat)) {
return "", fmt.Errorf("ssh: no common public key signature algorithm, server only supports %q for key type %q, signer only supports %v",
underlyingAlgo(keyFormat), keyFormat, as.Algorithms())
}
@@ -276,7 +284,7 @@ func pickSignatureAlgorithm(signer Signer, extensions map[string][]byte) (MultiA
// Filter algorithms based on those supported by MultiAlgorithmSigner.
var keyAlgos []string
for _, algo := range algorithmsForKeyFormat(keyFormat) {
- if slices.Contains(as.Algorithms(), underlyingAlgo(algo)) {
+ if contains(as.Algorithms(), underlyingAlgo(algo)) {
keyAlgos = append(keyAlgos, algo)
}
}
@@ -326,7 +334,7 @@ func (cb publicKeyCallback) auth(session []byte, user string, c packetConn, rand
// the key try to use the obtained algorithm as if "server-sig-algs" had
// not been implemented if supported from the algorithm signer.
if !ok && idx < origSignersLen && isRSACert(algo) && algo != CertAlgoRSAv01 {
- if slices.Contains(as.Algorithms(), KeyAlgoRSA) {
+ if contains(as.Algorithms(), KeyAlgoRSA) {
// We retry using the compat algorithm after all signers have
// been tried normally.
signers = append(signers, &multiAlgorithmSigner{
@@ -377,7 +385,7 @@ func (cb publicKeyCallback) auth(session []byte, user string, c packetConn, rand
// contain the "publickey" method, do not attempt to authenticate with any
// other keys. According to RFC 4252 Section 7, the latter can occur when
// additional authentication methods are required.
- if success == authSuccess || !slices.Contains(methods, cb.method()) {
+ if success == authSuccess || !contains(methods, cb.method()) {
return success, methods, err
}
}
@@ -426,7 +434,7 @@ func confirmKeyAck(key PublicKey, c packetConn) (bool, error) {
// servers send the key type instead. OpenSSH allows any algorithm
// that matches the public key, so we do the same.
// https://github.com/openssh/openssh-portable/blob/86bdd385/sshconnect2.c#L709
- if !slices.Contains(algorithmsForKeyFormat(key.Type()), msg.Algo) {
+ if !contains(algorithmsForKeyFormat(key.Type()), msg.Algo) {
return false, nil
}
if !bytes.Equal(msg.PubKey, pubKey) {
diff --git a/vendor/golang.org/x/crypto/ssh/common.go b/vendor/golang.org/x/crypto/ssh/common.go
index 2e44e9c9ec..8bfad16c41 100644
--- a/vendor/golang.org/x/crypto/ssh/common.go
+++ b/vendor/golang.org/x/crypto/ssh/common.go
@@ -6,7 +6,6 @@ package ssh
import (
"crypto"
- "crypto/fips140"
"crypto/rand"
"fmt"
"io"
@@ -257,40 +256,6 @@ type Algorithms struct {
PublicKeyAuths []string
}
-func init() {
- if fips140.Enabled() {
- defaultHostKeyAlgos = slices.DeleteFunc(defaultHostKeyAlgos, func(algo string) bool {
- _, err := hashFunc(underlyingAlgo(algo))
- return err != nil
- })
- defaultPubKeyAuthAlgos = slices.DeleteFunc(defaultPubKeyAuthAlgos, func(algo string) bool {
- _, err := hashFunc(underlyingAlgo(algo))
- return err != nil
- })
- }
-}
-
-func hashFunc(format string) (crypto.Hash, error) {
- switch format {
- case KeyAlgoRSASHA256, KeyAlgoECDSA256, KeyAlgoSKED25519, KeyAlgoSKECDSA256:
- return crypto.SHA256, nil
- case KeyAlgoECDSA384:
- return crypto.SHA384, nil
- case KeyAlgoRSASHA512, KeyAlgoECDSA521:
- return crypto.SHA512, nil
- case KeyAlgoED25519:
- // KeyAlgoED25519 doesn't pre-hash.
- return 0, nil
- case KeyAlgoRSA, InsecureKeyAlgoDSA:
- if fips140.Enabled() {
- return 0, fmt.Errorf("ssh: hash algorithm for format %q not allowed in FIPS 140 mode", format)
- }
- return crypto.SHA1, nil
- default:
- return 0, fmt.Errorf("ssh: hash algorithm for format %q not mapped", format)
- }
-}
-
// SupportedAlgorithms returns algorithms currently implemented by this package,
// excluding those with security issues, which are returned by
// InsecureAlgorithms. The algorithms listed here are in preference order.
@@ -318,6 +283,21 @@ func InsecureAlgorithms() Algorithms {
var supportedCompressions = []string{compressionNone}
+// hashFuncs keeps the mapping of supported signature algorithms to their
+// respective hashes needed for signing and verification.
+var hashFuncs = map[string]crypto.Hash{
+ KeyAlgoRSA: crypto.SHA1,
+ KeyAlgoRSASHA256: crypto.SHA256,
+ KeyAlgoRSASHA512: crypto.SHA512,
+ InsecureKeyAlgoDSA: crypto.SHA1,
+ KeyAlgoECDSA256: crypto.SHA256,
+ KeyAlgoECDSA384: crypto.SHA384,
+ KeyAlgoECDSA521: crypto.SHA512,
+ // KeyAlgoED25519 doesn't pre-hash.
+ KeyAlgoSKECDSA256: crypto.SHA256,
+ KeyAlgoSKED25519: crypto.SHA256,
+}
+
// algorithmsForKeyFormat returns the supported signature algorithms for a given
// public key format (PublicKey.Type), in order of preference. See RFC 8332,
// Section 2. See also the note in sendKexInit on backwards compatibility.
@@ -332,40 +312,11 @@ func algorithmsForKeyFormat(keyFormat string) []string {
}
}
-// keyFormatForAlgorithm returns the key format corresponding to the given
-// signature algorithm. It returns an empty string if the signature algorithm is
-// invalid or unsupported.
-func keyFormatForAlgorithm(sigAlgo string) string {
- switch sigAlgo {
- case KeyAlgoRSA, KeyAlgoRSASHA256, KeyAlgoRSASHA512:
- return KeyAlgoRSA
- case CertAlgoRSAv01, CertAlgoRSASHA256v01, CertAlgoRSASHA512v01:
- return CertAlgoRSAv01
- case KeyAlgoED25519,
- KeyAlgoSKED25519,
- KeyAlgoSKECDSA256,
- KeyAlgoECDSA256,
- KeyAlgoECDSA384,
- KeyAlgoECDSA521,
- InsecureKeyAlgoDSA,
- InsecureCertAlgoDSAv01,
- CertAlgoECDSA256v01,
- CertAlgoECDSA384v01,
- CertAlgoECDSA521v01,
- CertAlgoSKECDSA256v01,
- CertAlgoED25519v01,
- CertAlgoSKED25519v01:
- return sigAlgo
- default:
- return ""
- }
-}
-
// isRSA returns whether algo is a supported RSA algorithm, including certificate
// algorithms.
func isRSA(algo string) bool {
algos := algorithmsForKeyFormat(KeyAlgoRSA)
- return slices.Contains(algos, underlyingAlgo(algo))
+ return contains(algos, underlyingAlgo(algo))
}
func isRSACert(algo string) bool {
@@ -564,7 +515,7 @@ func (c *Config) SetDefaults() {
if kexAlgoMap[k] != nil {
// Ignore the KEX if we have no kexAlgoMap definition.
kexs = append(kexs, k)
- if k == KeyExchangeCurve25519 && !slices.Contains(c.KeyExchanges, keyExchangeCurve25519LibSSH) {
+ if k == KeyExchangeCurve25519 && !contains(c.KeyExchanges, keyExchangeCurve25519LibSSH) {
kexs = append(kexs, keyExchangeCurve25519LibSSH)
}
}
diff --git a/vendor/golang.org/x/crypto/ssh/doc.go b/vendor/golang.org/x/crypto/ssh/doc.go
index 5b4de9effc..04ccce3461 100644
--- a/vendor/golang.org/x/crypto/ssh/doc.go
+++ b/vendor/golang.org/x/crypto/ssh/doc.go
@@ -17,18 +17,8 @@ References:
[PROTOCOL.certkeys]: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.certkeys?rev=HEAD
[SSH-PARAMETERS]: http://www.iana.org/assignments/ssh-parameters/ssh-parameters.xml#ssh-parameters-1
[SSH-CERTS]: https://datatracker.ietf.org/doc/html/draft-miller-ssh-cert-01
- [FIPS 140-3 mode]: https://go.dev/doc/security/fips140
This package does not fall under the stability promise of the Go language itself,
so its API may be changed when pressing needs arise.
-
-# FIPS 140-3 mode
-
-When the program is in [FIPS 140-3 mode], this package behaves as if only SP
-800-140C and SP 800-140D approved cipher suites, signature algorithms,
-certificate public key types and sizes, and key exchange and derivation
-algorithms were implemented. Others are silently ignored and not negotiated, or
-rejected. This set may depend on the algorithms supported by the FIPS 140-3 Go
-Cryptographic Module selected with GOFIPS140, and may change across Go versions.
*/
package ssh
diff --git a/vendor/golang.org/x/crypto/ssh/handshake.go b/vendor/golang.org/x/crypto/ssh/handshake.go
index 4be3cbb6de..a90bfe331c 100644
--- a/vendor/golang.org/x/crypto/ssh/handshake.go
+++ b/vendor/golang.org/x/crypto/ssh/handshake.go
@@ -10,7 +10,6 @@ import (
"io"
"log"
"net"
- "slices"
"strings"
"sync"
)
@@ -528,7 +527,7 @@ func (t *handshakeTransport) sendKexInit() error {
switch s := k.(type) {
case MultiAlgorithmSigner:
for _, algo := range algorithmsForKeyFormat(keyFormat) {
- if slices.Contains(s.Algorithms(), underlyingAlgo(algo)) {
+ if contains(s.Algorithms(), underlyingAlgo(algo)) {
msg.ServerHostKeyAlgos = append(msg.ServerHostKeyAlgos, algo)
}
}
@@ -680,7 +679,7 @@ func (t *handshakeTransport) enterKeyExchange(otherInitPacket []byte) error {
return err
}
- if t.sessionID == nil && ((isClient && slices.Contains(serverInit.KexAlgos, kexStrictServer)) || (!isClient && slices.Contains(clientInit.KexAlgos, kexStrictClient))) {
+ if t.sessionID == nil && ((isClient && contains(serverInit.KexAlgos, kexStrictServer)) || (!isClient && contains(clientInit.KexAlgos, kexStrictClient))) {
t.strictMode = true
if err := t.conn.setStrictMode(); err != nil {
return err
@@ -737,7 +736,7 @@ func (t *handshakeTransport) enterKeyExchange(otherInitPacket []byte) error {
// On the server side, after the first SSH_MSG_NEWKEYS, send a SSH_MSG_EXT_INFO
// message with the server-sig-algs extension if the client supports it. See
// RFC 8308, Sections 2.4 and 3.1, and [PROTOCOL], Section 1.9.
- if !isClient && firstKeyExchange && slices.Contains(clientInit.KexAlgos, "ext-info-c") {
+ if !isClient && firstKeyExchange && contains(clientInit.KexAlgos, "ext-info-c") {
supportedPubKeyAuthAlgosList := strings.Join(t.publicKeyAuthAlgorithms, ",")
extInfo := &extInfoMsg{
NumExtensions: 2,
@@ -791,7 +790,7 @@ func (a algorithmSignerWrapper) SignWithAlgorithm(rand io.Reader, data []byte, a
func pickHostKey(hostKeys []Signer, algo string) AlgorithmSigner {
for _, k := range hostKeys {
if s, ok := k.(MultiAlgorithmSigner); ok {
- if !slices.Contains(s.Algorithms(), underlyingAlgo(algo)) {
+ if !contains(s.Algorithms(), underlyingAlgo(algo)) {
continue
}
}
diff --git a/vendor/golang.org/x/crypto/ssh/kex.go b/vendor/golang.org/x/crypto/ssh/kex.go
index 5f7fdd8514..78aaf03103 100644
--- a/vendor/golang.org/x/crypto/ssh/kex.go
+++ b/vendor/golang.org/x/crypto/ssh/kex.go
@@ -8,14 +8,12 @@ import (
"crypto"
"crypto/ecdsa"
"crypto/elliptic"
- "crypto/fips140"
"crypto/rand"
"encoding/binary"
"errors"
"fmt"
"io"
"math/big"
- "slices"
"golang.org/x/crypto/curve25519"
)
@@ -397,27 +395,9 @@ func ecHash(curve elliptic.Curve) crypto.Hash {
return crypto.SHA512
}
-// kexAlgoMap defines the supported KEXs. KEXs not included are not supported
-// and will not be negotiated, even if explicitly configured. When FIPS mode is
-// enabled, only FIPS-approved algorithms are included.
var kexAlgoMap = map[string]kexAlgorithm{}
func init() {
- // mlkem768x25519-sha256 we'll work with fips140=on but not fips140=only
- // until Go 1.26.
- kexAlgoMap[KeyExchangeMLKEM768X25519] = &mlkem768WithCurve25519sha256{}
- kexAlgoMap[KeyExchangeECDHP521] = &ecdh{elliptic.P521()}
- kexAlgoMap[KeyExchangeECDHP384] = &ecdh{elliptic.P384()}
- kexAlgoMap[KeyExchangeECDHP256] = &ecdh{elliptic.P256()}
-
- if fips140.Enabled() {
- defaultKexAlgos = slices.DeleteFunc(defaultKexAlgos, func(algo string) bool {
- _, ok := kexAlgoMap[algo]
- return !ok
- })
- return
- }
-
p, _ := new(big.Int).SetString(oakleyGroup2, 16)
kexAlgoMap[InsecureKeyExchangeDH1SHA1] = &dhGroup{
g: new(big.Int).SetInt64(2),
@@ -451,10 +431,14 @@ func init() {
hashFunc: crypto.SHA512,
}
+ kexAlgoMap[KeyExchangeECDHP521] = &ecdh{elliptic.P521()}
+ kexAlgoMap[KeyExchangeECDHP384] = &ecdh{elliptic.P384()}
+ kexAlgoMap[KeyExchangeECDHP256] = &ecdh{elliptic.P256()}
kexAlgoMap[KeyExchangeCurve25519] = &curve25519sha256{}
kexAlgoMap[keyExchangeCurve25519LibSSH] = &curve25519sha256{}
kexAlgoMap[InsecureKeyExchangeDHGEXSHA1] = &dhGEXSHA{hashFunc: crypto.SHA1}
kexAlgoMap[KeyExchangeDHGEXSHA256] = &dhGEXSHA{hashFunc: crypto.SHA256}
+ kexAlgoMap[KeyExchangeMLKEM768X25519] = &mlkem768WithCurve25519sha256{}
}
// curve25519sha256 implements the curve25519-sha256 (formerly known as
diff --git a/vendor/golang.org/x/crypto/ssh/keys.go b/vendor/golang.org/x/crypto/ssh/keys.go
index 47a07539d9..a28c0de503 100644
--- a/vendor/golang.org/x/crypto/ssh/keys.go
+++ b/vendor/golang.org/x/crypto/ssh/keys.go
@@ -27,7 +27,6 @@ import (
"fmt"
"io"
"math/big"
- "slices"
"strings"
"golang.org/x/crypto/ssh/internal/bcrypt_pbkdf"
@@ -90,11 +89,6 @@ func parsePubKey(in []byte, algo string) (pubKey PublicKey, rest []byte, err err
}
return cert, nil, nil
}
- if keyFormat := keyFormatForAlgorithm(algo); keyFormat != "" {
- return nil, nil, fmt.Errorf("ssh: signature algorithm %q isn't a key format; key is malformed and should be re-encoded with type %q",
- algo, keyFormat)
- }
-
return nil, nil, fmt.Errorf("ssh: unknown key algorithm: %v", algo)
}
@@ -197,10 +191,9 @@ func ParseKnownHosts(in []byte) (marker string, hosts []string, pubKey PublicKey
return "", nil, nil, "", nil, io.EOF
}
-// ParseAuthorizedKey parses a public key from an authorized_keys file used in
-// OpenSSH according to the sshd(8) manual page. Invalid lines are ignored.
+// ParseAuthorizedKey parses a public key from an authorized_keys
+// file used in OpenSSH according to the sshd(8) manual page.
func ParseAuthorizedKey(in []byte) (out PublicKey, comment string, options []string, rest []byte, err error) {
- var lastErr error
for len(in) > 0 {
end := bytes.IndexByte(in, '\n')
if end != -1 {
@@ -229,8 +222,6 @@ func ParseAuthorizedKey(in []byte) (out PublicKey, comment string, options []str
if out, comment, err = parseAuthorizedKey(in[i:]); err == nil {
return out, comment, options, rest, nil
- } else {
- lastErr = err
}
// No key type recognised. Maybe there's an options field at
@@ -273,18 +264,12 @@ func ParseAuthorizedKey(in []byte) (out PublicKey, comment string, options []str
if out, comment, err = parseAuthorizedKey(in[i:]); err == nil {
options = candidateOptions
return out, comment, options, rest, nil
- } else {
- lastErr = err
}
in = rest
continue
}
- if lastErr != nil {
- return nil, "", nil, nil, fmt.Errorf("ssh: no key found; last parsing error for ignored line: %w", lastErr)
- }
-
return nil, "", nil, nil, errors.New("ssh: no key found")
}
@@ -410,11 +395,11 @@ func NewSignerWithAlgorithms(signer AlgorithmSigner, algorithms []string) (Multi
}
for _, algo := range algorithms {
- if !slices.Contains(supportedAlgos, algo) {
+ if !contains(supportedAlgos, algo) {
return nil, fmt.Errorf("ssh: algorithm %q is not supported for key type %q",
algo, signer.PublicKey().Type())
}
- if !slices.Contains(signerAlgos, algo) {
+ if !contains(signerAlgos, algo) {
return nil, fmt.Errorf("ssh: algorithm %q is restricted for the provided signer", algo)
}
}
@@ -501,13 +486,10 @@ func (r *rsaPublicKey) Marshal() []byte {
func (r *rsaPublicKey) Verify(data []byte, sig *Signature) error {
supportedAlgos := algorithmsForKeyFormat(r.Type())
- if !slices.Contains(supportedAlgos, sig.Format) {
+ if !contains(supportedAlgos, sig.Format) {
return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, r.Type())
}
- hash, err := hashFunc(sig.Format)
- if err != nil {
- return err
- }
+ hash := hashFuncs[sig.Format]
h := hash.New()
h.Write(data)
digest := h.Sum(nil)
@@ -624,11 +606,7 @@ func (k *dsaPublicKey) Verify(data []byte, sig *Signature) error {
if sig.Format != k.Type() {
return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, k.Type())
}
- hash, err := hashFunc(sig.Format)
- if err != nil {
- return err
- }
- h := hash.New()
+ h := hashFuncs[sig.Format].New()
h.Write(data)
digest := h.Sum(nil)
@@ -673,11 +651,7 @@ func (k *dsaPrivateKey) SignWithAlgorithm(rand io.Reader, data []byte, algorithm
return nil, fmt.Errorf("ssh: unsupported signature algorithm %s", algorithm)
}
- hash, err := hashFunc(k.PublicKey().Type())
- if err != nil {
- return nil, err
- }
- h := hash.New()
+ h := hashFuncs[k.PublicKey().Type()].New()
h.Write(data)
digest := h.Sum(nil)
r, s, err := dsa.Sign(rand, k.PrivateKey, digest)
@@ -827,11 +801,8 @@ func (k *ecdsaPublicKey) Verify(data []byte, sig *Signature) error {
if sig.Format != k.Type() {
return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, k.Type())
}
- hash, err := hashFunc(sig.Format)
- if err != nil {
- return err
- }
- h := hash.New()
+
+ h := hashFuncs[sig.Format].New()
h.Write(data)
digest := h.Sum(nil)
@@ -934,11 +905,8 @@ func (k *skECDSAPublicKey) Verify(data []byte, sig *Signature) error {
if sig.Format != k.Type() {
return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, k.Type())
}
- hash, err := hashFunc(sig.Format)
- if err != nil {
- return err
- }
- h := hash.New()
+
+ h := hashFuncs[sig.Format].New()
h.Write([]byte(k.application))
appDigest := h.Sum(nil)
@@ -1041,11 +1009,7 @@ func (k *skEd25519PublicKey) Verify(data []byte, sig *Signature) error {
return fmt.Errorf("invalid size %d for Ed25519 public key", l)
}
- hash, err := hashFunc(sig.Format)
- if err != nil {
- return err
- }
- h := hash.New()
+ h := hashFuncs[sig.Format].New()
h.Write([]byte(k.application))
appDigest := h.Sum(nil)
@@ -1148,14 +1112,11 @@ func (s *wrappedSigner) SignWithAlgorithm(rand io.Reader, data []byte, algorithm
algorithm = s.pubKey.Type()
}
- if !slices.Contains(s.Algorithms(), algorithm) {
+ if !contains(s.Algorithms(), algorithm) {
return nil, fmt.Errorf("ssh: unsupported signature algorithm %q for key format %q", algorithm, s.pubKey.Type())
}
- hashFunc, err := hashFunc(algorithm)
- if err != nil {
- return nil, err
- }
+ hashFunc := hashFuncs[algorithm]
var digest []byte
if hashFunc != 0 {
h := hashFunc.New()
@@ -1490,7 +1451,6 @@ type openSSHEncryptedPrivateKey struct {
NumKeys uint32
PubKey []byte
PrivKeyBlock []byte
- Rest []byte `ssh:"rest"`
}
type openSSHPrivateKey struct {
diff --git a/vendor/golang.org/x/crypto/ssh/mac.go b/vendor/golang.org/x/crypto/ssh/mac.go
index 87d626fbbf..de2639d57f 100644
--- a/vendor/golang.org/x/crypto/ssh/mac.go
+++ b/vendor/golang.org/x/crypto/ssh/mac.go
@@ -7,13 +7,11 @@ package ssh
// Message authentication support
import (
- "crypto/fips140"
"crypto/hmac"
"crypto/sha1"
"crypto/sha256"
"crypto/sha512"
"hash"
- "slices"
)
type macMode struct {
@@ -48,37 +46,23 @@ func (t truncatingMAC) Size() int {
func (t truncatingMAC) BlockSize() int { return t.hmac.BlockSize() }
-// macModes defines the supported MACs. MACs not included are not supported
-// and will not be negotiated, even if explicitly configured. When FIPS mode is
-// enabled, only FIPS-approved algorithms are included.
-var macModes = map[string]*macMode{}
-
-func init() {
- macModes[HMACSHA512ETM] = &macMode{64, true, func(key []byte) hash.Hash {
+var macModes = map[string]*macMode{
+ HMACSHA512ETM: {64, true, func(key []byte) hash.Hash {
return hmac.New(sha512.New, key)
- }}
- macModes[HMACSHA256ETM] = &macMode{32, true, func(key []byte) hash.Hash {
+ }},
+ HMACSHA256ETM: {32, true, func(key []byte) hash.Hash {
return hmac.New(sha256.New, key)
- }}
- macModes[HMACSHA512] = &macMode{64, false, func(key []byte) hash.Hash {
+ }},
+ HMACSHA512: {64, false, func(key []byte) hash.Hash {
return hmac.New(sha512.New, key)
- }}
- macModes[HMACSHA256] = &macMode{32, false, func(key []byte) hash.Hash {
+ }},
+ HMACSHA256: {32, false, func(key []byte) hash.Hash {
return hmac.New(sha256.New, key)
- }}
-
- if fips140.Enabled() {
- defaultMACs = slices.DeleteFunc(defaultMACs, func(algo string) bool {
- _, ok := macModes[algo]
- return !ok
- })
- return
- }
-
- macModes[HMACSHA1] = &macMode{20, false, func(key []byte) hash.Hash {
+ }},
+ HMACSHA1: {20, false, func(key []byte) hash.Hash {
return hmac.New(sha1.New, key)
- }}
- macModes[InsecureHMACSHA196] = &macMode{20, false, func(key []byte) hash.Hash {
+ }},
+ InsecureHMACSHA196: {20, false, func(key []byte) hash.Hash {
return truncatingMAC{12, hmac.New(sha1.New, key)}
- }}
+ }},
}
diff --git a/vendor/golang.org/x/crypto/ssh/messages.go b/vendor/golang.org/x/crypto/ssh/messages.go
index ab22c3d38d..251b9d06a3 100644
--- a/vendor/golang.org/x/crypto/ssh/messages.go
+++ b/vendor/golang.org/x/crypto/ssh/messages.go
@@ -792,7 +792,7 @@ func marshalString(to []byte, s []byte) []byte {
return to[len(s):]
}
-var bigIntType = reflect.TypeFor[*big.Int]()
+var bigIntType = reflect.TypeOf((*big.Int)(nil))
// Decode a packet into its corresponding message.
func decode(packet []byte) (interface{}, error) {
diff --git a/vendor/golang.org/x/crypto/ssh/server.go b/vendor/golang.org/x/crypto/ssh/server.go
index 064dcbaf5a..98679ba5b6 100644
--- a/vendor/golang.org/x/crypto/ssh/server.go
+++ b/vendor/golang.org/x/crypto/ssh/server.go
@@ -10,7 +10,6 @@ import (
"fmt"
"io"
"net"
- "slices"
"strings"
)
@@ -44,9 +43,6 @@ type Permissions struct {
// pass data from the authentication callbacks to the server
// application layer.
Extensions map[string]string
-
- // ExtraData allows to store user defined data.
- ExtraData map[any]any
}
type GSSAPIWithMICConfig struct {
@@ -130,21 +126,6 @@ type ServerConfig struct {
// Permissions.Extensions entry.
PublicKeyCallback func(conn ConnMetadata, key PublicKey) (*Permissions, error)
- // VerifiedPublicKeyCallback, if non-nil, is called after a client
- // successfully confirms having control over a key that was previously
- // approved by PublicKeyCallback. The permissions object passed to the
- // callback is the one returned by PublicKeyCallback for the given public
- // key and its ownership is transferred to the callback. The returned
- // Permissions object can be the same object, optionally modified, or a
- // completely new object. If VerifiedPublicKeyCallback is non-nil,
- // PublicKeyCallback is not allowed to return a PartialSuccessError, which
- // can instead be returned by VerifiedPublicKeyCallback.
- //
- // VerifiedPublicKeyCallback does not affect which authentication methods
- // are included in the list of methods that can be attempted by the client.
- VerifiedPublicKeyCallback func(conn ConnMetadata, key PublicKey, permissions *Permissions,
- signatureAlgorithm string) (*Permissions, error)
-
// KeyboardInteractiveCallback, if non-nil, is called when
// keyboard-interactive authentication is selected (RFC
// 4256). The client object's Challenge function should be
@@ -265,7 +246,7 @@ func NewServerConn(c net.Conn, config *ServerConfig) (*ServerConn, <-chan NewCha
fullConf.PublicKeyAuthAlgorithms = defaultPubKeyAuthAlgos
} else {
for _, algo := range fullConf.PublicKeyAuthAlgorithms {
- if !slices.Contains(SupportedAlgorithms().PublicKeyAuths, algo) && !slices.Contains(InsecureAlgorithms().PublicKeyAuths, algo) {
+ if !contains(SupportedAlgorithms().PublicKeyAuths, algo) && !contains(InsecureAlgorithms().PublicKeyAuths, algo) {
c.Close()
return nil, nil, nil, fmt.Errorf("ssh: unsupported public key authentication algorithm %s", algo)
}
@@ -650,7 +631,7 @@ userAuthLoop:
return nil, parseError(msgUserAuthRequest)
}
algo := string(algoBytes)
- if !slices.Contains(config.PublicKeyAuthAlgorithms, underlyingAlgo(algo)) {
+ if !contains(config.PublicKeyAuthAlgorithms, underlyingAlgo(algo)) {
authErr = fmt.Errorf("ssh: algorithm %q not accepted", algo)
break
}
@@ -671,9 +652,6 @@ userAuthLoop:
candidate.pubKeyData = pubKeyData
candidate.perms, candidate.result = authConfig.PublicKeyCallback(s, pubKey)
_, isPartialSuccessError := candidate.result.(*PartialSuccessError)
- if isPartialSuccessError && config.VerifiedPublicKeyCallback != nil {
- return nil, errors.New("ssh: invalid library usage: PublicKeyCallback must not return partial success when VerifiedPublicKeyCallback is defined")
- }
if (candidate.result == nil || isPartialSuccessError) &&
candidate.perms != nil &&
@@ -717,7 +695,7 @@ userAuthLoop:
// ssh-rsa-cert-v01@openssh.com algorithm with ssh-rsa public
// key type. The algorithm and public key type must be
// consistent: both must be certificate algorithms, or neither.
- if !slices.Contains(algorithmsForKeyFormat(pubKey.Type()), algo) {
+ if !contains(algorithmsForKeyFormat(pubKey.Type()), algo) {
authErr = fmt.Errorf("ssh: public key type %q not compatible with selected algorithm %q",
pubKey.Type(), algo)
break
@@ -727,7 +705,7 @@ userAuthLoop:
// algorithm name that corresponds to algo with
// sig.Format. This is usually the same, but
// for certs, the names differ.
- if !slices.Contains(config.PublicKeyAuthAlgorithms, sig.Format) {
+ if !contains(config.PublicKeyAuthAlgorithms, sig.Format) {
authErr = fmt.Errorf("ssh: algorithm %q not accepted", sig.Format)
break
}
@@ -744,12 +722,6 @@ userAuthLoop:
authErr = candidate.result
perms = candidate.perms
- if authErr == nil && config.VerifiedPublicKeyCallback != nil {
- // Only call VerifiedPublicKeyCallback after the key has been accepted
- // and successfully verified. If authErr is non-nil, the key is not
- // considered verified and the callback must not run.
- perms, authErr = config.VerifiedPublicKeyCallback(s, pubKey, perms, algo)
- }
}
case "gssapi-with-mic":
if authConfig.GSSAPIWithMICConfig == nil {
diff --git a/vendor/golang.org/x/crypto/ssh/ssh_gss.go b/vendor/golang.org/x/crypto/ssh/ssh_gss.go
index a6249a1227..24bd7c8e83 100644
--- a/vendor/golang.org/x/crypto/ssh/ssh_gss.go
+++ b/vendor/golang.org/x/crypto/ssh/ssh_gss.go
@@ -106,13 +106,6 @@ func parseGSSAPIPayload(payload []byte) (*userAuthRequestGSSAPI, error) {
if !ok {
return nil, errors.New("parse uint32 failed")
}
- // Each ASN.1 encoded OID must have a minimum
- // of 2 bytes; 64 maximum mechanisms is an
- // arbitrary, but reasonable ceiling.
- const maxMechs = 64
- if n > maxMechs || int(n)*2 > len(rest) {
- return nil, errors.New("invalid mechanism count")
- }
s := &userAuthRequestGSSAPI{
N: n,
OIDS: make([]asn1.ObjectIdentifier, n),
@@ -129,6 +122,7 @@ func parseGSSAPIPayload(payload []byte) (*userAuthRequestGSSAPI, error) {
if rest, err = asn1.Unmarshal(desiredMech, &s.OIDS[i]); err != nil {
return nil, err
}
+
}
return s, nil
}
diff --git a/vendor/golang.org/x/crypto/ssh/streamlocal.go b/vendor/golang.org/x/crypto/ssh/streamlocal.go
index 152470fcb7..b171b330bc 100644
--- a/vendor/golang.org/x/crypto/ssh/streamlocal.go
+++ b/vendor/golang.org/x/crypto/ssh/streamlocal.go
@@ -44,7 +44,7 @@ func (c *Client) ListenUnix(socketPath string) (net.Listener, error) {
if !ok {
return nil, errors.New("ssh: streamlocal-forward@openssh.com request denied by peer")
}
- ch := c.forwards.add("unix", socketPath)
+ ch := c.forwards.add(&net.UnixAddr{Name: socketPath, Net: "unix"})
return &unixListener{socketPath, c, ch}, nil
}
@@ -96,7 +96,7 @@ func (l *unixListener) Accept() (net.Conn, error) {
// Close closes the listener.
func (l *unixListener) Close() error {
// this also closes the listener.
- l.conn.forwards.remove("unix", l.socketPath)
+ l.conn.forwards.remove(&net.UnixAddr{Name: l.socketPath, Net: "unix"})
m := streamLocalChannelForwardMsg{
l.socketPath,
}
diff --git a/vendor/golang.org/x/crypto/ssh/tcpip.go b/vendor/golang.org/x/crypto/ssh/tcpip.go
index 78c41fe5a1..93d844f035 100644
--- a/vendor/golang.org/x/crypto/ssh/tcpip.go
+++ b/vendor/golang.org/x/crypto/ssh/tcpip.go
@@ -11,7 +11,6 @@ import (
"io"
"math/rand"
"net"
- "net/netip"
"strconv"
"strings"
"sync"
@@ -23,21 +22,14 @@ import (
// the returned net.Listener. The listener must be serviced, or the
// SSH connection may hang.
// N must be "tcp", "tcp4", "tcp6", or "unix".
-//
-// If the address is a hostname, it is sent to the remote peer as-is, without
-// being resolved locally, and the Listener Addr method will return a zero IP.
func (c *Client) Listen(n, addr string) (net.Listener, error) {
switch n {
case "tcp", "tcp4", "tcp6":
- host, portStr, err := net.SplitHostPort(addr)
- if err != nil {
- return nil, err
- }
- port, err := strconv.ParseInt(portStr, 10, 32)
+ laddr, err := net.ResolveTCPAddr(n, addr)
if err != nil {
return nil, err
}
- return c.listenTCPInternal(host, int(port))
+ return c.ListenTCP(laddr)
case "unix":
return c.ListenUnix(addr)
default:
@@ -110,24 +102,15 @@ func (c *Client) handleForwards() {
// ListenTCP requests the remote peer open a listening socket
// on laddr. Incoming connections will be available by calling
// Accept on the returned net.Listener.
-//
-// ListenTCP accepts an IP address, to provide a hostname use [Client.Listen]
-// with "tcp", "tcp4", or "tcp6" network instead.
func (c *Client) ListenTCP(laddr *net.TCPAddr) (net.Listener, error) {
c.handleForwardsOnce.Do(c.handleForwards)
if laddr.Port == 0 && isBrokenOpenSSHVersion(string(c.ServerVersion())) {
return c.autoPortListenWorkaround(laddr)
}
- return c.listenTCPInternal(laddr.IP.String(), laddr.Port)
-}
-
-func (c *Client) listenTCPInternal(host string, port int) (net.Listener, error) {
- c.handleForwardsOnce.Do(c.handleForwards)
-
m := channelForwardMsg{
- host,
- uint32(port),
+ laddr.IP.String(),
+ uint32(laddr.Port),
}
// send message
ok, resp, err := c.SendRequest("tcpip-forward", true, Marshal(&m))
@@ -140,33 +123,20 @@ func (c *Client) listenTCPInternal(host string, port int) (net.Listener, error)
// If the original port was 0, then the remote side will
// supply a real port number in the response.
- if port == 0 {
+ if laddr.Port == 0 {
var p struct {
Port uint32
}
if err := Unmarshal(resp, &p); err != nil {
return nil, err
}
- port = int(p.Port)
- }
- // Construct a local address placeholder for the remote listener. If the
- // original host is an IP address, preserve it so that Listener.Addr()
- // reports the same IP. If the host is a hostname or cannot be parsed as an
- // IP, fall back to IPv4zero. The port field is always set, even if the
- // original port was 0, because in that case the remote server will assign
- // one, allowing callers to determine which port was selected.
- ip := net.IPv4zero
- if parsed, err := netip.ParseAddr(host); err == nil {
- ip = net.IP(parsed.AsSlice())
- }
- laddr := &net.TCPAddr{
- IP: ip,
- Port: port,
+ laddr.Port = int(p.Port)
}
- addr := net.JoinHostPort(host, strconv.FormatInt(int64(port), 10))
- ch := c.forwards.add("tcp", addr)
- return &tcpListener{laddr, addr, c, ch}, nil
+ // Register this forward, using the port number we obtained.
+ ch := c.forwards.add(laddr)
+
+ return &tcpListener{laddr, c, ch}, nil
}
// forwardList stores a mapping between remote
@@ -179,9 +149,8 @@ type forwardList struct {
// forwardEntry represents an established mapping of a laddr on a
// remote ssh server to a channel connected to a tcpListener.
type forwardEntry struct {
- addr string // host:port or socket path
- network string // tcp or unix
- c chan forward
+ laddr net.Addr
+ c chan forward
}
// forward represents an incoming forwarded tcpip connection. The
@@ -192,13 +161,12 @@ type forward struct {
raddr net.Addr // the raddr of the incoming connection
}
-func (l *forwardList) add(n, addr string) chan forward {
+func (l *forwardList) add(addr net.Addr) chan forward {
l.Lock()
defer l.Unlock()
f := forwardEntry{
- addr: addr,
- network: n,
- c: make(chan forward, 1),
+ laddr: addr,
+ c: make(chan forward, 1),
}
l.entries = append(l.entries, f)
return f.c
@@ -217,20 +185,19 @@ func parseTCPAddr(addr string, port uint32) (*net.TCPAddr, error) {
if port == 0 || port > 65535 {
return nil, fmt.Errorf("ssh: port number out of range: %d", port)
}
- ip, err := netip.ParseAddr(addr)
- if err != nil {
+ ip := net.ParseIP(string(addr))
+ if ip == nil {
return nil, fmt.Errorf("ssh: cannot parse IP address %q", addr)
}
- return &net.TCPAddr{IP: net.IP(ip.AsSlice()), Port: int(port)}, nil
+ return &net.TCPAddr{IP: ip, Port: int(port)}, nil
}
func (l *forwardList) handleChannels(in <-chan NewChannel) {
for ch := range in {
var (
- addr string
- network string
- raddr net.Addr
- err error
+ laddr net.Addr
+ raddr net.Addr
+ err error
)
switch channelType := ch.ChannelType(); channelType {
case "forwarded-tcpip":
@@ -240,34 +207,40 @@ func (l *forwardList) handleChannels(in <-chan NewChannel) {
continue
}
- // RFC 4254 section 7.2 specifies that incoming addresses should
- // list the address that was connected, in string format. It is the
- // same address used in the tcpip-forward request. The originator
- // address is an IP address instead.
- addr = net.JoinHostPort(payload.Addr, strconv.FormatUint(uint64(payload.Port), 10))
-
+ // RFC 4254 section 7.2 specifies that incoming
+ // addresses should list the address, in string
+ // format. It is implied that this should be an IP
+ // address, as it would be impossible to connect to it
+ // otherwise.
+ laddr, err = parseTCPAddr(payload.Addr, payload.Port)
+ if err != nil {
+ ch.Reject(ConnectionFailed, err.Error())
+ continue
+ }
raddr, err = parseTCPAddr(payload.OriginAddr, payload.OriginPort)
if err != nil {
ch.Reject(ConnectionFailed, err.Error())
continue
}
- network = "tcp"
+
case "forwarded-streamlocal@openssh.com":
var payload forwardedStreamLocalPayload
if err = Unmarshal(ch.ExtraData(), &payload); err != nil {
ch.Reject(ConnectionFailed, "could not parse forwarded-streamlocal@openssh.com payload: "+err.Error())
continue
}
- addr = payload.SocketPath
+ laddr = &net.UnixAddr{
+ Name: payload.SocketPath,
+ Net: "unix",
+ }
raddr = &net.UnixAddr{
Name: "@",
Net: "unix",
}
- network = "unix"
default:
panic(fmt.Errorf("ssh: unknown channel type %s", channelType))
}
- if ok := l.forward(network, addr, raddr, ch); !ok {
+ if ok := l.forward(laddr, raddr, ch); !ok {
// Section 7.2, implementations MUST reject spurious incoming
// connections.
ch.Reject(Prohibited, "no forward for address")
@@ -279,11 +252,11 @@ func (l *forwardList) handleChannels(in <-chan NewChannel) {
// remove removes the forward entry, and the channel feeding its
// listener.
-func (l *forwardList) remove(n, addr string) {
+func (l *forwardList) remove(addr net.Addr) {
l.Lock()
defer l.Unlock()
for i, f := range l.entries {
- if n == f.network && addr == f.addr {
+ if addr.Network() == f.laddr.Network() && addr.String() == f.laddr.String() {
l.entries = append(l.entries[:i], l.entries[i+1:]...)
close(f.c)
return
@@ -301,11 +274,11 @@ func (l *forwardList) closeAll() {
l.entries = nil
}
-func (l *forwardList) forward(n, addr string, raddr net.Addr, ch NewChannel) bool {
+func (l *forwardList) forward(laddr, raddr net.Addr, ch NewChannel) bool {
l.Lock()
defer l.Unlock()
for _, f := range l.entries {
- if n == f.network && addr == f.addr {
+ if laddr.Network() == f.laddr.Network() && laddr.String() == f.laddr.String() {
f.c <- forward{newCh: ch, raddr: raddr}
return true
}
@@ -315,7 +288,6 @@ func (l *forwardList) forward(n, addr string, raddr net.Addr, ch NewChannel) boo
type tcpListener struct {
laddr *net.TCPAddr
- addr string
conn *Client
in <-chan forward
@@ -342,21 +314,13 @@ func (l *tcpListener) Accept() (net.Conn, error) {
// Close closes the listener.
func (l *tcpListener) Close() error {
- host, port, err := net.SplitHostPort(l.addr)
- if err != nil {
- return err
- }
- rport, err := strconv.ParseUint(port, 10, 32)
- if err != nil {
- return err
- }
m := channelForwardMsg{
- host,
- uint32(rport),
+ l.laddr.IP.String(),
+ uint32(l.laddr.Port),
}
// this also closes the listener.
- l.conn.forwards.remove("tcp", l.addr)
+ l.conn.forwards.remove(l.laddr)
ok, _, err := l.conn.SendRequest("cancel-tcpip-forward", true, Marshal(&m))
if err == nil && !ok {
err = errors.New("ssh: cancel-tcpip-forward failed")
diff --git a/vendor/golang.org/x/crypto/ssh/transport.go b/vendor/golang.org/x/crypto/ssh/transport.go
index fa3dd6a429..663619845c 100644
--- a/vendor/golang.org/x/crypto/ssh/transport.go
+++ b/vendor/golang.org/x/crypto/ssh/transport.go
@@ -8,7 +8,6 @@ import (
"bufio"
"bytes"
"errors"
- "fmt"
"io"
"log"
)
@@ -255,9 +254,6 @@ var (
// (to setup server->client keys) or clientKeys (for client->server keys).
func newPacketCipher(d direction, algs DirectionAlgorithms, kex *kexResult) (packetCipher, error) {
cipherMode := cipherModes[algs.Cipher]
- if cipherMode == nil {
- return nil, fmt.Errorf("ssh: unsupported cipher %v", algs.Cipher)
- }
iv := make([]byte, cipherMode.ivSize)
key := make([]byte, cipherMode.keySize)
diff --git a/vendor/golang.org/x/mod/semver/semver.go b/vendor/golang.org/x/mod/semver/semver.go
index 824b282c83..628f8fd687 100644
--- a/vendor/golang.org/x/mod/semver/semver.go
+++ b/vendor/golang.org/x/mod/semver/semver.go
@@ -45,8 +45,8 @@ func IsValid(v string) bool {
// Canonical returns the canonical formatting of the semantic version v.
// It fills in any missing .MINOR or .PATCH and discards build metadata.
-// Two semantic versions compare equal only if their canonical formatting
-// is an identical string.
+// Two semantic versions compare equal only if their canonical formattings
+// are identical strings.
// The canonical invalid semantic version is the empty string.
func Canonical(v string) string {
p, ok := parse(v)
diff --git a/vendor/golang.org/x/net/context/context.go b/vendor/golang.org/x/net/context/context.go
index 24cea68820..d3cb951752 100644
--- a/vendor/golang.org/x/net/context/context.go
+++ b/vendor/golang.org/x/net/context/context.go
@@ -2,9 +2,42 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// Package context has been superseded by the standard library [context] package.
+// Package context defines the Context type, which carries deadlines,
+// cancellation signals, and other request-scoped values across API boundaries
+// and between processes.
+// As of Go 1.7 this package is available in the standard library under the
+// name [context].
+//
+// Incoming requests to a server should create a [Context], and outgoing
+// calls to servers should accept a Context. The chain of function
+// calls between them must propagate the Context, optionally replacing
+// it with a derived Context created using [WithCancel], [WithDeadline],
+// [WithTimeout], or [WithValue].
+//
+// Programs that use Contexts should follow these rules to keep interfaces
+// consistent across packages and enable static analysis tools to check context
+// propagation:
+//
+// Do not store Contexts inside a struct type; instead, pass a Context
+// explicitly to each function that needs it. This is discussed further in
+// https://go.dev/blog/context-and-structs. The Context should be the first
+// parameter, typically named ctx:
+//
+// func DoSomething(ctx context.Context, arg Arg) error {
+// // ... use ctx ...
+// }
+//
+// Do not pass a nil [Context], even if a function permits it. Pass [context.TODO]
+// if you are unsure about which Context to use.
+//
+// Use context Values only for request-scoped data that transits processes and
+// APIs, not for passing optional parameters to functions.
+//
+// The same Context may be passed to functions running in different goroutines;
+// Contexts are safe for simultaneous use by multiple goroutines.
//
-// Deprecated: Use the standard library context package instead.
+// See https://go.dev/blog/context for example code for a server that uses
+// Contexts.
package context
import (
diff --git a/vendor/golang.org/x/net/http2/frame.go b/vendor/golang.org/x/net/http2/frame.go
index 9a4bd123c9..93bcaab03a 100644
--- a/vendor/golang.org/x/net/http2/frame.go
+++ b/vendor/golang.org/x/net/http2/frame.go
@@ -280,8 +280,6 @@ type Framer struct {
// lastHeaderStream is non-zero if the last frame was an
// unfinished HEADERS/CONTINUATION.
lastHeaderStream uint32
- // lastFrameType holds the type of the last frame for verifying frame order.
- lastFrameType FrameType
maxReadSize uint32
headerBuf [frameHeaderLen]byte
@@ -490,41 +488,30 @@ func terminalReadFrameError(err error) bool {
return err != nil
}
-// ReadFrameHeader reads the header of the next frame.
-// It reads the 9-byte fixed frame header, and does not read any portion of the
-// frame payload. The caller is responsible for consuming the payload, either
-// with ReadFrameForHeader or directly from the Framer's io.Reader.
+// ReadFrame reads a single frame. The returned Frame is only valid
+// until the next call to ReadFrame.
//
-// If the frame is larger than previously set with SetMaxReadFrameSize, it
-// returns the frame header and ErrFrameTooLarge.
+// If the frame is larger than previously set with SetMaxReadFrameSize, the
+// returned error is ErrFrameTooLarge. Other errors may be of type
+// ConnectionError, StreamError, or anything else from the underlying
+// reader.
//
-// If the returned FrameHeader.StreamID is non-zero, it indicates the stream
-// responsible for the error.
-func (fr *Framer) ReadFrameHeader() (FrameHeader, error) {
+// If ReadFrame returns an error and a non-nil Frame, the Frame's StreamID
+// indicates the stream responsible for the error.
+func (fr *Framer) ReadFrame() (Frame, error) {
fr.errDetail = nil
+ if fr.lastFrame != nil {
+ fr.lastFrame.invalidate()
+ }
fh, err := readFrameHeader(fr.headerBuf[:], fr.r)
if err != nil {
- return fh, err
+ return nil, err
}
if fh.Length > fr.maxReadSize {
if fh == invalidHTTP1LookingFrameHeader() {
- return fh, fmt.Errorf("http2: failed reading the frame payload: %w, note that the frame header looked like an HTTP/1.1 header", ErrFrameTooLarge)
+ return nil, fmt.Errorf("http2: failed reading the frame payload: %w, note that the frame header looked like an HTTP/1.1 header", ErrFrameTooLarge)
}
- return fh, ErrFrameTooLarge
- }
- if err := fr.checkFrameOrder(fh); err != nil {
- return fh, err
- }
- return fh, nil
-}
-
-// ReadFrameForHeader reads the payload for the frame with the given FrameHeader.
-//
-// It behaves identically to ReadFrame, other than not checking the maximum
-// frame size.
-func (fr *Framer) ReadFrameForHeader(fh FrameHeader) (Frame, error) {
- if fr.lastFrame != nil {
- fr.lastFrame.invalidate()
+ return nil, ErrFrameTooLarge
}
payload := fr.getReadBuf(fh.Length)
if _, err := io.ReadFull(fr.r, payload); err != nil {
@@ -540,7 +527,9 @@ func (fr *Framer) ReadFrameForHeader(fh FrameHeader) (Frame, error) {
}
return nil, err
}
- fr.lastFrame = f
+ if err := fr.checkFrameOrder(f); err != nil {
+ return nil, err
+ }
if fr.logReads {
fr.debugReadLoggerf("http2: Framer %p: read %v", fr, summarizeFrame(f))
}
@@ -550,24 +539,6 @@ func (fr *Framer) ReadFrameForHeader(fh FrameHeader) (Frame, error) {
return f, nil
}
-// ReadFrame reads a single frame. The returned Frame is only valid
-// until the next call to ReadFrame or ReadFrameBodyForHeader.
-//
-// If the frame is larger than previously set with SetMaxReadFrameSize, the
-// returned error is ErrFrameTooLarge. Other errors may be of type
-// ConnectionError, StreamError, or anything else from the underlying
-// reader.
-//
-// If ReadFrame returns an error and a non-nil Frame, the Frame's StreamID
-// indicates the stream responsible for the error.
-func (fr *Framer) ReadFrame() (Frame, error) {
- fh, err := fr.ReadFrameHeader()
- if err != nil {
- return nil, err
- }
- return fr.ReadFrameForHeader(fh)
-}
-
// connError returns ConnectionError(code) but first
// stashes away a public reason to the caller can optionally relay it
// to the peer before hanging up on them. This might help others debug
@@ -580,19 +551,20 @@ func (fr *Framer) connError(code ErrCode, reason string) error {
// checkFrameOrder reports an error if f is an invalid frame to return
// next from ReadFrame. Mostly it checks whether HEADERS and
// CONTINUATION frames are contiguous.
-func (fr *Framer) checkFrameOrder(fh FrameHeader) error {
- lastType := fr.lastFrameType
- fr.lastFrameType = fh.Type
+func (fr *Framer) checkFrameOrder(f Frame) error {
+ last := fr.lastFrame
+ fr.lastFrame = f
if fr.AllowIllegalReads {
return nil
}
+ fh := f.Header()
if fr.lastHeaderStream != 0 {
if fh.Type != FrameContinuation {
return fr.connError(ErrCodeProtocol,
fmt.Sprintf("got %s for stream %d; expected CONTINUATION following %s for stream %d",
fh.Type, fh.StreamID,
- lastType, fr.lastHeaderStream))
+ last.Header().Type, fr.lastHeaderStream))
}
if fh.StreamID != fr.lastHeaderStream {
return fr.connError(ErrCodeProtocol,
@@ -1189,7 +1161,7 @@ var defaultRFC9218Priority = PriorityParam{
// PriorityParam struct below is a superset of both schemes. The exported
// symbols are from RFC 7540 and the non-exported ones are from RFC 9218.
-// PriorityParam are the stream prioritization parameters.
+// PriorityParam are the stream prioritzation parameters.
type PriorityParam struct {
// StreamDep is a 31-bit stream identifier for the
// stream that this stream depends on. Zero means no
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
index ccb87e6da3..be759b6065 100644
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -9,7 +9,6 @@ package http2
import (
"bufio"
"bytes"
- "compress/flate"
"compress/gzip"
"context"
"crypto/rand"
@@ -376,24 +375,11 @@ type ClientConn struct {
// completely unresponsive connection.
pendingResets int
- // readBeforeStreamID is the smallest stream ID that has not been followed by
- // a frame read from the peer. We use this to determine when a request may
- // have been sent to a completely unresponsive connection:
- // If the request ID is less than readBeforeStreamID, then we have had some
- // indication of life on the connection since sending the request.
- readBeforeStreamID uint32
-
// reqHeaderMu is a 1-element semaphore channel controlling access to sending new requests.
// Write to reqHeaderMu to lock it, read from it to unlock.
// Lock reqmu BEFORE mu or wmu.
reqHeaderMu chan struct{}
- // internalStateHook reports state changes back to the net/http.ClientConn.
- // Note that this is different from the user state hook registered by
- // net/http.ClientConn.SetStateHook: The internal hook calls ClientConn,
- // which calls the user hook.
- internalStateHook func()
-
// wmu is held while writing.
// Acquire BEFORE mu when holding both, to avoid blocking mu on network writes.
// Only acquire both at the same time when changing peer settings.
@@ -723,7 +709,7 @@ func canRetryError(err error) bool {
func (t *Transport) dialClientConn(ctx context.Context, addr string, singleUse bool) (*ClientConn, error) {
if t.transportTestHooks != nil {
- return t.newClientConn(nil, singleUse, nil)
+ return t.newClientConn(nil, singleUse)
}
host, _, err := net.SplitHostPort(addr)
if err != nil {
@@ -733,7 +719,7 @@ func (t *Transport) dialClientConn(ctx context.Context, addr string, singleUse b
if err != nil {
return nil, err
}
- return t.newClientConn(tconn, singleUse, nil)
+ return t.newClientConn(tconn, singleUse)
}
func (t *Transport) newTLSConfig(host string) *tls.Config {
@@ -785,10 +771,10 @@ func (t *Transport) expectContinueTimeout() time.Duration {
}
func (t *Transport) NewClientConn(c net.Conn) (*ClientConn, error) {
- return t.newClientConn(c, t.disableKeepAlives(), nil)
+ return t.newClientConn(c, t.disableKeepAlives())
}
-func (t *Transport) newClientConn(c net.Conn, singleUse bool, internalStateHook func()) (*ClientConn, error) {
+func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, error) {
conf := configFromTransport(t)
cc := &ClientConn{
t: t,
@@ -810,7 +796,6 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool, internalStateHook
pings: make(map[[8]byte]chan struct{}),
reqHeaderMu: make(chan struct{}, 1),
lastActive: time.Now(),
- internalStateHook: internalStateHook,
}
if t.transportTestHooks != nil {
t.transportTestHooks.newclientconn(cc)
@@ -1051,7 +1036,10 @@ func (cc *ClientConn) idleStateLocked() (st clientConnIdleState) {
maxConcurrentOkay = cc.currentRequestCountLocked() < int(cc.maxConcurrentStreams)
}
- st.canTakeNewRequest = maxConcurrentOkay && cc.isUsableLocked()
+ st.canTakeNewRequest = cc.goAway == nil && !cc.closed && !cc.closing && maxConcurrentOkay &&
+ !cc.doNotReuse &&
+ int64(cc.nextStreamID)+2*int64(cc.pendingRequests) < math.MaxInt32 &&
+ !cc.tooIdleLocked()
// If this connection has never been used for a request and is closed,
// then let it take a request (which will fail).
@@ -1067,31 +1055,6 @@ func (cc *ClientConn) idleStateLocked() (st clientConnIdleState) {
return
}
-func (cc *ClientConn) isUsableLocked() bool {
- return cc.goAway == nil &&
- !cc.closed &&
- !cc.closing &&
- !cc.doNotReuse &&
- int64(cc.nextStreamID)+2*int64(cc.pendingRequests) < math.MaxInt32 &&
- !cc.tooIdleLocked()
-}
-
-// canReserveLocked reports whether a net/http.ClientConn can reserve a slot on this conn.
-//
-// This follows slightly different rules than clientConnIdleState.canTakeNewRequest.
-// We only permit reservations up to the conn's concurrency limit.
-// This differs from ClientConn.ReserveNewRequest, which permits reservations
-// past the limit when StrictMaxConcurrentStreams is set.
-func (cc *ClientConn) canReserveLocked() bool {
- if cc.currentRequestCountLocked() >= int(cc.maxConcurrentStreams) {
- return false
- }
- if !cc.isUsableLocked() {
- return false
- }
- return true
-}
-
// currentRequestCountLocked reports the number of concurrency slots currently in use,
// including active streams, reserved slots, and reset streams waiting for acknowledgement.
func (cc *ClientConn) currentRequestCountLocked() int {
@@ -1103,14 +1066,6 @@ func (cc *ClientConn) canTakeNewRequestLocked() bool {
return st.canTakeNewRequest
}
-// availableLocked reports the number of concurrency slots available.
-func (cc *ClientConn) availableLocked() int {
- if !cc.canTakeNewRequestLocked() {
- return 0
- }
- return max(0, int(cc.maxConcurrentStreams)-cc.currentRequestCountLocked())
-}
-
// tooIdleLocked reports whether this connection has been been sitting idle
// for too much wall time.
func (cc *ClientConn) tooIdleLocked() bool {
@@ -1135,7 +1090,6 @@ func (cc *ClientConn) closeConn() {
t := time.AfterFunc(250*time.Millisecond, cc.forceCloseConn)
defer t.Stop()
cc.tconn.Close()
- cc.maybeCallStateHook()
}
// A tls.Conn.Close can hang for a long time if the peer is unresponsive.
@@ -1661,8 +1615,6 @@ func (cs *clientStream) cleanupWriteRequest(err error) {
}
bodyClosed := cs.reqBodyClosed
closeOnIdle := cc.singleUse || cc.doNotReuse || cc.t.disableKeepAlives() || cc.goAway != nil
- // Have we read any frames from the connection since sending this request?
- readSinceStream := cc.readBeforeStreamID > cs.ID
cc.mu.Unlock()
if mustCloseBody {
cs.reqBody.Close()
@@ -1694,10 +1646,8 @@ func (cs *clientStream) cleanupWriteRequest(err error) {
//
// This could be due to the server becoming unresponsive.
// To avoid sending too many requests on a dead connection,
- // if we haven't read any frames from the connection since
- // sending this request, we let it continue to consume
- // a concurrency slot until we can confirm the server is
- // still responding.
+ // we let the request continue to consume a concurrency slot
+ // until we can confirm the server is still responding.
// We do this by sending a PING frame along with the RST_STREAM
// (unless a ping is already in flight).
//
@@ -1708,7 +1658,7 @@ func (cs *clientStream) cleanupWriteRequest(err error) {
// because it's short lived and will probably be closed before
// we get the ping response.
ping := false
- if !closeOnIdle && !readSinceStream {
+ if !closeOnIdle {
cc.mu.Lock()
// rstStreamPingsBlocked works around a gRPC behavior:
// see comment on the field for details.
@@ -1742,7 +1692,6 @@ func (cs *clientStream) cleanupWriteRequest(err error) {
}
close(cs.donec)
- cc.maybeCallStateHook()
}
// awaitOpenSlotForStreamLocked waits until len(streams) < maxConcurrentStreams.
@@ -2795,7 +2744,6 @@ func (rl *clientConnReadLoop) streamByID(id uint32, headerOrData bool) *clientSt
// See comment on ClientConn.rstStreamPingsBlocked for details.
rl.cc.rstStreamPingsBlocked = false
}
- rl.cc.readBeforeStreamID = rl.cc.nextStreamID
cs := rl.cc.streams[id]
if cs != nil && !cs.readAborted {
return cs
@@ -2846,7 +2794,6 @@ func (rl *clientConnReadLoop) processSettings(f *SettingsFrame) error {
func (rl *clientConnReadLoop) processSettingsNoWrite(f *SettingsFrame) error {
cc := rl.cc
- defer cc.maybeCallStateHook()
cc.mu.Lock()
defer cc.mu.Unlock()
@@ -3027,7 +2974,6 @@ func (cc *ClientConn) Ping(ctx context.Context) error {
func (rl *clientConnReadLoop) processPing(f *PingFrame) error {
if f.IsAck() {
cc := rl.cc
- defer cc.maybeCallStateHook()
cc.mu.Lock()
defer cc.mu.Unlock()
// If ack, notify listener if any
@@ -3130,102 +3076,35 @@ type erringRoundTripper struct{ err error }
func (rt erringRoundTripper) RoundTripErr() error { return rt.err }
func (rt erringRoundTripper) RoundTrip(*http.Request) (*http.Response, error) { return nil, rt.err }
-var errConcurrentReadOnResBody = errors.New("http2: concurrent read on response body")
-
// gzipReader wraps a response body so it can lazily
-// get gzip.Reader from the pool on the first call to Read.
-// After Close is called it puts gzip.Reader to the pool immediately
-// if there is no Read in progress or later when Read completes.
+// call gzip.NewReader on the first call to Read
type gzipReader struct {
_ incomparable
body io.ReadCloser // underlying Response.Body
- mu sync.Mutex // guards zr and zerr
- zr *gzip.Reader // stores gzip reader from the pool between reads
- zerr error // sticky gzip reader init error or sentinel value to detect concurrent read and read after close
-}
-
-type eofReader struct{}
-
-func (eofReader) Read([]byte) (int, error) { return 0, io.EOF }
-func (eofReader) ReadByte() (byte, error) { return 0, io.EOF }
-
-var gzipPool = sync.Pool{New: func() any { return new(gzip.Reader) }}
-
-// gzipPoolGet gets a gzip.Reader from the pool and resets it to read from r.
-func gzipPoolGet(r io.Reader) (*gzip.Reader, error) {
- zr := gzipPool.Get().(*gzip.Reader)
- if err := zr.Reset(r); err != nil {
- gzipPoolPut(zr)
- return nil, err
- }
- return zr, nil
-}
-
-// gzipPoolPut puts a gzip.Reader back into the pool.
-func gzipPoolPut(zr *gzip.Reader) {
- // Reset will allocate bufio.Reader if we pass it anything
- // other than a flate.Reader, so ensure that it's getting one.
- var r flate.Reader = eofReader{}
- zr.Reset(r)
- gzipPool.Put(zr)
+ zr *gzip.Reader // lazily-initialized gzip reader
+ zerr error // sticky error
}
-// acquire returns a gzip.Reader for reading response body.
-// The reader must be released after use.
-func (gz *gzipReader) acquire() (*gzip.Reader, error) {
- gz.mu.Lock()
- defer gz.mu.Unlock()
+func (gz *gzipReader) Read(p []byte) (n int, err error) {
if gz.zerr != nil {
- return nil, gz.zerr
+ return 0, gz.zerr
}
if gz.zr == nil {
- gz.zr, gz.zerr = gzipPoolGet(gz.body)
- if gz.zerr != nil {
- return nil, gz.zerr
+ gz.zr, err = gzip.NewReader(gz.body)
+ if err != nil {
+ gz.zerr = err
+ return 0, err
}
}
- ret := gz.zr
- gz.zr, gz.zerr = nil, errConcurrentReadOnResBody
- return ret, nil
-}
-
-// release returns the gzip.Reader to the pool if Close was called during Read.
-func (gz *gzipReader) release(zr *gzip.Reader) {
- gz.mu.Lock()
- defer gz.mu.Unlock()
- if gz.zerr == errConcurrentReadOnResBody {
- gz.zr, gz.zerr = zr, nil
- } else { // fs.ErrClosed
- gzipPoolPut(zr)
- }
+ return gz.zr.Read(p)
}
-// close returns the gzip.Reader to the pool immediately or
-// signals release to do so after Read completes.
-func (gz *gzipReader) close() {
- gz.mu.Lock()
- defer gz.mu.Unlock()
- if gz.zerr == nil && gz.zr != nil {
- gzipPoolPut(gz.zr)
- gz.zr = nil
+func (gz *gzipReader) Close() error {
+ if err := gz.body.Close(); err != nil {
+ return err
}
gz.zerr = fs.ErrClosed
-}
-
-func (gz *gzipReader) Read(p []byte) (n int, err error) {
- zr, err := gz.acquire()
- if err != nil {
- return 0, err
- }
- defer gz.release(zr)
-
- return zr.Read(p)
-}
-
-func (gz *gzipReader) Close() error {
- gz.close()
-
- return gz.body.Close()
+ return nil
}
type errorReader struct{ err error }
@@ -3251,13 +3130,9 @@ func registerHTTPSProtocol(t *http.Transport, rt noDialH2RoundTripper) (err erro
}
// noDialH2RoundTripper is a RoundTripper which only tries to complete the request
-// if there's already a cached connection to the host.
+// if there's already has a cached connection to the host.
// (The field is exported so it can be accessed via reflect from net/http; tested
// by TestNoDialH2RoundTripperType)
-//
-// A noDialH2RoundTripper is registered with http1.Transport.RegisterProtocol,
-// and the http1.Transport can use type assertions to call non-RoundTrip methods on it.
-// This lets us expose, for example, NewClientConn to net/http.
type noDialH2RoundTripper struct{ *Transport }
func (rt noDialH2RoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
@@ -3268,85 +3143,6 @@ func (rt noDialH2RoundTripper) RoundTrip(req *http.Request) (*http.Response, err
return res, err
}
-func (rt noDialH2RoundTripper) NewClientConn(conn net.Conn, internalStateHook func()) (http.RoundTripper, error) {
- tr := rt.Transport
- cc, err := tr.newClientConn(conn, tr.disableKeepAlives(), internalStateHook)
- if err != nil {
- return nil, err
- }
-
- // RoundTrip should block when the conn is at its concurrency limit,
- // not return an error. Setting strictMaxConcurrentStreams enables this.
- cc.strictMaxConcurrentStreams = true
-
- return netHTTPClientConn{cc}, nil
-}
-
-// netHTTPClientConn wraps ClientConn and implements the interface net/http expects from
-// the RoundTripper returned by NewClientConn.
-type netHTTPClientConn struct {
- cc *ClientConn
-}
-
-func (cc netHTTPClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
- return cc.cc.RoundTrip(req)
-}
-
-func (cc netHTTPClientConn) Close() error {
- return cc.cc.Close()
-}
-
-func (cc netHTTPClientConn) Err() error {
- cc.cc.mu.Lock()
- defer cc.cc.mu.Unlock()
- if cc.cc.closed {
- return errors.New("connection closed")
- }
- return nil
-}
-
-func (cc netHTTPClientConn) Reserve() error {
- defer cc.cc.maybeCallStateHook()
- cc.cc.mu.Lock()
- defer cc.cc.mu.Unlock()
- if !cc.cc.canReserveLocked() {
- return errors.New("connection is unavailable")
- }
- cc.cc.streamsReserved++
- return nil
-}
-
-func (cc netHTTPClientConn) Release() {
- defer cc.cc.maybeCallStateHook()
- cc.cc.mu.Lock()
- defer cc.cc.mu.Unlock()
- // We don't complain if streamsReserved is 0.
- //
- // This is consistent with RoundTrip: both Release and RoundTrip will
- // consume a reservation iff one exists.
- if cc.cc.streamsReserved > 0 {
- cc.cc.streamsReserved--
- }
-}
-
-func (cc netHTTPClientConn) Available() int {
- cc.cc.mu.Lock()
- defer cc.cc.mu.Unlock()
- return cc.cc.availableLocked()
-}
-
-func (cc netHTTPClientConn) InFlight() int {
- cc.cc.mu.Lock()
- defer cc.cc.mu.Unlock()
- return cc.cc.currentRequestCountLocked()
-}
-
-func (cc *ClientConn) maybeCallStateHook() {
- if cc.internalStateHook != nil {
- cc.internalStateHook()
- }
-}
-
func (t *Transport) idleConnTimeout() time.Duration {
// to keep things backwards compatible, we use non-zero values of
// IdleConnTimeout, followed by using the IdleConnTimeout on the underlying
diff --git a/vendor/golang.org/x/net/http2/writesched.go b/vendor/golang.org/x/net/http2/writesched.go
index 7de27be525..4d3890f99a 100644
--- a/vendor/golang.org/x/net/http2/writesched.go
+++ b/vendor/golang.org/x/net/http2/writesched.go
@@ -185,75 +185,45 @@ func (wr *FrameWriteRequest) replyToWriter(err error) {
}
// writeQueue is used by implementations of WriteScheduler.
-//
-// Each writeQueue contains a queue of FrameWriteRequests, meant to store all
-// FrameWriteRequests associated with a given stream. This is implemented as a
-// two-stage queue: currQueue[currPos:] and nextQueue. Removing an item is done
-// by incrementing currPos of currQueue. Adding an item is done by appending it
-// to the nextQueue. If currQueue is empty when trying to remove an item, we
-// can swap currQueue and nextQueue to remedy the situation.
-// This two-stage queue is analogous to the use of two lists in Okasaki's
-// purely functional queue but without the overhead of reversing the list when
-// swapping stages.
-//
-// writeQueue also contains prev and next, this can be used by implementations
-// of WriteScheduler to construct data structures that represent the order of
-// writing between different streams (e.g. circular linked list).
type writeQueue struct {
- currQueue []FrameWriteRequest
- nextQueue []FrameWriteRequest
- currPos int
-
+ s []FrameWriteRequest
prev, next *writeQueue
}
-func (q *writeQueue) empty() bool {
- return (len(q.currQueue) - q.currPos + len(q.nextQueue)) == 0
-}
+func (q *writeQueue) empty() bool { return len(q.s) == 0 }
func (q *writeQueue) push(wr FrameWriteRequest) {
- q.nextQueue = append(q.nextQueue, wr)
+ q.s = append(q.s, wr)
}
func (q *writeQueue) shift() FrameWriteRequest {
- if q.empty() {
+ if len(q.s) == 0 {
panic("invalid use of queue")
}
- if q.currPos >= len(q.currQueue) {
- q.currQueue, q.currPos, q.nextQueue = q.nextQueue, 0, q.currQueue[:0]
- }
- wr := q.currQueue[q.currPos]
- q.currQueue[q.currPos] = FrameWriteRequest{}
- q.currPos++
+ wr := q.s[0]
+ // TODO: less copy-happy queue.
+ copy(q.s, q.s[1:])
+ q.s[len(q.s)-1] = FrameWriteRequest{}
+ q.s = q.s[:len(q.s)-1]
return wr
}
-func (q *writeQueue) peek() *FrameWriteRequest {
- if q.currPos < len(q.currQueue) {
- return &q.currQueue[q.currPos]
- }
- if len(q.nextQueue) > 0 {
- return &q.nextQueue[0]
- }
- return nil
-}
-
// consume consumes up to n bytes from q.s[0]. If the frame is
// entirely consumed, it is removed from the queue. If the frame
// is partially consumed, the frame is kept with the consumed
// bytes removed. Returns true iff any bytes were consumed.
func (q *writeQueue) consume(n int32) (FrameWriteRequest, bool) {
- if q.empty() {
+ if len(q.s) == 0 {
return FrameWriteRequest{}, false
}
- consumed, rest, numresult := q.peek().Consume(n)
+ consumed, rest, numresult := q.s[0].Consume(n)
switch numresult {
case 0:
return FrameWriteRequest{}, false
case 1:
q.shift()
case 2:
- *q.peek() = rest
+ q.s[0] = rest
}
return consumed, true
}
@@ -262,15 +232,10 @@ type writeQueuePool []*writeQueue
// put inserts an unused writeQueue into the pool.
func (p *writeQueuePool) put(q *writeQueue) {
- for i := range q.currQueue {
- q.currQueue[i] = FrameWriteRequest{}
- }
- for i := range q.nextQueue {
- q.nextQueue[i] = FrameWriteRequest{}
+ for i := range q.s {
+ q.s[i] = FrameWriteRequest{}
}
- q.currQueue = q.currQueue[:0]
- q.nextQueue = q.nextQueue[:0]
- q.currPos = 0
+ q.s = q.s[:0]
*p = append(*p, q)
}
diff --git a/vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go b/vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go
index 4e33c29a24..6d24d6a1b9 100644
--- a/vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go
+++ b/vendor/golang.org/x/net/http2/writesched_priority_rfc7540.go
@@ -214,8 +214,8 @@ func (z sortPriorityNodeSiblingsRFC7540) Swap(i, k int) { z[i], z[k] = z[k], z[i
func (z sortPriorityNodeSiblingsRFC7540) Less(i, k int) bool {
// Prefer the subtree that has sent fewer bytes relative to its weight.
// See sections 5.3.2 and 5.3.4.
- wi, bi := float64(z[i].weight)+1, float64(z[i].subtreeBytes)
- wk, bk := float64(z[k].weight)+1, float64(z[k].subtreeBytes)
+ wi, bi := float64(z[i].weight+1), float64(z[i].subtreeBytes)
+ wk, bk := float64(z[k].weight+1), float64(z[k].subtreeBytes)
if bi == 0 && bk == 0 {
return wi >= wk
}
@@ -302,6 +302,7 @@ func (ws *priorityWriteSchedulerRFC7540) CloseStream(streamID uint32) {
q := n.q
ws.queuePool.put(&q)
+ n.q.s = nil
if ws.maxClosedNodesInTree > 0 {
ws.addClosedOrIdleNode(&ws.closedNodes, ws.maxClosedNodesInTree, n)
} else {
diff --git a/vendor/golang.org/x/net/http2/writesched_priority_rfc9218.go b/vendor/golang.org/x/net/http2/writesched_priority_rfc9128.go
similarity index 99%
rename from vendor/golang.org/x/net/http2/writesched_priority_rfc9218.go
rename to vendor/golang.org/x/net/http2/writesched_priority_rfc9128.go
index cb4cadc32d..9b5b8808eb 100644
--- a/vendor/golang.org/x/net/http2/writesched_priority_rfc9218.go
+++ b/vendor/golang.org/x/net/http2/writesched_priority_rfc9128.go
@@ -39,7 +39,7 @@ type priorityWriteSchedulerRFC9218 struct {
prioritizeIncremental bool
}
-func newPriorityWriteSchedulerRFC9218() WriteScheduler {
+func newPriorityWriteSchedulerRFC9128() WriteScheduler {
ws := &priorityWriteSchedulerRFC9218{
streams: make(map[uint32]streamMetadata),
}
diff --git a/vendor/golang.org/x/net/trace/events.go b/vendor/golang.org/x/net/trace/events.go
index c2b3c00980..3aaffdd1f7 100644
--- a/vendor/golang.org/x/net/trace/events.go
+++ b/vendor/golang.org/x/net/trace/events.go
@@ -58,8 +58,8 @@ func RenderEvents(w http.ResponseWriter, req *http.Request, sensitive bool) {
Buckets: buckets,
}
- famMu.RLock()
data.Families = make([]string, 0, len(families))
+ famMu.RLock()
for name := range families {
data.Families = append(data.Families, name)
}
diff --git a/vendor/golang.org/x/oauth2/deviceauth.go b/vendor/golang.org/x/oauth2/deviceauth.go
index e783a94374..e99c92f39c 100644
--- a/vendor/golang.org/x/oauth2/deviceauth.go
+++ b/vendor/golang.org/x/oauth2/deviceauth.go
@@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"io"
- "mime"
"net/http"
"net/url"
"strings"
@@ -117,38 +116,10 @@ func retrieveDeviceAuth(ctx context.Context, c *Config, v url.Values) (*DeviceAu
return nil, fmt.Errorf("oauth2: cannot auth device: %v", err)
}
if code := r.StatusCode; code < 200 || code > 299 {
- retrieveError := &RetrieveError{
+ return nil, &RetrieveError{
Response: r,
Body: body,
}
-
- content, _, _ := mime.ParseMediaType(r.Header.Get("Content-Type"))
- switch content {
- case "application/x-www-form-urlencoded", "text/plain":
- // some endpoints return a query string
- vals, err := url.ParseQuery(string(body))
- if err != nil {
- return nil, retrieveError
- }
- retrieveError.ErrorCode = vals.Get("error")
- retrieveError.ErrorDescription = vals.Get("error_description")
- retrieveError.ErrorURI = vals.Get("error_uri")
- default:
- var tj struct {
- // https://datatracker.ietf.org/doc/html/rfc6749#section-5.2
- ErrorCode string `json:"error"`
- ErrorDescription string `json:"error_description"`
- ErrorURI string `json:"error_uri"`
- }
- if json.Unmarshal(body, &tj) != nil {
- return nil, retrieveError
- }
- retrieveError.ErrorCode = tj.ErrorCode
- retrieveError.ErrorDescription = tj.ErrorDescription
- retrieveError.ErrorURI = tj.ErrorURI
- }
-
- return nil, retrieveError
}
da := &DeviceAuthResponse{}
diff --git a/vendor/golang.org/x/oauth2/oauth2.go b/vendor/golang.org/x/oauth2/oauth2.go
index 5c527d31fd..de34feb844 100644
--- a/vendor/golang.org/x/oauth2/oauth2.go
+++ b/vendor/golang.org/x/oauth2/oauth2.go
@@ -9,6 +9,7 @@
package oauth2 // import "golang.org/x/oauth2"
import (
+ "bytes"
"context"
"errors"
"net/http"
@@ -98,7 +99,7 @@ const (
// in the POST body as application/x-www-form-urlencoded parameters.
AuthStyleInParams AuthStyle = 1
- // AuthStyleInHeader sends the client_id and client_secret
+ // AuthStyleInHeader sends the client_id and client_password
// using HTTP Basic Authorization. This is an optional style
// described in the OAuth2 RFC 6749 section 2.3.1.
AuthStyleInHeader AuthStyle = 2
@@ -157,7 +158,7 @@ func SetAuthURLParam(key, value string) AuthCodeOption {
// PKCE), https://www.oauth.com/oauth2-servers/pkce/ and
// https://www.ietf.org/archive/id/draft-ietf-oauth-v2-1-09.html#name-cross-site-request-forgery (describing both approaches)
func (c *Config) AuthCodeURL(state string, opts ...AuthCodeOption) string {
- var buf strings.Builder
+ var buf bytes.Buffer
buf.WriteString(c.Endpoint.AuthURL)
v := url.Values{
"response_type": {"code"},
diff --git a/vendor/golang.org/x/oauth2/pkce.go b/vendor/golang.org/x/oauth2/pkce.go
index f99384f0f5..cea8374d51 100644
--- a/vendor/golang.org/x/oauth2/pkce.go
+++ b/vendor/golang.org/x/oauth2/pkce.go
@@ -51,7 +51,7 @@ func S256ChallengeFromVerifier(verifier string) string {
return base64.RawURLEncoding.EncodeToString(sha[:])
}
-// S256ChallengeOption derives a PKCE code challenge from the verifier with
+// S256ChallengeOption derives a PKCE code challenge derived from verifier with
// method S256. It should be passed to [Config.AuthCodeURL] or [Config.DeviceAuth]
// only.
func S256ChallengeOption(verifier string) AuthCodeOption {
diff --git a/vendor/golang.org/x/oauth2/token.go b/vendor/golang.org/x/oauth2/token.go
index e995eebb5e..239ec32962 100644
--- a/vendor/golang.org/x/oauth2/token.go
+++ b/vendor/golang.org/x/oauth2/token.go
@@ -103,7 +103,7 @@ func (t *Token) WithExtra(extra any) *Token {
}
// Extra returns an extra field.
-// Extra fields are key-value pairs returned by the server as
+// Extra fields are key-value pairs returned by the server as a
// part of the token retrieval response.
func (t *Token) Extra(key string) any {
if raw, ok := t.raw.(map[string]any); ok {
diff --git a/vendor/golang.org/x/oauth2/transport.go b/vendor/golang.org/x/oauth2/transport.go
index 9922ec3316..8bbebbac9e 100644
--- a/vendor/golang.org/x/oauth2/transport.go
+++ b/vendor/golang.org/x/oauth2/transport.go
@@ -58,7 +58,7 @@ func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
var cancelOnce sync.Once
// CancelRequest does nothing. It used to be a legacy cancellation mechanism
-// but now only logs on first use to warn that it's deprecated.
+// but now only it only logs on first use to warn that it's deprecated.
//
// Deprecated: use contexts for cancellation instead.
func (t *Transport) CancelRequest(req *http.Request) {
diff --git a/vendor/golang.org/x/sync/errgroup/errgroup.go b/vendor/golang.org/x/sync/errgroup/errgroup.go
index f69fd75468..1d8cffae8c 100644
--- a/vendor/golang.org/x/sync/errgroup/errgroup.go
+++ b/vendor/golang.org/x/sync/errgroup/errgroup.go
@@ -3,7 +3,7 @@
// license that can be found in the LICENSE file.
// Package errgroup provides synchronization, error propagation, and Context
-// cancellation for groups of goroutines working on subtasks of a common task.
+// cancelation for groups of goroutines working on subtasks of a common task.
//
// [errgroup.Group] is related to [sync.WaitGroup] but adds handling of tasks
// returning errors.
@@ -144,8 +144,8 @@ func (g *Group) SetLimit(n int) {
g.sem = nil
return
}
- if active := len(g.sem); active != 0 {
- panic(fmt.Errorf("errgroup: modify limit while %v goroutines in the group are still active", active))
+ if len(g.sem) != 0 {
+ panic(fmt.Errorf("errgroup: modify limit while %v goroutines in the group are still active", len(g.sem)))
}
g.sem = make(chan token, n)
}
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.s b/vendor/golang.org/x/sys/cpu/cpu_arm64.s
index 3b0450a06a..22cc99844a 100644
--- a/vendor/golang.org/x/sys/cpu/cpu_arm64.s
+++ b/vendor/golang.org/x/sys/cpu/cpu_arm64.s
@@ -9,27 +9,31 @@
// func getisar0() uint64
TEXT ·getisar0(SB),NOSPLIT,$0-8
// get Instruction Set Attributes 0 into x0
- MRS ID_AA64ISAR0_EL1, R0
+ // mrs x0, ID_AA64ISAR0_EL1 = d5380600
+ WORD $0xd5380600
MOVD R0, ret+0(FP)
RET
// func getisar1() uint64
TEXT ·getisar1(SB),NOSPLIT,$0-8
// get Instruction Set Attributes 1 into x0
- MRS ID_AA64ISAR1_EL1, R0
+ // mrs x0, ID_AA64ISAR1_EL1 = d5380620
+ WORD $0xd5380620
MOVD R0, ret+0(FP)
RET
// func getpfr0() uint64
TEXT ·getpfr0(SB),NOSPLIT,$0-8
// get Processor Feature Register 0 into x0
- MRS ID_AA64PFR0_EL1, R0
+ // mrs x0, ID_AA64PFR0_EL1 = d5380400
+ WORD $0xd5380400
MOVD R0, ret+0(FP)
RET
// func getzfr0() uint64
TEXT ·getzfr0(SB),NOSPLIT,$0-8
// get SVE Feature Register 0 into x0
- MRS ID_AA64ZFR0_EL1, R0
+ // mrs x0, ID_AA64ZFR0_EL1 = d5380480
+ WORD $0xd5380480
MOVD R0, ret+0(FP)
RET
diff --git a/vendor/golang.org/x/sys/unix/affinity_linux.go b/vendor/golang.org/x/sys/unix/affinity_linux.go
index 3ea470387b..3c7a6d6e2f 100644
--- a/vendor/golang.org/x/sys/unix/affinity_linux.go
+++ b/vendor/golang.org/x/sys/unix/affinity_linux.go
@@ -41,15 +41,6 @@ func (s *CPUSet) Zero() {
clear(s[:])
}
-// Fill adds all possible CPU bits to the set s. On Linux, [SchedSetaffinity]
-// will silently ignore any invalid CPU bits in [CPUSet] so this is an
-// efficient way of resetting the CPU affinity of a process.
-func (s *CPUSet) Fill() {
- for i := range s {
- s[i] = ^cpuMask(0)
- }
-}
-
func cpuBitsIndex(cpu int) int {
return cpu / _NCPUBITS
}
diff --git a/vendor/golang.org/x/sys/unix/fdset.go b/vendor/golang.org/x/sys/unix/fdset.go
index 62ed12645f..9e83d18cd0 100644
--- a/vendor/golang.org/x/sys/unix/fdset.go
+++ b/vendor/golang.org/x/sys/unix/fdset.go
@@ -23,5 +23,7 @@ func (fds *FdSet) IsSet(fd int) bool {
// Zero clears the set fds.
func (fds *FdSet) Zero() {
- clear(fds.Bits[:])
+ for i := range fds.Bits {
+ fds.Bits[i] = 0
+ }
}
diff --git a/vendor/golang.org/x/sys/unix/ifreq_linux.go b/vendor/golang.org/x/sys/unix/ifreq_linux.go
index 309f5a2b0c..848840ae4c 100644
--- a/vendor/golang.org/x/sys/unix/ifreq_linux.go
+++ b/vendor/golang.org/x/sys/unix/ifreq_linux.go
@@ -111,7 +111,9 @@ func (ifr *Ifreq) SetUint32(v uint32) {
// clear zeroes the ifreq's union field to prevent trailing garbage data from
// being sent to the kernel if an ifreq is reused.
func (ifr *Ifreq) clear() {
- clear(ifr.raw.Ifru[:])
+ for i := range ifr.raw.Ifru {
+ ifr.raw.Ifru[i] = 0
+ }
}
// TODO(mdlayher): export as IfreqData? For now we can provide helpers such as
diff --git a/vendor/golang.org/x/sys/unix/mkall.sh b/vendor/golang.org/x/sys/unix/mkall.sh
index d0ed611912..e6f31d374d 100644
--- a/vendor/golang.org/x/sys/unix/mkall.sh
+++ b/vendor/golang.org/x/sys/unix/mkall.sh
@@ -49,7 +49,6 @@ esac
if [[ "$GOOS" = "linux" ]]; then
# Use the Docker-based build system
# Files generated through docker (use $cmd so you can Ctl-C the build or run)
- set -e
$cmd docker build --tag generate:$GOOS $GOOS
$cmd docker run --interactive --tty --volume $(cd -- "$(dirname -- "$0")/.." && pwd):/build generate:$GOOS
exit
diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh
index fd39be4efd..d1c8b2640e 100644
--- a/vendor/golang.org/x/sys/unix/mkerrors.sh
+++ b/vendor/golang.org/x/sys/unix/mkerrors.sh
@@ -226,7 +226,6 @@ struct ltchars {
#include
#include
#include
-#include
#include
#include
#include
@@ -256,7 +255,6 @@ struct ltchars {
#include
#include
#include
-#include
#include
#include
#include
@@ -531,7 +529,6 @@ ccflags="$@"
$2 ~ /^O[CNPFPL][A-Z]+[^_][A-Z]+$/ ||
$2 ~ /^(NL|CR|TAB|BS|VT|FF)DLY$/ ||
$2 ~ /^(NL|CR|TAB|BS|VT|FF)[0-9]$/ ||
- $2 ~ /^(DT|EI|ELF|EV|NN|NT|PF|SHF|SHN|SHT|STB|STT|VER)_/ ||
$2 ~ /^O?XTABS$/ ||
$2 ~ /^TC[IO](ON|OFF)$/ ||
$2 ~ /^IN_/ ||
@@ -614,7 +611,7 @@ ccflags="$@"
$2 !~ /IOC_MAGIC/ &&
$2 ~ /^[A-Z][A-Z0-9_]+_MAGIC2?$/ ||
$2 ~ /^(VM|VMADDR)_/ ||
- $2 ~ /^(IOCTL_VM_SOCKETS_|IOCTL_MEI_)/ ||
+ $2 ~ /^IOCTL_VM_SOCKETS_/ ||
$2 ~ /^(TASKSTATS|TS)_/ ||
$2 ~ /^CGROUPSTATS_/ ||
$2 ~ /^GENL_/ ||
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
index 06c0eea6fb..4958a65708 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -801,7 +801,9 @@ func (sa *SockaddrPPPoE) sockaddr() (unsafe.Pointer, _Socklen, error) {
// one. The kernel expects SID to be in network byte order.
binary.BigEndian.PutUint16(sa.raw[6:8], sa.SID)
copy(sa.raw[8:14], sa.Remote)
- clear(sa.raw[14 : 14+IFNAMSIZ])
+ for i := 14; i < 14+IFNAMSIZ; i++ {
+ sa.raw[i] = 0
+ }
copy(sa.raw[14:], sa.Dev)
return unsafe.Pointer(&sa.raw), SizeofSockaddrPPPoX, nil
}
@@ -2643,9 +2645,3 @@ func SchedGetAttr(pid int, flags uint) (*SchedAttr, error) {
//sys Cachestat(fd uint, crange *CachestatRange, cstat *Cachestat_t, flags uint) (err error)
//sys Mseal(b []byte, flags uint) (err error)
-
-//sys setMemPolicy(mode int, mask *CPUSet, size int) (err error) = SYS_SET_MEMPOLICY
-
-func SetMemPolicy(mode int, mask *CPUSet) error {
- return setMemPolicy(mode, mask, _CPU_SETSIZE)
-}
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
index 34a4676973..88162099af 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -248,23 +248,6 @@ func Statvfs(path string, buf *Statvfs_t) (err error) {
return Statvfs1(path, buf, ST_WAIT)
}
-func Getvfsstat(buf []Statvfs_t, flags int) (n int, err error) {
- var (
- _p0 unsafe.Pointer
- bufsize uintptr
- )
- if len(buf) > 0 {
- _p0 = unsafe.Pointer(&buf[0])
- bufsize = unsafe.Sizeof(Statvfs_t{}) * uintptr(len(buf))
- }
- r0, _, e1 := Syscall(SYS_GETVFSSTAT, uintptr(_p0), bufsize, uintptr(flags))
- n = int(r0)
- if e1 != 0 {
- err = e1
- }
- return
-}
-
/*
* Exposed directly
*/
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go
index 120a7b35d1..b6db27d937 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go
@@ -853,86 +853,20 @@ const (
DM_VERSION_MAJOR = 0x4
DM_VERSION_MINOR = 0x32
DM_VERSION_PATCHLEVEL = 0x0
- DT_ADDRRNGHI = 0x6ffffeff
- DT_ADDRRNGLO = 0x6ffffe00
DT_BLK = 0x6
DT_CHR = 0x2
- DT_DEBUG = 0x15
DT_DIR = 0x4
- DT_ENCODING = 0x20
DT_FIFO = 0x1
- DT_FINI = 0xd
- DT_FLAGS_1 = 0x6ffffffb
- DT_GNU_HASH = 0x6ffffef5
- DT_HASH = 0x4
- DT_HIOS = 0x6ffff000
- DT_HIPROC = 0x7fffffff
- DT_INIT = 0xc
- DT_JMPREL = 0x17
DT_LNK = 0xa
- DT_LOOS = 0x6000000d
- DT_LOPROC = 0x70000000
- DT_NEEDED = 0x1
- DT_NULL = 0x0
- DT_PLTGOT = 0x3
- DT_PLTREL = 0x14
- DT_PLTRELSZ = 0x2
DT_REG = 0x8
- DT_REL = 0x11
- DT_RELA = 0x7
- DT_RELACOUNT = 0x6ffffff9
- DT_RELAENT = 0x9
- DT_RELASZ = 0x8
- DT_RELCOUNT = 0x6ffffffa
- DT_RELENT = 0x13
- DT_RELSZ = 0x12
- DT_RPATH = 0xf
DT_SOCK = 0xc
- DT_SONAME = 0xe
- DT_STRSZ = 0xa
- DT_STRTAB = 0x5
- DT_SYMBOLIC = 0x10
- DT_SYMENT = 0xb
- DT_SYMTAB = 0x6
- DT_TEXTREL = 0x16
DT_UNKNOWN = 0x0
- DT_VALRNGHI = 0x6ffffdff
- DT_VALRNGLO = 0x6ffffd00
- DT_VERDEF = 0x6ffffffc
- DT_VERDEFNUM = 0x6ffffffd
- DT_VERNEED = 0x6ffffffe
- DT_VERNEEDNUM = 0x6fffffff
- DT_VERSYM = 0x6ffffff0
DT_WHT = 0xe
ECHO = 0x8
ECRYPTFS_SUPER_MAGIC = 0xf15f
EFD_SEMAPHORE = 0x1
EFIVARFS_MAGIC = 0xde5e81e4
EFS_SUPER_MAGIC = 0x414a53
- EI_CLASS = 0x4
- EI_DATA = 0x5
- EI_MAG0 = 0x0
- EI_MAG1 = 0x1
- EI_MAG2 = 0x2
- EI_MAG3 = 0x3
- EI_NIDENT = 0x10
- EI_OSABI = 0x7
- EI_PAD = 0x8
- EI_VERSION = 0x6
- ELFCLASS32 = 0x1
- ELFCLASS64 = 0x2
- ELFCLASSNONE = 0x0
- ELFCLASSNUM = 0x3
- ELFDATA2LSB = 0x1
- ELFDATA2MSB = 0x2
- ELFDATANONE = 0x0
- ELFMAG = "\177ELF"
- ELFMAG0 = 0x7f
- ELFMAG1 = 'E'
- ELFMAG2 = 'L'
- ELFMAG3 = 'F'
- ELFOSABI_LINUX = 0x3
- ELFOSABI_NONE = 0x0
EM_386 = 0x3
EM_486 = 0x6
EM_68K = 0x4
@@ -1218,24 +1152,14 @@ const (
ETH_P_WCCP = 0x883e
ETH_P_X25 = 0x805
ETH_P_XDSA = 0xf8
- ET_CORE = 0x4
- ET_DYN = 0x3
- ET_EXEC = 0x2
- ET_HIPROC = 0xffff
- ET_LOPROC = 0xff00
- ET_NONE = 0x0
- ET_REL = 0x1
EV_ABS = 0x3
EV_CNT = 0x20
- EV_CURRENT = 0x1
EV_FF = 0x15
EV_FF_STATUS = 0x17
EV_KEY = 0x1
EV_LED = 0x11
EV_MAX = 0x1f
EV_MSC = 0x4
- EV_NONE = 0x0
- EV_NUM = 0x2
EV_PWR = 0x16
EV_REL = 0x2
EV_REP = 0x14
@@ -1615,8 +1539,6 @@ const (
IN_OPEN = 0x20
IN_Q_OVERFLOW = 0x4000
IN_UNMOUNT = 0x2000
- IOCTL_MEI_CONNECT_CLIENT = 0xc0104801
- IOCTL_MEI_CONNECT_CLIENT_VTAG = 0xc0144804
IPPROTO_AH = 0x33
IPPROTO_BEETPH = 0x5e
IPPROTO_COMP = 0x6c
@@ -2354,167 +2276,7 @@ const (
NLM_F_REPLACE = 0x100
NLM_F_REQUEST = 0x1
NLM_F_ROOT = 0x100
- NN_386_IOPERM = "LINUX"
- NN_386_TLS = "LINUX"
- NN_ARC_V2 = "LINUX"
- NN_ARM_FPMR = "LINUX"
- NN_ARM_GCS = "LINUX"
- NN_ARM_HW_BREAK = "LINUX"
- NN_ARM_HW_WATCH = "LINUX"
- NN_ARM_PACA_KEYS = "LINUX"
- NN_ARM_PACG_KEYS = "LINUX"
- NN_ARM_PAC_ENABLED_KEYS = "LINUX"
- NN_ARM_PAC_MASK = "LINUX"
- NN_ARM_POE = "LINUX"
- NN_ARM_SSVE = "LINUX"
- NN_ARM_SVE = "LINUX"
- NN_ARM_SYSTEM_CALL = "LINUX"
- NN_ARM_TAGGED_ADDR_CTRL = "LINUX"
- NN_ARM_TLS = "LINUX"
- NN_ARM_VFP = "LINUX"
- NN_ARM_ZA = "LINUX"
- NN_ARM_ZT = "LINUX"
- NN_AUXV = "CORE"
- NN_FILE = "CORE"
- NN_GNU_PROPERTY_TYPE_0 = "GNU"
- NN_LOONGARCH_CPUCFG = "LINUX"
- NN_LOONGARCH_CSR = "LINUX"
- NN_LOONGARCH_HW_BREAK = "LINUX"
- NN_LOONGARCH_HW_WATCH = "LINUX"
- NN_LOONGARCH_LASX = "LINUX"
- NN_LOONGARCH_LBT = "LINUX"
- NN_LOONGARCH_LSX = "LINUX"
- NN_MIPS_DSP = "LINUX"
- NN_MIPS_FP_MODE = "LINUX"
- NN_MIPS_MSA = "LINUX"
- NN_PPC_DEXCR = "LINUX"
- NN_PPC_DSCR = "LINUX"
- NN_PPC_EBB = "LINUX"
- NN_PPC_HASHKEYR = "LINUX"
- NN_PPC_PKEY = "LINUX"
- NN_PPC_PMU = "LINUX"
- NN_PPC_PPR = "LINUX"
- NN_PPC_SPE = "LINUX"
- NN_PPC_TAR = "LINUX"
- NN_PPC_TM_CDSCR = "LINUX"
- NN_PPC_TM_CFPR = "LINUX"
- NN_PPC_TM_CGPR = "LINUX"
- NN_PPC_TM_CPPR = "LINUX"
- NN_PPC_TM_CTAR = "LINUX"
- NN_PPC_TM_CVMX = "LINUX"
- NN_PPC_TM_CVSX = "LINUX"
- NN_PPC_TM_SPR = "LINUX"
- NN_PPC_VMX = "LINUX"
- NN_PPC_VSX = "LINUX"
- NN_PRFPREG = "CORE"
- NN_PRPSINFO = "CORE"
- NN_PRSTATUS = "CORE"
- NN_PRXFPREG = "LINUX"
- NN_RISCV_CSR = "LINUX"
- NN_RISCV_TAGGED_ADDR_CTRL = "LINUX"
- NN_RISCV_VECTOR = "LINUX"
- NN_S390_CTRS = "LINUX"
- NN_S390_GS_BC = "LINUX"
- NN_S390_GS_CB = "LINUX"
- NN_S390_HIGH_GPRS = "LINUX"
- NN_S390_LAST_BREAK = "LINUX"
- NN_S390_PREFIX = "LINUX"
- NN_S390_PV_CPU_DATA = "LINUX"
- NN_S390_RI_CB = "LINUX"
- NN_S390_SYSTEM_CALL = "LINUX"
- NN_S390_TDB = "LINUX"
- NN_S390_TIMER = "LINUX"
- NN_S390_TODCMP = "LINUX"
- NN_S390_TODPREG = "LINUX"
- NN_S390_VXRS_HIGH = "LINUX"
- NN_S390_VXRS_LOW = "LINUX"
- NN_SIGINFO = "CORE"
- NN_TASKSTRUCT = "CORE"
- NN_VMCOREDD = "LINUX"
- NN_X86_SHSTK = "LINUX"
- NN_X86_XSAVE_LAYOUT = "LINUX"
- NN_X86_XSTATE = "LINUX"
NSFS_MAGIC = 0x6e736673
- NT_386_IOPERM = 0x201
- NT_386_TLS = 0x200
- NT_ARC_V2 = 0x600
- NT_ARM_FPMR = 0x40e
- NT_ARM_GCS = 0x410
- NT_ARM_HW_BREAK = 0x402
- NT_ARM_HW_WATCH = 0x403
- NT_ARM_PACA_KEYS = 0x407
- NT_ARM_PACG_KEYS = 0x408
- NT_ARM_PAC_ENABLED_KEYS = 0x40a
- NT_ARM_PAC_MASK = 0x406
- NT_ARM_POE = 0x40f
- NT_ARM_SSVE = 0x40b
- NT_ARM_SVE = 0x405
- NT_ARM_SYSTEM_CALL = 0x404
- NT_ARM_TAGGED_ADDR_CTRL = 0x409
- NT_ARM_TLS = 0x401
- NT_ARM_VFP = 0x400
- NT_ARM_ZA = 0x40c
- NT_ARM_ZT = 0x40d
- NT_AUXV = 0x6
- NT_FILE = 0x46494c45
- NT_GNU_PROPERTY_TYPE_0 = 0x5
- NT_LOONGARCH_CPUCFG = 0xa00
- NT_LOONGARCH_CSR = 0xa01
- NT_LOONGARCH_HW_BREAK = 0xa05
- NT_LOONGARCH_HW_WATCH = 0xa06
- NT_LOONGARCH_LASX = 0xa03
- NT_LOONGARCH_LBT = 0xa04
- NT_LOONGARCH_LSX = 0xa02
- NT_MIPS_DSP = 0x800
- NT_MIPS_FP_MODE = 0x801
- NT_MIPS_MSA = 0x802
- NT_PPC_DEXCR = 0x111
- NT_PPC_DSCR = 0x105
- NT_PPC_EBB = 0x106
- NT_PPC_HASHKEYR = 0x112
- NT_PPC_PKEY = 0x110
- NT_PPC_PMU = 0x107
- NT_PPC_PPR = 0x104
- NT_PPC_SPE = 0x101
- NT_PPC_TAR = 0x103
- NT_PPC_TM_CDSCR = 0x10f
- NT_PPC_TM_CFPR = 0x109
- NT_PPC_TM_CGPR = 0x108
- NT_PPC_TM_CPPR = 0x10e
- NT_PPC_TM_CTAR = 0x10d
- NT_PPC_TM_CVMX = 0x10a
- NT_PPC_TM_CVSX = 0x10b
- NT_PPC_TM_SPR = 0x10c
- NT_PPC_VMX = 0x100
- NT_PPC_VSX = 0x102
- NT_PRFPREG = 0x2
- NT_PRPSINFO = 0x3
- NT_PRSTATUS = 0x1
- NT_PRXFPREG = 0x46e62b7f
- NT_RISCV_CSR = 0x900
- NT_RISCV_TAGGED_ADDR_CTRL = 0x902
- NT_RISCV_VECTOR = 0x901
- NT_S390_CTRS = 0x304
- NT_S390_GS_BC = 0x30c
- NT_S390_GS_CB = 0x30b
- NT_S390_HIGH_GPRS = 0x300
- NT_S390_LAST_BREAK = 0x306
- NT_S390_PREFIX = 0x305
- NT_S390_PV_CPU_DATA = 0x30e
- NT_S390_RI_CB = 0x30d
- NT_S390_SYSTEM_CALL = 0x307
- NT_S390_TDB = 0x308
- NT_S390_TIMER = 0x301
- NT_S390_TODCMP = 0x302
- NT_S390_TODPREG = 0x303
- NT_S390_VXRS_HIGH = 0x30a
- NT_S390_VXRS_LOW = 0x309
- NT_SIGINFO = 0x53494749
- NT_TASKSTRUCT = 0x4
- NT_VMCOREDD = 0x700
- NT_X86_SHSTK = 0x204
- NT_X86_XSAVE_LAYOUT = 0x205
- NT_X86_XSTATE = 0x202
OCFS2_SUPER_MAGIC = 0x7461636f
OCRNL = 0x8
OFDEL = 0x80
@@ -2701,59 +2463,6 @@ const (
PERF_RECORD_MISC_USER = 0x2
PERF_SAMPLE_BRANCH_PLM_ALL = 0x7
PERF_SAMPLE_WEIGHT_TYPE = 0x1004000
- PF_ALG = 0x26
- PF_APPLETALK = 0x5
- PF_ASH = 0x12
- PF_ATMPVC = 0x8
- PF_ATMSVC = 0x14
- PF_AX25 = 0x3
- PF_BLUETOOTH = 0x1f
- PF_BRIDGE = 0x7
- PF_CAIF = 0x25
- PF_CAN = 0x1d
- PF_DECnet = 0xc
- PF_ECONET = 0x13
- PF_FILE = 0x1
- PF_IB = 0x1b
- PF_IEEE802154 = 0x24
- PF_INET = 0x2
- PF_INET6 = 0xa
- PF_IPX = 0x4
- PF_IRDA = 0x17
- PF_ISDN = 0x22
- PF_IUCV = 0x20
- PF_KCM = 0x29
- PF_KEY = 0xf
- PF_LLC = 0x1a
- PF_LOCAL = 0x1
- PF_MAX = 0x2e
- PF_MCTP = 0x2d
- PF_MPLS = 0x1c
- PF_NETBEUI = 0xd
- PF_NETLINK = 0x10
- PF_NETROM = 0x6
- PF_NFC = 0x27
- PF_PACKET = 0x11
- PF_PHONET = 0x23
- PF_PPPOX = 0x18
- PF_QIPCRTR = 0x2a
- PF_R = 0x4
- PF_RDS = 0x15
- PF_ROSE = 0xb
- PF_ROUTE = 0x10
- PF_RXRPC = 0x21
- PF_SECURITY = 0xe
- PF_SMC = 0x2b
- PF_SNA = 0x16
- PF_TIPC = 0x1e
- PF_UNIX = 0x1
- PF_UNSPEC = 0x0
- PF_VSOCK = 0x28
- PF_W = 0x2
- PF_WANPIPE = 0x19
- PF_X = 0x1
- PF_X25 = 0x9
- PF_XDP = 0x2c
PID_FS_MAGIC = 0x50494446
PIPEFS_MAGIC = 0x50495045
PPPIOCGNPMODE = 0xc008744c
@@ -3049,23 +2758,6 @@ const (
PTRACE_SYSCALL_INFO_NONE = 0x0
PTRACE_SYSCALL_INFO_SECCOMP = 0x3
PTRACE_TRACEME = 0x0
- PT_AARCH64_MEMTAG_MTE = 0x70000002
- PT_DYNAMIC = 0x2
- PT_GNU_EH_FRAME = 0x6474e550
- PT_GNU_PROPERTY = 0x6474e553
- PT_GNU_RELRO = 0x6474e552
- PT_GNU_STACK = 0x6474e551
- PT_HIOS = 0x6fffffff
- PT_HIPROC = 0x7fffffff
- PT_INTERP = 0x3
- PT_LOAD = 0x1
- PT_LOOS = 0x60000000
- PT_LOPROC = 0x70000000
- PT_NOTE = 0x4
- PT_NULL = 0x0
- PT_PHDR = 0x6
- PT_SHLIB = 0x5
- PT_TLS = 0x7
P_ALL = 0x0
P_PGID = 0x2
P_PID = 0x1
@@ -3399,47 +3091,6 @@ const (
SEEK_MAX = 0x4
SEEK_SET = 0x0
SELINUX_MAGIC = 0xf97cff8c
- SHF_ALLOC = 0x2
- SHF_EXCLUDE = 0x8000000
- SHF_EXECINSTR = 0x4
- SHF_GROUP = 0x200
- SHF_INFO_LINK = 0x40
- SHF_LINK_ORDER = 0x80
- SHF_MASKOS = 0xff00000
- SHF_MASKPROC = 0xf0000000
- SHF_MERGE = 0x10
- SHF_ORDERED = 0x4000000
- SHF_OS_NONCONFORMING = 0x100
- SHF_RELA_LIVEPATCH = 0x100000
- SHF_RO_AFTER_INIT = 0x200000
- SHF_STRINGS = 0x20
- SHF_TLS = 0x400
- SHF_WRITE = 0x1
- SHN_ABS = 0xfff1
- SHN_COMMON = 0xfff2
- SHN_HIPROC = 0xff1f
- SHN_HIRESERVE = 0xffff
- SHN_LIVEPATCH = 0xff20
- SHN_LOPROC = 0xff00
- SHN_LORESERVE = 0xff00
- SHN_UNDEF = 0x0
- SHT_DYNAMIC = 0x6
- SHT_DYNSYM = 0xb
- SHT_HASH = 0x5
- SHT_HIPROC = 0x7fffffff
- SHT_HIUSER = 0xffffffff
- SHT_LOPROC = 0x70000000
- SHT_LOUSER = 0x80000000
- SHT_NOBITS = 0x8
- SHT_NOTE = 0x7
- SHT_NULL = 0x0
- SHT_NUM = 0xc
- SHT_PROGBITS = 0x1
- SHT_REL = 0x9
- SHT_RELA = 0x4
- SHT_SHLIB = 0xa
- SHT_STRTAB = 0x3
- SHT_SYMTAB = 0x2
SHUT_RD = 0x0
SHUT_RDWR = 0x2
SHUT_WR = 0x1
@@ -3666,16 +3317,6 @@ const (
STATX_UID = 0x8
STATX_WRITE_ATOMIC = 0x10000
STATX__RESERVED = 0x80000000
- STB_GLOBAL = 0x1
- STB_LOCAL = 0x0
- STB_WEAK = 0x2
- STT_COMMON = 0x5
- STT_FILE = 0x4
- STT_FUNC = 0x2
- STT_NOTYPE = 0x0
- STT_OBJECT = 0x1
- STT_SECTION = 0x3
- STT_TLS = 0x6
SYNC_FILE_RANGE_WAIT_AFTER = 0x4
SYNC_FILE_RANGE_WAIT_BEFORE = 0x1
SYNC_FILE_RANGE_WRITE = 0x2
@@ -3912,8 +3553,6 @@ const (
UTIME_OMIT = 0x3ffffffe
V9FS_MAGIC = 0x1021997
VERASE = 0x2
- VER_FLG_BASE = 0x1
- VER_FLG_WEAK = 0x2
VINTR = 0x0
VKILL = 0x3
VLNEXT = 0xf
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
index 97a61fc5b8..1c37f9fbc4 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -116,8 +116,6 @@ const (
IEXTEN = 0x8000
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x80044803
- IOCTL_MEI_NOTIFY_SET = 0x40044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
index a0d6d498c4..6f54d34aef 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -116,8 +116,6 @@ const (
IEXTEN = 0x8000
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x80044803
- IOCTL_MEI_NOTIFY_SET = 0x40044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
index dd9c903f9a..783ec5c126 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x8000
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x80044803
- IOCTL_MEI_NOTIFY_SET = 0x40044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
index 384c61ca3a..ca83d3ba16 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -120,8 +120,6 @@ const (
IEXTEN = 0x8000
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x80044803
- IOCTL_MEI_NOTIFY_SET = 0x40044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
index 6384c9831f..607e611c0c 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
@@ -116,8 +116,6 @@ const (
IEXTEN = 0x8000
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x80044803
- IOCTL_MEI_NOTIFY_SET = 0x40044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
index 553c1c6f15..b9cb5bd3c0 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x100
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x80
- IOCTL_MEI_NOTIFY_GET = 0x40044803
- IOCTL_MEI_NOTIFY_SET = 0x80044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPV6_FLOWINFO_MASK = 0xfffffff
IPV6_FLOWLABEL_MASK = 0xfffff
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
index b3339f2099..65b078a638 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x100
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x80
- IOCTL_MEI_NOTIFY_GET = 0x40044803
- IOCTL_MEI_NOTIFY_SET = 0x80044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPV6_FLOWINFO_MASK = 0xfffffff
IPV6_FLOWLABEL_MASK = 0xfffff
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
index 177091d2bc..5298a3033d 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x100
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x80
- IOCTL_MEI_NOTIFY_GET = 0x40044803
- IOCTL_MEI_NOTIFY_SET = 0x80044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
index c5abf156d0..7bc557c876 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x100
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x80
- IOCTL_MEI_NOTIFY_GET = 0x40044803
- IOCTL_MEI_NOTIFY_SET = 0x80044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
index f1f3fadf57..152399bb04 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x400
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x40044803
- IOCTL_MEI_NOTIFY_SET = 0x80044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPV6_FLOWINFO_MASK = 0xfffffff
IPV6_FLOWLABEL_MASK = 0xfffff
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
index 203ad9c54a..1a1ce2409c 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x400
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x40044803
- IOCTL_MEI_NOTIFY_SET = 0x80044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPV6_FLOWINFO_MASK = 0xfffffff
IPV6_FLOWLABEL_MASK = 0xfffff
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
index 4b9abcb21a..4231a1fb57 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x400
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x40044803
- IOCTL_MEI_NOTIFY_SET = 0x80044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
index f87983037d..21c0e95266 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x8000
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x80044803
- IOCTL_MEI_NOTIFY_SET = 0x40044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPV6_FLOWINFO_MASK = 0xffffff0f
IPV6_FLOWLABEL_MASK = 0xffff0f00
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
index 64347eb354..f00d1cd7cf 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -115,8 +115,6 @@ const (
IEXTEN = 0x8000
IN_CLOEXEC = 0x80000
IN_NONBLOCK = 0x800
- IOCTL_MEI_NOTIFY_GET = 0x80044803
- IOCTL_MEI_NOTIFY_SET = 0x40044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x7b9
IPV6_FLOWINFO_MASK = 0xfffffff
IPV6_FLOWLABEL_MASK = 0xfffff
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
index 7d71911718..bc8d539e6a 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
@@ -119,8 +119,6 @@ const (
IEXTEN = 0x8000
IN_CLOEXEC = 0x400000
IN_NONBLOCK = 0x4000
- IOCTL_MEI_NOTIFY_GET = 0x40044803
- IOCTL_MEI_NOTIFY_SET = 0x80044802
IOCTL_VM_SOCKETS_GET_LOCAL_CID = 0x200007b9
IPV6_FLOWINFO_MASK = 0xfffffff
IPV6_FLOWLABEL_MASK = 0xfffff
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_linux.go b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
index 8935d10a31..5cc1e8eb2f 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_linux.go
@@ -2238,13 +2238,3 @@ func Mseal(b []byte, flags uint) (err error) {
}
return
}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func setMemPolicy(mode int, mask *CPUSet, size int) (err error) {
- _, _, e1 := Syscall(SYS_SET_MEMPOLICY, uintptr(mode), uintptr(unsafe.Pointer(mask)), uintptr(size))
- if e1 != 0 {
- err = errnoErr(e1)
- }
- return
-}
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go
index c1a4670171..944e75a11c 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go
@@ -3590,8 +3590,6 @@ type Nhmsg struct {
Flags uint32
}
-const SizeofNhmsg = 0x8
-
type NexthopGrp struct {
Id uint32
Weight uint8
@@ -3599,8 +3597,6 @@ type NexthopGrp struct {
Resvd2 uint16
}
-const SizeofNexthopGrp = 0x8
-
const (
NHA_UNSPEC = 0x0
NHA_ID = 0x1
@@ -6336,30 +6332,3 @@ type SockDiagReq struct {
}
const RTM_NEWNVLAN = 0x70
-
-const (
- MPOL_BIND = 0x2
- MPOL_DEFAULT = 0x0
- MPOL_F_ADDR = 0x2
- MPOL_F_MEMS_ALLOWED = 0x4
- MPOL_F_MOF = 0x8
- MPOL_F_MORON = 0x10
- MPOL_F_NODE = 0x1
- MPOL_F_NUMA_BALANCING = 0x2000
- MPOL_F_RELATIVE_NODES = 0x4000
- MPOL_F_SHARED = 0x1
- MPOL_F_STATIC_NODES = 0x8000
- MPOL_INTERLEAVE = 0x3
- MPOL_LOCAL = 0x4
- MPOL_MAX = 0x7
- MPOL_MF_INTERNAL = 0x10
- MPOL_MF_LAZY = 0x8
- MPOL_MF_MOVE_ALL = 0x4
- MPOL_MF_MOVE = 0x2
- MPOL_MF_STRICT = 0x1
- MPOL_MF_VALID = 0x7
- MPOL_MODE_FLAGS = 0xe000
- MPOL_PREFERRED = 0x1
- MPOL_PREFERRED_MANY = 0x5
- MPOL_WEIGHTED_INTERLEAVE = 0x6
-)
diff --git a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
index 50e8e64497..439548ec9a 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
@@ -104,7 +104,7 @@ type Statvfs_t struct {
Fsid uint32
Namemax uint32
Owner uint32
- Spare [4]uint64
+ Spare [4]uint32
Fstypename [32]byte
Mntonname [1024]byte
Mntfromname [1024]byte
diff --git a/vendor/golang.org/x/sys/windows/syscall_windows.go b/vendor/golang.org/x/sys/windows/syscall_windows.go
index 69439df2a4..640f6b153f 100644
--- a/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -321,8 +321,6 @@ func NewCallbackCDecl(fn interface{}) uintptr {
//sys SetConsoleOutputCP(cp uint32) (err error) = kernel32.SetConsoleOutputCP
//sys WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32, reserved *byte) (err error) = kernel32.WriteConsoleW
//sys ReadConsole(console Handle, buf *uint16, toread uint32, read *uint32, inputControl *byte) (err error) = kernel32.ReadConsoleW
-//sys GetNumberOfConsoleInputEvents(console Handle, numevents *uint32) (err error) = kernel32.GetNumberOfConsoleInputEvents
-//sys FlushConsoleInputBuffer(console Handle) (err error) = kernel32.FlushConsoleInputBuffer
//sys resizePseudoConsole(pconsole Handle, size uint32) (hr error) = kernel32.ResizePseudoConsole
//sys CreateToolhelp32Snapshot(flags uint32, processId uint32) (handle Handle, err error) [failretval==InvalidHandle] = kernel32.CreateToolhelp32Snapshot
//sys Module32First(snapshot Handle, moduleEntry *ModuleEntry32) (err error) = kernel32.Module32FirstW
@@ -892,12 +890,8 @@ const socket_error = uintptr(^uint32(0))
//sys MultiByteToWideChar(codePage uint32, dwFlags uint32, str *byte, nstr int32, wchar *uint16, nwchar int32) (nwrite int32, err error) = kernel32.MultiByteToWideChar
//sys getBestInterfaceEx(sockaddr unsafe.Pointer, pdwBestIfIndex *uint32) (errcode error) = iphlpapi.GetBestInterfaceEx
//sys GetIfEntry2Ex(level uint32, row *MibIfRow2) (errcode error) = iphlpapi.GetIfEntry2Ex
-//sys GetIpForwardEntry2(row *MibIpForwardRow2) (errcode error) = iphlpapi.GetIpForwardEntry2
-//sys GetIpForwardTable2(family uint16, table **MibIpForwardTable2) (errcode error) = iphlpapi.GetIpForwardTable2
//sys GetUnicastIpAddressEntry(row *MibUnicastIpAddressRow) (errcode error) = iphlpapi.GetUnicastIpAddressEntry
-//sys FreeMibTable(memory unsafe.Pointer) = iphlpapi.FreeMibTable
//sys NotifyIpInterfaceChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) = iphlpapi.NotifyIpInterfaceChange
-//sys NotifyRouteChange2(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) = iphlpapi.NotifyRouteChange2
//sys NotifyUnicastIpAddressChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) = iphlpapi.NotifyUnicastIpAddressChange
//sys CancelMibChangeNotify2(notificationHandle Handle) (errcode error) = iphlpapi.CancelMibChangeNotify2
@@ -920,17 +914,6 @@ type RawSockaddrInet6 struct {
Scope_id uint32
}
-// RawSockaddrInet is a union that contains an IPv4, an IPv6 address, or an address family. See
-// https://learn.microsoft.com/en-us/windows/win32/api/ws2ipdef/ns-ws2ipdef-sockaddr_inet.
-//
-// A [*RawSockaddrInet] may be converted to a [*RawSockaddrInet4] or [*RawSockaddrInet6] using
-// unsafe, depending on the address family.
-type RawSockaddrInet struct {
- Family uint16
- Port uint16
- Data [6]uint32
-}
-
type RawSockaddr struct {
Family uint16
Data [14]int8
diff --git a/vendor/golang.org/x/sys/windows/types_windows.go b/vendor/golang.org/x/sys/windows/types_windows.go
index 6e4f50eb48..993a2297db 100644
--- a/vendor/golang.org/x/sys/windows/types_windows.go
+++ b/vendor/golang.org/x/sys/windows/types_windows.go
@@ -65,22 +65,6 @@ var signals = [...]string{
15: "terminated",
}
-// File flags for [os.OpenFile]. The O_ prefix is used to indicate
-// that these flags are specific to the OpenFile function.
-const (
- O_FILE_FLAG_OPEN_NO_RECALL = FILE_FLAG_OPEN_NO_RECALL
- O_FILE_FLAG_OPEN_REPARSE_POINT = FILE_FLAG_OPEN_REPARSE_POINT
- O_FILE_FLAG_SESSION_AWARE = FILE_FLAG_SESSION_AWARE
- O_FILE_FLAG_POSIX_SEMANTICS = FILE_FLAG_POSIX_SEMANTICS
- O_FILE_FLAG_BACKUP_SEMANTICS = FILE_FLAG_BACKUP_SEMANTICS
- O_FILE_FLAG_DELETE_ON_CLOSE = FILE_FLAG_DELETE_ON_CLOSE
- O_FILE_FLAG_SEQUENTIAL_SCAN = FILE_FLAG_SEQUENTIAL_SCAN
- O_FILE_FLAG_RANDOM_ACCESS = FILE_FLAG_RANDOM_ACCESS
- O_FILE_FLAG_NO_BUFFERING = FILE_FLAG_NO_BUFFERING
- O_FILE_FLAG_OVERLAPPED = FILE_FLAG_OVERLAPPED
- O_FILE_FLAG_WRITE_THROUGH = FILE_FLAG_WRITE_THROUGH
-)
-
const (
FILE_READ_DATA = 0x00000001
FILE_READ_ATTRIBUTES = 0x00000080
@@ -2320,82 +2304,6 @@ type MibIfRow2 struct {
OutQLen uint64
}
-// IP_ADDRESS_PREFIX stores an IP address prefix. See
-// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-ip_address_prefix.
-type IpAddressPrefix struct {
- Prefix RawSockaddrInet
- PrefixLength uint8
-}
-
-// NL_ROUTE_ORIGIN enumeration from nldef.h or
-// https://learn.microsoft.com/en-us/windows/win32/api/nldef/ne-nldef-nl_route_origin.
-const (
- NlroManual = 0
- NlroWellKnown = 1
- NlroDHCP = 2
- NlroRouterAdvertisement = 3
- Nlro6to4 = 4
-)
-
-// NL_ROUTE_ORIGIN enumeration from nldef.h or
-// https://learn.microsoft.com/en-us/windows/win32/api/nldef/ne-nldef-nl_route_protocol.
-const (
- MIB_IPPROTO_OTHER = 1
- MIB_IPPROTO_LOCAL = 2
- MIB_IPPROTO_NETMGMT = 3
- MIB_IPPROTO_ICMP = 4
- MIB_IPPROTO_EGP = 5
- MIB_IPPROTO_GGP = 6
- MIB_IPPROTO_HELLO = 7
- MIB_IPPROTO_RIP = 8
- MIB_IPPROTO_IS_IS = 9
- MIB_IPPROTO_ES_IS = 10
- MIB_IPPROTO_CISCO = 11
- MIB_IPPROTO_BBN = 12
- MIB_IPPROTO_OSPF = 13
- MIB_IPPROTO_BGP = 14
- MIB_IPPROTO_IDPR = 15
- MIB_IPPROTO_EIGRP = 16
- MIB_IPPROTO_DVMRP = 17
- MIB_IPPROTO_RPL = 18
- MIB_IPPROTO_DHCP = 19
- MIB_IPPROTO_NT_AUTOSTATIC = 10002
- MIB_IPPROTO_NT_STATIC = 10006
- MIB_IPPROTO_NT_STATIC_NON_DOD = 10007
-)
-
-// MIB_IPFORWARD_ROW2 stores information about an IP route entry. See
-// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-mib_ipforward_row2.
-type MibIpForwardRow2 struct {
- InterfaceLuid uint64
- InterfaceIndex uint32
- DestinationPrefix IpAddressPrefix
- NextHop RawSockaddrInet
- SitePrefixLength uint8
- ValidLifetime uint32
- PreferredLifetime uint32
- Metric uint32
- Protocol uint32
- Loopback uint8
- AutoconfigureAddress uint8
- Publish uint8
- Immortal uint8
- Age uint32
- Origin uint32
-}
-
-// MIB_IPFORWARD_TABLE2 contains a table of IP route entries. See
-// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-mib_ipforward_table2.
-type MibIpForwardTable2 struct {
- NumEntries uint32
- Table [1]MibIpForwardRow2
-}
-
-// Rows returns the IP route entries in the table.
-func (t *MibIpForwardTable2) Rows() []MibIpForwardRow2 {
- return unsafe.Slice(&t.Table[0], t.NumEntries)
-}
-
// MIB_UNICASTIPADDRESS_ROW stores information about a unicast IP address. See
// https://learn.microsoft.com/en-us/windows/win32/api/netioapi/ns-netioapi-mib_unicastipaddress_row.
type MibUnicastIpAddressRow struct {
diff --git a/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
index f25b7308a1..641a5f4b77 100644
--- a/vendor/golang.org/x/sys/windows/zsyscall_windows.go
+++ b/vendor/golang.org/x/sys/windows/zsyscall_windows.go
@@ -182,17 +182,13 @@ var (
procDwmGetWindowAttribute = moddwmapi.NewProc("DwmGetWindowAttribute")
procDwmSetWindowAttribute = moddwmapi.NewProc("DwmSetWindowAttribute")
procCancelMibChangeNotify2 = modiphlpapi.NewProc("CancelMibChangeNotify2")
- procFreeMibTable = modiphlpapi.NewProc("FreeMibTable")
procGetAdaptersAddresses = modiphlpapi.NewProc("GetAdaptersAddresses")
procGetAdaptersInfo = modiphlpapi.NewProc("GetAdaptersInfo")
procGetBestInterfaceEx = modiphlpapi.NewProc("GetBestInterfaceEx")
procGetIfEntry = modiphlpapi.NewProc("GetIfEntry")
procGetIfEntry2Ex = modiphlpapi.NewProc("GetIfEntry2Ex")
- procGetIpForwardEntry2 = modiphlpapi.NewProc("GetIpForwardEntry2")
- procGetIpForwardTable2 = modiphlpapi.NewProc("GetIpForwardTable2")
procGetUnicastIpAddressEntry = modiphlpapi.NewProc("GetUnicastIpAddressEntry")
procNotifyIpInterfaceChange = modiphlpapi.NewProc("NotifyIpInterfaceChange")
- procNotifyRouteChange2 = modiphlpapi.NewProc("NotifyRouteChange2")
procNotifyUnicastIpAddressChange = modiphlpapi.NewProc("NotifyUnicastIpAddressChange")
procAddDllDirectory = modkernel32.NewProc("AddDllDirectory")
procAssignProcessToJobObject = modkernel32.NewProc("AssignProcessToJobObject")
@@ -242,7 +238,6 @@ var (
procFindResourceW = modkernel32.NewProc("FindResourceW")
procFindVolumeClose = modkernel32.NewProc("FindVolumeClose")
procFindVolumeMountPointClose = modkernel32.NewProc("FindVolumeMountPointClose")
- procFlushConsoleInputBuffer = modkernel32.NewProc("FlushConsoleInputBuffer")
procFlushFileBuffers = modkernel32.NewProc("FlushFileBuffers")
procFlushViewOfFile = modkernel32.NewProc("FlushViewOfFile")
procFormatMessageW = modkernel32.NewProc("FormatMessageW")
@@ -289,7 +284,6 @@ var (
procGetNamedPipeHandleStateW = modkernel32.NewProc("GetNamedPipeHandleStateW")
procGetNamedPipeInfo = modkernel32.NewProc("GetNamedPipeInfo")
procGetNamedPipeServerProcessId = modkernel32.NewProc("GetNamedPipeServerProcessId")
- procGetNumberOfConsoleInputEvents = modkernel32.NewProc("GetNumberOfConsoleInputEvents")
procGetOverlappedResult = modkernel32.NewProc("GetOverlappedResult")
procGetPriorityClass = modkernel32.NewProc("GetPriorityClass")
procGetProcAddress = modkernel32.NewProc("GetProcAddress")
@@ -1628,11 +1622,6 @@ func CancelMibChangeNotify2(notificationHandle Handle) (errcode error) {
return
}
-func FreeMibTable(memory unsafe.Pointer) {
- syscall.SyscallN(procFreeMibTable.Addr(), uintptr(memory))
- return
-}
-
func GetAdaptersAddresses(family uint32, flags uint32, reserved uintptr, adapterAddresses *IpAdapterAddresses, sizePointer *uint32) (errcode error) {
r0, _, _ := syscall.SyscallN(procGetAdaptersAddresses.Addr(), uintptr(family), uintptr(flags), uintptr(reserved), uintptr(unsafe.Pointer(adapterAddresses)), uintptr(unsafe.Pointer(sizePointer)))
if r0 != 0 {
@@ -1673,22 +1662,6 @@ func GetIfEntry2Ex(level uint32, row *MibIfRow2) (errcode error) {
return
}
-func GetIpForwardEntry2(row *MibIpForwardRow2) (errcode error) {
- r0, _, _ := syscall.SyscallN(procGetIpForwardEntry2.Addr(), uintptr(unsafe.Pointer(row)))
- if r0 != 0 {
- errcode = syscall.Errno(r0)
- }
- return
-}
-
-func GetIpForwardTable2(family uint16, table **MibIpForwardTable2) (errcode error) {
- r0, _, _ := syscall.SyscallN(procGetIpForwardTable2.Addr(), uintptr(family), uintptr(unsafe.Pointer(table)))
- if r0 != 0 {
- errcode = syscall.Errno(r0)
- }
- return
-}
-
func GetUnicastIpAddressEntry(row *MibUnicastIpAddressRow) (errcode error) {
r0, _, _ := syscall.SyscallN(procGetUnicastIpAddressEntry.Addr(), uintptr(unsafe.Pointer(row)))
if r0 != 0 {
@@ -1709,18 +1682,6 @@ func NotifyIpInterfaceChange(family uint16, callback uintptr, callerContext unsa
return
}
-func NotifyRouteChange2(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) {
- var _p0 uint32
- if initialNotification {
- _p0 = 1
- }
- r0, _, _ := syscall.SyscallN(procNotifyRouteChange2.Addr(), uintptr(family), uintptr(callback), uintptr(callerContext), uintptr(_p0), uintptr(unsafe.Pointer(notificationHandle)))
- if r0 != 0 {
- errcode = syscall.Errno(r0)
- }
- return
-}
-
func NotifyUnicastIpAddressChange(family uint16, callback uintptr, callerContext unsafe.Pointer, initialNotification bool, notificationHandle *Handle) (errcode error) {
var _p0 uint32
if initialNotification {
@@ -2150,14 +2111,6 @@ func FindVolumeMountPointClose(findVolumeMountPoint Handle) (err error) {
return
}
-func FlushConsoleInputBuffer(console Handle) (err error) {
- r1, _, e1 := syscall.SyscallN(procFlushConsoleInputBuffer.Addr(), uintptr(console))
- if r1 == 0 {
- err = errnoErr(e1)
- }
- return
-}
-
func FlushFileBuffers(handle Handle) (err error) {
r1, _, e1 := syscall.SyscallN(procFlushFileBuffers.Addr(), uintptr(handle))
if r1 == 0 {
@@ -2528,14 +2481,6 @@ func GetNamedPipeServerProcessId(pipe Handle, serverProcessID *uint32) (err erro
return
}
-func GetNumberOfConsoleInputEvents(console Handle, numevents *uint32) (err error) {
- r1, _, e1 := syscall.SyscallN(procGetNumberOfConsoleInputEvents.Addr(), uintptr(console), uintptr(unsafe.Pointer(numevents)))
- if r1 == 0 {
- err = errnoErr(e1)
- }
- return
-}
-
func GetOverlappedResult(handle Handle, overlapped *Overlapped, done *uint32, wait bool) (err error) {
var _p0 uint32
if wait {
diff --git a/vendor/golang.org/x/term/terminal.go b/vendor/golang.org/x/term/terminal.go
index 9255449b9b..bddb2e2aeb 100644
--- a/vendor/golang.org/x/term/terminal.go
+++ b/vendor/golang.org/x/term/terminal.go
@@ -413,7 +413,7 @@ func (t *Terminal) eraseNPreviousChars(n int) {
}
}
-// countToLeftWord returns the number of characters from the cursor to the
+// countToLeftWord returns then number of characters from the cursor to the
// start of the previous word.
func (t *Terminal) countToLeftWord() int {
if t.pos == 0 {
@@ -438,7 +438,7 @@ func (t *Terminal) countToLeftWord() int {
return t.pos - pos
}
-// countToRightWord returns the number of characters from the cursor to the
+// countToRightWord returns then number of characters from the cursor to the
// start of the next word.
func (t *Terminal) countToRightWord() int {
pos := t.pos
@@ -478,7 +478,7 @@ func visualLength(runes []rune) int {
return length
}
-// historyAt unlocks the terminal and relocks it while calling History.At.
+// histroryAt unlocks the terminal and relocks it while calling History.At.
func (t *Terminal) historyAt(idx int) (string, bool) {
t.lock.Unlock() // Unlock to avoid deadlock if History methods use the output writer.
defer t.lock.Lock() // panic in At (or Len) protection.
diff --git a/vendor/golang.org/x/text/encoding/japanese/eucjp.go b/vendor/golang.org/x/text/encoding/japanese/eucjp.go
index 6fce8c5f52..79313fa589 100644
--- a/vendor/golang.org/x/text/encoding/japanese/eucjp.go
+++ b/vendor/golang.org/x/text/encoding/japanese/eucjp.go
@@ -17,9 +17,9 @@ import (
var EUCJP encoding.Encoding = &eucJP
var eucJP = internal.Encoding{
- Encoding: &internal.SimpleEncoding{Decoder: eucJPDecoder{}, Encoder: eucJPEncoder{}},
- Name: "EUC-JP",
- MIB: identifier.EUCPkdFmtJapanese,
+ &internal.SimpleEncoding{eucJPDecoder{}, eucJPEncoder{}},
+ "EUC-JP",
+ identifier.EUCPkdFmtJapanese,
}
type eucJPDecoder struct{ transform.NopResetter }
diff --git a/vendor/golang.org/x/text/encoding/japanese/iso2022jp.go b/vendor/golang.org/x/text/encoding/japanese/iso2022jp.go
index 6f7bd460a6..613226df5e 100644
--- a/vendor/golang.org/x/text/encoding/japanese/iso2022jp.go
+++ b/vendor/golang.org/x/text/encoding/japanese/iso2022jp.go
@@ -17,9 +17,9 @@ import (
var ISO2022JP encoding.Encoding = &iso2022JP
var iso2022JP = internal.Encoding{
- Encoding: internal.FuncEncoding{Decoder: iso2022JPNewDecoder, Encoder: iso2022JPNewEncoder},
- Name: "ISO-2022-JP",
- MIB: identifier.ISO2022JP,
+ internal.FuncEncoding{iso2022JPNewDecoder, iso2022JPNewEncoder},
+ "ISO-2022-JP",
+ identifier.ISO2022JP,
}
func iso2022JPNewDecoder() transform.Transformer {
diff --git a/vendor/golang.org/x/text/encoding/japanese/shiftjis.go b/vendor/golang.org/x/text/encoding/japanese/shiftjis.go
index af65d43d95..16fd8a6e3e 100644
--- a/vendor/golang.org/x/text/encoding/japanese/shiftjis.go
+++ b/vendor/golang.org/x/text/encoding/japanese/shiftjis.go
@@ -18,9 +18,9 @@ import (
var ShiftJIS encoding.Encoding = &shiftJIS
var shiftJIS = internal.Encoding{
- Encoding: &internal.SimpleEncoding{Decoder: shiftJISDecoder{}, Encoder: shiftJISEncoder{}},
- Name: "Shift JIS",
- MIB: identifier.ShiftJIS,
+ &internal.SimpleEncoding{shiftJISDecoder{}, shiftJISEncoder{}},
+ "Shift JIS",
+ identifier.ShiftJIS,
}
type shiftJISDecoder struct{ transform.NopResetter }
diff --git a/vendor/golang.org/x/text/encoding/korean/euckr.go b/vendor/golang.org/x/text/encoding/korean/euckr.go
index 81c834730c..034337f5df 100644
--- a/vendor/golang.org/x/text/encoding/korean/euckr.go
+++ b/vendor/golang.org/x/text/encoding/korean/euckr.go
@@ -20,9 +20,9 @@ var All = []encoding.Encoding{EUCKR}
var EUCKR encoding.Encoding = &eucKR
var eucKR = internal.Encoding{
- Encoding: &internal.SimpleEncoding{Decoder: eucKRDecoder{}, Encoder: eucKREncoder{}},
- Name: "EUC-KR",
- MIB: identifier.EUCKR,
+ &internal.SimpleEncoding{eucKRDecoder{}, eucKREncoder{}},
+ "EUC-KR",
+ identifier.EUCKR,
}
type eucKRDecoder struct{ transform.NopResetter }
diff --git a/vendor/golang.org/x/text/encoding/simplifiedchinese/gbk.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/gbk.go
index 2f2fd5d449..0e0fabfd6b 100644
--- a/vendor/golang.org/x/text/encoding/simplifiedchinese/gbk.go
+++ b/vendor/golang.org/x/text/encoding/simplifiedchinese/gbk.go
@@ -22,21 +22,21 @@ var (
)
var gbk = internal.Encoding{
- Encoding: &internal.SimpleEncoding{
- Decoder: gbkDecoder{gb18030: false},
- Encoder: gbkEncoder{gb18030: false},
+ &internal.SimpleEncoding{
+ gbkDecoder{gb18030: false},
+ gbkEncoder{gb18030: false},
},
- Name: "GBK",
- MIB: identifier.GBK,
+ "GBK",
+ identifier.GBK,
}
var gbk18030 = internal.Encoding{
- Encoding: &internal.SimpleEncoding{
- Decoder: gbkDecoder{gb18030: true},
- Encoder: gbkEncoder{gb18030: true},
+ &internal.SimpleEncoding{
+ gbkDecoder{gb18030: true},
+ gbkEncoder{gb18030: true},
},
- Name: "GB18030",
- MIB: identifier.GB18030,
+ "GB18030",
+ identifier.GB18030,
}
type gbkDecoder struct {
diff --git a/vendor/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go b/vendor/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go
index 351750e60e..e15b7bf6a7 100644
--- a/vendor/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go
+++ b/vendor/golang.org/x/text/encoding/simplifiedchinese/hzgb2312.go
@@ -17,9 +17,9 @@ import (
var HZGB2312 encoding.Encoding = &hzGB2312
var hzGB2312 = internal.Encoding{
- Encoding: internal.FuncEncoding{Decoder: hzGB2312NewDecoder, Encoder: hzGB2312NewEncoder},
- Name: "HZ-GB2312",
- MIB: identifier.HZGB2312,
+ internal.FuncEncoding{hzGB2312NewDecoder, hzGB2312NewEncoder},
+ "HZ-GB2312",
+ identifier.HZGB2312,
}
func hzGB2312NewDecoder() transform.Transformer {
diff --git a/vendor/golang.org/x/text/encoding/traditionalchinese/big5.go b/vendor/golang.org/x/text/encoding/traditionalchinese/big5.go
index 5046920ee0..1fcddde082 100644
--- a/vendor/golang.org/x/text/encoding/traditionalchinese/big5.go
+++ b/vendor/golang.org/x/text/encoding/traditionalchinese/big5.go
@@ -20,9 +20,9 @@ var All = []encoding.Encoding{Big5}
var Big5 encoding.Encoding = &big5
var big5 = internal.Encoding{
- Encoding: &internal.SimpleEncoding{Decoder: big5Decoder{}, Encoder: big5Encoder{}},
- Name: "Big5",
- MIB: identifier.Big5,
+ &internal.SimpleEncoding{big5Decoder{}, big5Encoder{}},
+ "Big5",
+ identifier.Big5,
}
type big5Decoder struct{ transform.NopResetter }
diff --git a/vendor/golang.org/x/text/encoding/unicode/unicode.go b/vendor/golang.org/x/text/encoding/unicode/unicode.go
index ce28c90628..dd99ad14d3 100644
--- a/vendor/golang.org/x/text/encoding/unicode/unicode.go
+++ b/vendor/golang.org/x/text/encoding/unicode/unicode.go
@@ -60,9 +60,9 @@ func (utf8bomEncoding) NewDecoder() *encoding.Decoder {
}
var utf8enc = &internal.Encoding{
- Encoding: &internal.SimpleEncoding{Decoder: utf8Decoder{}, Encoder: runes.ReplaceIllFormed()},
- Name: "UTF-8",
- MIB: identifier.UTF8,
+ &internal.SimpleEncoding{utf8Decoder{}, runes.ReplaceIllFormed()},
+ "UTF-8",
+ identifier.UTF8,
}
type utf8bomDecoder struct {
diff --git a/vendor/golang.org/x/text/unicode/bidi/core.go b/vendor/golang.org/x/text/unicode/bidi/core.go
index fb8273236d..9d2ae547b5 100644
--- a/vendor/golang.org/x/text/unicode/bidi/core.go
+++ b/vendor/golang.org/x/text/unicode/bidi/core.go
@@ -427,6 +427,13 @@ type isolatingRunSequence struct {
func (i *isolatingRunSequence) Len() int { return len(i.indexes) }
+func maxLevel(a, b level) level {
+ if a > b {
+ return a
+ }
+ return b
+}
+
// Rule X10, second bullet: Determine the start-of-sequence (sos) and end-of-sequence (eos) types,
// either L or R, for each isolating run sequence.
func (p *paragraph) isolatingRunSequence(indexes []int) *isolatingRunSequence {
@@ -467,8 +474,8 @@ func (p *paragraph) isolatingRunSequence(indexes []int) *isolatingRunSequence {
indexes: indexes,
types: types,
level: level,
- sos: typeForLevel(max(prevLevel, level)),
- eos: typeForLevel(max(succLevel, level)),
+ sos: typeForLevel(maxLevel(prevLevel, level)),
+ eos: typeForLevel(maxLevel(succLevel, level)),
}
}
diff --git a/vendor/golang.org/x/tools/go/ast/inspector/cursor.go b/vendor/golang.org/x/tools/go/ast/inspector/cursor.go
index fc9bbc714c..7e72d3c284 100644
--- a/vendor/golang.org/x/tools/go/ast/inspector/cursor.go
+++ b/vendor/golang.org/x/tools/go/ast/inspector/cursor.go
@@ -467,9 +467,7 @@ func (c Cursor) FindByPos(start, end token.Pos) (Cursor, bool) {
// This algorithm could be implemented using c.Inspect,
// but it is about 2.5x slower.
- // best is the push-index of the latest (=innermost) node containing range.
- // (Beware: latest is not always innermost because FuncDecl.{Name,Type} overlap.)
- best := int32(-1)
+ best := int32(-1) // push index of latest (=innermost) node containing range
for i, limit := c.indices(); i < limit; i++ {
ev := events[i]
if ev.index > i { // push?
@@ -483,19 +481,6 @@ func (c Cursor) FindByPos(start, end token.Pos) (Cursor, bool) {
continue
}
} else {
- // Edge case: FuncDecl.Name and .Type overlap:
- // Don't update best from Name to FuncDecl.Type.
- //
- // The condition can be read as:
- // - n is FuncType
- // - n.parent is FuncDecl
- // - best is strictly beneath the FuncDecl
- if ev.typ == 1< ev.parent {
- continue
- }
-
nodeEnd = n.End()
if n.Pos() > start {
break // disjoint, after; stop
diff --git a/vendor/golang.org/x/tools/go/packages/golist.go b/vendor/golang.org/x/tools/go/packages/golist.go
index 680a70ca8f..89f89dd2dc 100644
--- a/vendor/golang.org/x/tools/go/packages/golist.go
+++ b/vendor/golang.org/x/tools/go/packages/golist.go
@@ -364,6 +364,12 @@ type jsonPackage struct {
DepsErrors []*packagesinternal.PackageError
}
+type jsonPackageError struct {
+ ImportStack []string
+ Pos string
+ Err string
+}
+
func otherFiles(p *jsonPackage) [][]string {
return [][]string{p.CFiles, p.CXXFiles, p.MFiles, p.HFiles, p.FFiles, p.SFiles, p.SwigFiles, p.SwigCXXFiles, p.SysoFiles}
}
diff --git a/vendor/golang.org/x/tools/go/packages/visit.go b/vendor/golang.org/x/tools/go/packages/visit.go
index c546b1b63e..af6a60d75f 100644
--- a/vendor/golang.org/x/tools/go/packages/visit.go
+++ b/vendor/golang.org/x/tools/go/packages/visit.go
@@ -78,7 +78,7 @@ func PrintErrors(pkgs []*Package) int {
return n
}
-// Postorder returns an iterator over the packages in
+// Postorder returns an iterator over the the packages in
// the import graph whose roots are pkg.
// Packages are enumerated in dependencies-first order.
func Postorder(pkgs []*Package) iter.Seq[*Package] {
diff --git a/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go b/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
index 6646bf5508..6c0c74968f 100644
--- a/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
+++ b/vendor/golang.org/x/tools/go/types/objectpath/objectpath.go
@@ -249,7 +249,7 @@ func (enc *Encoder) For(obj types.Object) (Path, error) {
case *types.Func:
// A func, if not package-level, must be a method.
- if recv := obj.Signature().Recv(); recv == nil {
+ if recv := obj.Type().(*types.Signature).Recv(); recv == nil {
return "", fmt.Errorf("func is not a method: %v", obj)
}
@@ -405,7 +405,7 @@ func (enc *Encoder) concreteMethod(meth *types.Func) (Path, bool) {
return "", false
}
- _, named := typesinternal.ReceiverNamed(meth.Signature().Recv())
+ _, named := typesinternal.ReceiverNamed(meth.Type().(*types.Signature).Recv())
if named == nil {
return "", false
}
diff --git a/vendor/golang.org/x/tools/go/types/typeutil/map.go b/vendor/golang.org/x/tools/go/types/typeutil/map.go
index 36624572a6..f035a0b6be 100644
--- a/vendor/golang.org/x/tools/go/types/typeutil/map.go
+++ b/vendor/golang.org/x/tools/go/types/typeutil/map.go
@@ -304,7 +304,8 @@ func (h hasher) hash(t types.Type) uint32 {
case *types.Named:
hash := h.hashTypeName(t.Obj())
targs := t.TypeArgs()
- for targ := range targs.Types() {
+ for i := 0; i < targs.Len(); i++ {
+ targ := targs.At(i)
hash += 2 * h.hash(targ)
}
return hash
diff --git a/vendor/golang.org/x/tools/internal/event/core/event.go b/vendor/golang.org/x/tools/internal/event/core/event.go
index ade5d1e799..a6cf0e64a4 100644
--- a/vendor/golang.org/x/tools/internal/event/core/event.go
+++ b/vendor/golang.org/x/tools/internal/event/core/event.go
@@ -28,6 +28,11 @@ type Event struct {
dynamic []label.Label // dynamically sized storage for remaining labels
}
+// eventLabelMap implements label.Map for a the labels of an Event.
+type eventLabelMap struct {
+ event Event
+}
+
func (ev Event) At() time.Time { return ev.at }
func (ev Event) Format(f fmt.State, r rune) {
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/bimport.go b/vendor/golang.org/x/tools/internal/gcimporter/bimport.go
index 555ef626c0..734c46198d 100644
--- a/vendor/golang.org/x/tools/internal/gcimporter/bimport.go
+++ b/vendor/golang.org/x/tools/internal/gcimporter/bimport.go
@@ -34,7 +34,7 @@ type fileInfo struct {
const maxlines = 64 * 1024
func (s *fakeFileSet) pos(file string, line, column int) token.Pos {
- _ = column // TODO(mdempsky): Make use of column.
+ // TODO(mdempsky): Make use of column.
// Since we don't know the set of needed file positions, we reserve maxlines
// positions per file. We delay calling token.File.SetLines until all
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/iexport.go b/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
index 2bef2b058b..780873e3ae 100644
--- a/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
+++ b/vendor/golang.org/x/tools/internal/gcimporter/iexport.go
@@ -569,6 +569,7 @@ func (p *iexporter) exportName(obj types.Object) (res string) {
type iexporter struct {
fset *token.FileSet
+ out *bytes.Buffer
version int
shallow bool // don't put types from other packages in the index
@@ -829,7 +830,8 @@ func (p *iexporter) doDecl(obj types.Object) {
// their name must be qualified before exporting recv.
if rparams := sig.RecvTypeParams(); rparams.Len() > 0 {
prefix := obj.Name() + "." + m.Name()
- for rparam := range rparams.TypeParams() {
+ for i := 0; i < rparams.Len(); i++ {
+ rparam := rparams.At(i)
name := tparamExportName(prefix, rparam)
w.p.tparamNames[rparam.Obj()] = name
}
@@ -943,13 +945,6 @@ func (w *exportWriter) posV0(pos token.Pos) {
}
func (w *exportWriter) pkg(pkg *types.Package) {
- if pkg == nil {
- // [exportWriter.typ] accepts a nil pkg only for types
- // of constants, which cannot contain named objects
- // such as fields or methods and thus should never
- // reach this method (#76222).
- panic("nil package")
- }
// Ensure any referenced packages are declared in the main index.
w.p.allPkgs[pkg] = true
@@ -965,11 +960,9 @@ func (w *exportWriter) qualifiedType(obj *types.TypeName) {
w.pkg(obj.Pkg())
}
-// typ emits the specified type.
-//
-// Objects within the type (struct fields and interface methods) are
-// qualified by pkg. It may be nil if the type cannot contain objects,
-// such as the type of a constant.
+// TODO(rfindley): what does 'pkg' even mean here? It would be better to pass
+// it in explicitly into signatures and structs that may use it for
+// constructing fields.
func (w *exportWriter) typ(t types.Type, pkg *types.Package) {
w.data.uint64(w.p.typOff(t, pkg))
}
@@ -999,7 +992,6 @@ func (w *exportWriter) startType(k itag) {
w.data.uint64(uint64(k))
}
-// doTyp is the implementation of [exportWriter.typ].
func (w *exportWriter) doTyp(t types.Type, pkg *types.Package) {
if trace {
w.p.trace("exporting type %s (%T)", t, t)
@@ -1073,7 +1065,7 @@ func (w *exportWriter) doTyp(t types.Type, pkg *types.Package) {
case *types.Signature:
w.startType(signatureType)
- w.pkg(pkg) // qualifies param/result vars
+ w.pkg(pkg)
w.signature(t)
case *types.Struct:
@@ -1119,19 +1111,19 @@ func (w *exportWriter) doTyp(t types.Type, pkg *types.Package) {
case *types.Interface:
w.startType(interfaceType)
- w.pkg(pkg) // qualifies unexported method funcs
+ w.pkg(pkg)
n := t.NumEmbeddeds()
w.uint64(uint64(n))
for i := 0; i < n; i++ {
ft := t.EmbeddedType(i)
+ tPkg := pkg
if named, _ := types.Unalias(ft).(*types.Named); named != nil {
w.pos(named.Obj().Pos())
} else {
- // e.g. ~int
w.pos(token.NoPos)
}
- w.typ(ft, pkg)
+ w.typ(ft, tPkg)
}
// See comment for struct fields. In shallow mode we change the encoding
@@ -1232,19 +1224,20 @@ func (w *exportWriter) signature(sig *types.Signature) {
func (w *exportWriter) typeList(ts *types.TypeList, pkg *types.Package) {
w.uint64(uint64(ts.Len()))
- for t := range ts.Types() {
- w.typ(t, pkg)
+ for i := 0; i < ts.Len(); i++ {
+ w.typ(ts.At(i), pkg)
}
}
func (w *exportWriter) tparamList(prefix string, list *types.TypeParamList, pkg *types.Package) {
ll := uint64(list.Len())
w.uint64(ll)
- for tparam := range list.TypeParams() {
+ for i := 0; i < list.Len(); i++ {
+ tparam := list.At(i)
// Set the type parameter exportName before exporting its type.
exportName := tparamExportName(prefix, tparam)
w.p.tparamNames[tparam.Obj()] = exportName
- w.typ(tparam, pkg)
+ w.typ(list.At(i), pkg)
}
}
diff --git a/vendor/golang.org/x/tools/internal/gcimporter/iimport.go b/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
index 4d6d50094a..82e6c9d2dc 100644
--- a/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
+++ b/vendor/golang.org/x/tools/internal/gcimporter/iimport.go
@@ -432,10 +432,10 @@ func (p *iimporter) doDecl(pkg *types.Package, name string) {
errorf("%v.%v not in index", pkg, name)
}
- r := &importReader{p: p}
+ r := &importReader{p: p, currPkg: pkg}
r.declReader.Reset(p.declData[off:])
- r.obj(pkg, name)
+ r.obj(name)
}
func (p *iimporter) stringAt(off uint64) string {
@@ -551,6 +551,7 @@ func canReuse(def *types.Named, rhs types.Type) bool {
type importReader struct {
p *iimporter
declReader bytes.Reader
+ currPkg *types.Package
prevFile string
prevLine int64
prevColumn int64
@@ -564,8 +565,7 @@ type importReader struct {
// for 1.24, but the fix was not worth back-porting).
var markBlack = func(name *types.TypeName) {}
-// obj decodes and declares the package-level object denoted by (pkg, name).
-func (r *importReader) obj(pkg *types.Package, name string) {
+func (r *importReader) obj(name string) {
tag := r.byte()
pos := r.pos()
@@ -576,27 +576,27 @@ func (r *importReader) obj(pkg *types.Package, name string) {
tparams = r.tparamList()
}
typ := r.typ()
- obj := aliases.NewAlias(r.p.aliases, pos, pkg, name, typ, tparams)
+ obj := aliases.NewAlias(r.p.aliases, pos, r.currPkg, name, typ, tparams)
markBlack(obj) // workaround for golang/go#69912
r.declare(obj)
case constTag:
typ, val := r.value()
- r.declare(types.NewConst(pos, pkg, name, typ, val))
+ r.declare(types.NewConst(pos, r.currPkg, name, typ, val))
case funcTag, genericFuncTag:
var tparams []*types.TypeParam
if tag == genericFuncTag {
tparams = r.tparamList()
}
- sig := r.signature(pkg, nil, nil, tparams)
- r.declare(types.NewFunc(pos, pkg, name, sig))
+ sig := r.signature(nil, nil, tparams)
+ r.declare(types.NewFunc(pos, r.currPkg, name, sig))
case typeTag, genericTypeTag:
// Types can be recursive. We need to setup a stub
// declaration before recursing.
- obj := types.NewTypeName(pos, pkg, name, nil)
+ obj := types.NewTypeName(pos, r.currPkg, name, nil)
named := types.NewNamed(obj, nil, nil)
markBlack(obj) // workaround for golang/go#69912
@@ -616,7 +616,7 @@ func (r *importReader) obj(pkg *types.Package, name string) {
for n := r.uint64(); n > 0; n-- {
mpos := r.pos()
mname := r.ident()
- recv := r.param(pkg)
+ recv := r.param()
// If the receiver has any targs, set those as the
// rparams of the method (since those are the
@@ -630,9 +630,9 @@ func (r *importReader) obj(pkg *types.Package, name string) {
rparams[i] = types.Unalias(targs.At(i)).(*types.TypeParam)
}
}
- msig := r.signature(pkg, recv, rparams, nil)
+ msig := r.signature(recv, rparams, nil)
- named.AddMethod(types.NewFunc(mpos, pkg, mname, msig))
+ named.AddMethod(types.NewFunc(mpos, r.currPkg, mname, msig))
}
}
@@ -644,12 +644,12 @@ func (r *importReader) obj(pkg *types.Package, name string) {
errorf("unexpected type param type")
}
name0 := tparamName(name)
- tn := types.NewTypeName(pos, pkg, name0, nil)
+ tn := types.NewTypeName(pos, r.currPkg, name0, nil)
t := types.NewTypeParam(tn, nil)
// To handle recursive references to the typeparam within its
// bound, save the partial type in tparamIndex before reading the bounds.
- id := ident{pkg, name}
+ id := ident{r.currPkg, name}
r.p.tparamIndex[id] = t
var implicit bool
if r.p.version >= iexportVersionGo1_18 {
@@ -672,7 +672,7 @@ func (r *importReader) obj(pkg *types.Package, name string) {
case varTag:
typ := r.typ()
- v := types.NewVar(pos, pkg, name, typ)
+ v := types.NewVar(pos, r.currPkg, name, typ)
typesinternal.SetVarKind(v, typesinternal.PackageVar)
r.declare(v)
@@ -905,11 +905,11 @@ func (r *importReader) doType(base *types.Named) (res types.Type) {
case mapType:
return types.NewMap(r.typ(), r.typ())
case signatureType:
- paramPkg := r.pkg()
- return r.signature(paramPkg, nil, nil, nil)
+ r.currPkg = r.pkg()
+ return r.signature(nil, nil, nil)
case structType:
- fieldPkg := r.pkg()
+ r.currPkg = r.pkg()
fields := make([]*types.Var, r.uint64())
tags := make([]string, len(fields))
@@ -932,7 +932,7 @@ func (r *importReader) doType(base *types.Named) (res types.Type) {
// discussed in iexport.go, this is not correct, but mostly works and is
// preferable to failing (for now at least).
if field == nil {
- field = types.NewField(fpos, fieldPkg, fname, ftyp, emb)
+ field = types.NewField(fpos, r.currPkg, fname, ftyp, emb)
}
fields[i] = field
@@ -941,7 +941,7 @@ func (r *importReader) doType(base *types.Named) (res types.Type) {
return types.NewStruct(fields, tags)
case interfaceType:
- methodPkg := r.pkg() // qualifies methods and their param/result vars
+ r.currPkg = r.pkg()
embeddeds := make([]types.Type, r.uint64())
for i := range embeddeds {
@@ -963,12 +963,12 @@ func (r *importReader) doType(base *types.Named) (res types.Type) {
// don't agree with this.
var recv *types.Var
if base != nil {
- recv = types.NewVar(token.NoPos, methodPkg, "", base)
+ recv = types.NewVar(token.NoPos, r.currPkg, "", base)
}
- msig := r.signature(methodPkg, recv, nil, nil)
+ msig := r.signature(recv, nil, nil)
if method == nil {
- method = types.NewFunc(mpos, methodPkg, mname, msig)
+ method = types.NewFunc(mpos, r.currPkg, mname, msig)
}
methods[i] = method
}
@@ -1049,9 +1049,9 @@ func (r *importReader) objectPathObject() types.Object {
return obj
}
-func (r *importReader) signature(paramPkg *types.Package, recv *types.Var, rparams []*types.TypeParam, tparams []*types.TypeParam) *types.Signature {
- params := r.paramList(paramPkg)
- results := r.paramList(paramPkg)
+func (r *importReader) signature(recv *types.Var, rparams []*types.TypeParam, tparams []*types.TypeParam) *types.Signature {
+ params := r.paramList()
+ results := r.paramList()
variadic := params.Len() > 0 && r.bool()
return types.NewSignatureType(recv, rparams, tparams, params, results, variadic)
}
@@ -1070,19 +1070,19 @@ func (r *importReader) tparamList() []*types.TypeParam {
return xs
}
-func (r *importReader) paramList(pkg *types.Package) *types.Tuple {
+func (r *importReader) paramList() *types.Tuple {
xs := make([]*types.Var, r.uint64())
for i := range xs {
- xs[i] = r.param(pkg)
+ xs[i] = r.param()
}
return types.NewTuple(xs...)
}
-func (r *importReader) param(pkg *types.Package) *types.Var {
+func (r *importReader) param() *types.Var {
pos := r.pos()
name := r.ident()
typ := r.typ()
- return types.NewParam(pos, pkg, name, typ)
+ return types.NewParam(pos, r.currPkg, name, typ)
}
func (r *importReader) bool() bool {
diff --git a/vendor/golang.org/x/tools/internal/stdlib/deps.go b/vendor/golang.org/x/tools/internal/stdlib/deps.go
index 581784da43..96ad6c5821 100644
--- a/vendor/golang.org/x/tools/internal/stdlib/deps.go
+++ b/vendor/golang.org/x/tools/internal/stdlib/deps.go
@@ -12,508 +12,354 @@ type pkginfo struct {
}
var deps = [...]pkginfo{
- {"archive/tar", "\x03n\x03E<\x01\n\x01$\x01\x01\x02\x05\b\x02\x01\x02\x02\f"},
- {"archive/zip", "\x02\x04d\a\x03\x12\x021<\x01+\x05\x01\x0f\x03\x02\x0e\x04"},
- {"bufio", "\x03n\x84\x01D\x14"},
- {"bytes", "q*Z\x03\fG\x02\x02"},
+ {"archive/tar", "\x03k\x03E;\x01\n\x01$\x01\x01\x02\x05\b\x02\x01\x02\x02\f"},
+ {"archive/zip", "\x02\x04a\a\x03\x12\x021;\x01+\x05\x01\x0f\x03\x02\x0e\x04"},
+ {"bufio", "\x03k\x83\x01D\x14"},
+ {"bytes", "n*Y\x03\fG\x02\x02"},
{"cmp", ""},
- {"compress/bzip2", "\x02\x02\xf1\x01A"},
- {"compress/flate", "\x02o\x03\x81\x01\f\x033\x01\x03"},
- {"compress/gzip", "\x02\x04d\a\x03\x14mT"},
- {"compress/lzw", "\x02o\x03\x81\x01"},
- {"compress/zlib", "\x02\x04d\a\x03\x12\x01n"},
- {"container/heap", "\xb7\x02"},
+ {"compress/bzip2", "\x02\x02\xed\x01A"},
+ {"compress/flate", "\x02l\x03\x80\x01\f\x033\x01\x03"},
+ {"compress/gzip", "\x02\x04a\a\x03\x14lT"},
+ {"compress/lzw", "\x02l\x03\x80\x01"},
+ {"compress/zlib", "\x02\x04a\a\x03\x12\x01m"},
+ {"container/heap", "\xb3\x02"},
{"container/list", ""},
{"container/ring", ""},
- {"context", "q[o\x01\r"},
- {"crypto", "\x86\x01oC"},
- {"crypto/aes", "\x10\n\t\x95\x02"},
- {"crypto/cipher", "\x03 \x01\x01\x1f\x11\x1c+Y"},
- {"crypto/des", "\x10\x15\x1f-+\x9c\x01\x03"},
- {"crypto/dsa", "D\x04)\x84\x01\r"},
- {"crypto/ecdh", "\x03\v\f\x10\x04\x16\x04\r\x1c\x84\x01"},
- {"crypto/ecdsa", "\x0e\x05\x03\x04\x01\x10\a\v\x06\x01\x04\f\x01\x1c\x84\x01\r\x05K\x01"},
- {"crypto/ed25519", "\x0e\x1e\x11\a\n\a\x1c\x84\x01C"},
- {"crypto/elliptic", "2?\x84\x01\r9"},
- {"crypto/fips140", "\"\x05"},
- {"crypto/hkdf", "/\x14\x01-\x15"},
- {"crypto/hmac", "\x1a\x16\x13\x01\x111"},
- {"crypto/internal/boring", "\x0e\x02\ri"},
- {"crypto/internal/boring/bbig", "\x1a\xe8\x01M"},
- {"crypto/internal/boring/bcache", "\xbc\x02\x13"},
+ {"context", "n\\m\x01\r"},
+ {"crypto", "\x83\x01nC"},
+ {"crypto/aes", "\x10\n\a\x93\x02"},
+ {"crypto/cipher", "\x03\x1e\x01\x01\x1e\x11\x1c+X"},
+ {"crypto/des", "\x10\x13\x1e-+\x9b\x01\x03"},
+ {"crypto/dsa", "A\x04)\x83\x01\r"},
+ {"crypto/ecdh", "\x03\v\f\x0e\x04\x15\x04\r\x1c\x83\x01"},
+ {"crypto/ecdsa", "\x0e\x05\x03\x04\x01\x0e\a\v\x05\x01\x04\f\x01\x1c\x83\x01\r\x05K\x01"},
+ {"crypto/ed25519", "\x0e\x1c\x11\x06\n\a\x1c\x83\x01C"},
+ {"crypto/elliptic", "0>\x83\x01\r9"},
+ {"crypto/fips140", " \x05"},
+ {"crypto/hkdf", "-\x13\x01-\x15"},
+ {"crypto/hmac", "\x1a\x14\x12\x01\x111"},
+ {"crypto/internal/boring", "\x0e\x02\rf"},
+ {"crypto/internal/boring/bbig", "\x1a\xe4\x01M"},
+ {"crypto/internal/boring/bcache", "\xb8\x02\x13"},
{"crypto/internal/boring/sig", ""},
- {"crypto/internal/constanttime", ""},
- {"crypto/internal/cryptotest", "\x03\r\n\b%\x0e\x19\x06\x12\x12 \x04\x06\t\x18\x01\x11\x11\x1b\x01\a\x05\b\x03\x05\v"},
- {"crypto/internal/entropy", "I"},
- {"crypto/internal/entropy/v1.0.0", "B/\x93\x018\x13"},
- {"crypto/internal/fips140", "A0\xbd\x01\v\x16"},
- {"crypto/internal/fips140/aes", "\x03\x1f\x03\x02\x13\x05\x01\x01\x06*\x93\x014"},
- {"crypto/internal/fips140/aes/gcm", "\"\x01\x02\x02\x02\x11\x05\x01\a*\x90\x01"},
- {"crypto/internal/fips140/alias", "\xcf\x02"},
- {"crypto/internal/fips140/bigmod", "'\x18\x01\a*\x93\x01"},
- {"crypto/internal/fips140/check", "\"\x0e\x06\t\x02\xb4\x01Z"},
- {"crypto/internal/fips140/check/checktest", "'\x87\x02!"},
- {"crypto/internal/fips140/drbg", "\x03\x1e\x01\x01\x04\x13\x05\t\x01(\x84\x01\x0f7\x01"},
- {"crypto/internal/fips140/ecdh", "\x03\x1f\x05\x02\t\r2\x84\x01\x0f7"},
- {"crypto/internal/fips140/ecdsa", "\x03\x1f\x04\x01\x02\a\x02\x069\x15oF"},
- {"crypto/internal/fips140/ed25519", "\x03\x1f\x05\x02\x04\v9\xc7\x01\x03"},
- {"crypto/internal/fips140/edwards25519", "\x1e\t\a\x112\x93\x017"},
- {"crypto/internal/fips140/edwards25519/field", "'\x13\x052\x93\x01"},
- {"crypto/internal/fips140/hkdf", "\x03\x1f\x05\t\x06;\x15"},
- {"crypto/internal/fips140/hmac", "\x03\x1f\x14\x01\x019\x15"},
- {"crypto/internal/fips140/mlkem", "\x03\x1f\x05\x02\x0e\x03\x052\xca\x01"},
- {"crypto/internal/fips140/nistec", "\x1e\t\f\f2\x93\x01*\r\x14"},
- {"crypto/internal/fips140/nistec/fiat", "'\x137\x93\x01"},
- {"crypto/internal/fips140/pbkdf2", "\x03\x1f\x05\t\x06;\x15"},
- {"crypto/internal/fips140/rsa", "\x03\x1b\x04\x04\x01\x02\r\x01\x01\x027\x15oF"},
- {"crypto/internal/fips140/sha256", "\x03\x1f\x1d\x01\a*\x15~"},
- {"crypto/internal/fips140/sha3", "\x03\x1f\x18\x05\x011\x93\x01K"},
- {"crypto/internal/fips140/sha512", "\x03\x1f\x1d\x01\a*\x15~"},
- {"crypto/internal/fips140/ssh", "'_"},
- {"crypto/internal/fips140/subtle", "\x1e\a\x1a\xc5\x01"},
- {"crypto/internal/fips140/tls12", "\x03\x1f\x05\t\x06\x029\x15"},
- {"crypto/internal/fips140/tls13", "\x03\x1f\x05\b\a\t2\x15"},
- {"crypto/internal/fips140cache", "\xae\x02\r&"},
+ {"crypto/internal/cryptotest", "\x03\r\n\x06$\x0e\x19\x06\x12\x12 \x04\a\t\x16\x01\x11\x11\x1b\x01\a\x05\b\x03\x05\v"},
+ {"crypto/internal/entropy", "F"},
+ {"crypto/internal/fips140", "?/\x15\xa7\x01\v\x16"},
+ {"crypto/internal/fips140/aes", "\x03\x1d\x03\x02\x13\x05\x01\x01\x05*\x92\x014"},
+ {"crypto/internal/fips140/aes/gcm", " \x01\x02\x02\x02\x11\x05\x01\x06*\x8f\x01"},
+ {"crypto/internal/fips140/alias", "\xcb\x02"},
+ {"crypto/internal/fips140/bigmod", "%\x18\x01\x06*\x92\x01"},
+ {"crypto/internal/fips140/check", " \x0e\x06\t\x02\xb2\x01Z"},
+ {"crypto/internal/fips140/check/checktest", "%\x85\x02!"},
+ {"crypto/internal/fips140/drbg", "\x03\x1c\x01\x01\x04\x13\x05\b\x01(\x83\x01\x0f7"},
+ {"crypto/internal/fips140/ecdh", "\x03\x1d\x05\x02\t\r1\x83\x01\x0f7"},
+ {"crypto/internal/fips140/ecdsa", "\x03\x1d\x04\x01\x02\a\x02\x068\x15nF"},
+ {"crypto/internal/fips140/ed25519", "\x03\x1d\x05\x02\x04\v8\xc6\x01\x03"},
+ {"crypto/internal/fips140/edwards25519", "%\a\f\x051\x92\x017"},
+ {"crypto/internal/fips140/edwards25519/field", "%\x13\x051\x92\x01"},
+ {"crypto/internal/fips140/hkdf", "\x03\x1d\x05\t\x06:\x15"},
+ {"crypto/internal/fips140/hmac", "\x03\x1d\x14\x01\x018\x15"},
+ {"crypto/internal/fips140/mlkem", "\x03\x1d\x05\x02\x0e\x03\x051"},
+ {"crypto/internal/fips140/nistec", "%\f\a\x051\x92\x01*\r\x14"},
+ {"crypto/internal/fips140/nistec/fiat", "%\x136\x92\x01"},
+ {"crypto/internal/fips140/pbkdf2", "\x03\x1d\x05\t\x06:\x15"},
+ {"crypto/internal/fips140/rsa", "\x03\x1d\x04\x01\x02\r\x01\x01\x026\x15nF"},
+ {"crypto/internal/fips140/sha256", "\x03\x1d\x1d\x01\x06*\x15}"},
+ {"crypto/internal/fips140/sha3", "\x03\x1d\x18\x05\x010\x92\x01K"},
+ {"crypto/internal/fips140/sha512", "\x03\x1d\x1d\x01\x06*\x15}"},
+ {"crypto/internal/fips140/ssh", "%^"},
+ {"crypto/internal/fips140/subtle", "#\x1a\xc3\x01"},
+ {"crypto/internal/fips140/tls12", "\x03\x1d\x05\t\x06\x028\x15"},
+ {"crypto/internal/fips140/tls13", "\x03\x1d\x05\b\a\t1\x15"},
+ {"crypto/internal/fips140cache", "\xaa\x02\r&"},
{"crypto/internal/fips140deps", ""},
- {"crypto/internal/fips140deps/byteorder", "\x9c\x01"},
- {"crypto/internal/fips140deps/cpu", "\xb1\x01\a"},
- {"crypto/internal/fips140deps/godebug", "\xb9\x01"},
- {"crypto/internal/fips140deps/time", "\xc9\x02"},
- {"crypto/internal/fips140hash", "7\x1c3\xc9\x01"},
- {"crypto/internal/fips140only", ")\r\x01\x01N3<"},
+ {"crypto/internal/fips140deps/byteorder", "\x99\x01"},
+ {"crypto/internal/fips140deps/cpu", "\xae\x01\a"},
+ {"crypto/internal/fips140deps/godebug", "\xb6\x01"},
+ {"crypto/internal/fips140hash", "5\x1b3\xc8\x01"},
+ {"crypto/internal/fips140only", "'\r\x01\x01M3;"},
{"crypto/internal/fips140test", ""},
- {"crypto/internal/hpke", "\x0e\x01\x01\x03\x056#+hM"},
- {"crypto/internal/impl", "\xb9\x02"},
- {"crypto/internal/randutil", "\xf5\x01\x12"},
- {"crypto/internal/sysrand", "qo! \r\r\x01\x01\f\x06"},
- {"crypto/internal/sysrand/internal/seccomp", "q"},
- {"crypto/md5", "\x0e6-\x15\x16h"},
- {"crypto/mlkem", "1"},
- {"crypto/pbkdf2", "4\x0f\x01-\x15"},
- {"crypto/rand", "\x1a\b\a\x1b\x04\x01(\x84\x01\rM"},
- {"crypto/rc4", "%\x1f-\xc7\x01"},
- {"crypto/rsa", "\x0e\f\x01\v\x0f\x0e\x01\x04\x06\a\x1c\x03\x123<\f\x01"},
- {"crypto/sha1", "\x0e\f*\x03*\x15\x16\x15S"},
- {"crypto/sha256", "\x0e\f\x1cP"},
- {"crypto/sha3", "\x0e)O\xc9\x01"},
- {"crypto/sha512", "\x0e\f\x1eN"},
- {"crypto/subtle", "\x1e\x1c\x9c\x01X"},
- {"crypto/tls", "\x03\b\x02\x01\x01\x01\x01\x02\x01\x01\x01\x02\x01\x01\t\x01\r\n\x01\n\x05\x03\x01\x01\x01\x01\x02\x01\x02\x01\x17\x02\x03\x12\x16\x15\b<\x16\x16\r\b\x01\x01\x01\x02\x01\r\x06\x02\x01\x0f"},
- {"crypto/tls/internal/fips140tls", "\x17\xa5\x02"},
- {"crypto/x509", "\x03\v\x01\x01\x01\x01\x01\x01\x01\x015\x05\x01\x01\x02\x05\x0e\x06\x02\x02\x03E\x039\x01\x02\b\x01\x01\x02\a\x10\x05\x01\x06\x02\x05\b\x02\x01\x02\x0e\x02\x01\x01\x02\x03\x01"},
- {"crypto/x509/pkix", "g\x06\a\x8e\x01G"},
- {"database/sql", "\x03\nN\x16\x03\x81\x01\v\a\"\x05\b\x02\x03\x01\r\x02\x02\x02"},
- {"database/sql/driver", "\rd\x03\xb5\x01\x0f\x11"},
- {"debug/buildinfo", "\x03[\x02\x01\x01\b\a\x03e\x1a\x02\x01+\x0f\x1f"},
- {"debug/dwarf", "\x03g\a\x03\x81\x011\x11\x01\x01"},
- {"debug/elf", "\x03\x06T\r\a\x03e\x1b\x01\f \x17\x01\x16"},
- {"debug/gosym", "\x03g\n\xc3\x01\x01\x01\x02"},
- {"debug/macho", "\x03\x06T\r\ne\x1c,\x17\x01"},
- {"debug/pe", "\x03\x06T\r\a\x03e\x1c,\x17\x01\x16"},
- {"debug/plan9obj", "j\a\x03e\x1c,"},
- {"embed", "q*A\x19\x01S"},
+ {"crypto/internal/hpke", "\x0e\x01\x01\x03\x053#+gM"},
+ {"crypto/internal/impl", "\xb5\x02"},
+ {"crypto/internal/randutil", "\xf1\x01\x12"},
+ {"crypto/internal/sysrand", "nn! \r\r\x01\x01\f\x06"},
+ {"crypto/internal/sysrand/internal/seccomp", "n"},
+ {"crypto/md5", "\x0e3-\x15\x16g"},
+ {"crypto/mlkem", "/"},
+ {"crypto/pbkdf2", "2\x0e\x01-\x15"},
+ {"crypto/rand", "\x1a\x06\a\x1a\x04\x01(\x83\x01\rM"},
+ {"crypto/rc4", "#\x1e-\xc6\x01"},
+ {"crypto/rsa", "\x0e\f\x01\t\x0f\r\x01\x04\x06\a\x1c\x03\x123;\f\x01"},
+ {"crypto/sha1", "\x0e\f'\x03*\x15\x16\x15R"},
+ {"crypto/sha256", "\x0e\f\x1aO"},
+ {"crypto/sha3", "\x0e'N\xc8\x01"},
+ {"crypto/sha512", "\x0e\f\x1cM"},
+ {"crypto/subtle", "8\x9b\x01W"},
+ {"crypto/tls", "\x03\b\x02\x01\x01\x01\x01\x02\x01\x01\x01\x02\x01\x01\a\x01\r\n\x01\t\x05\x03\x01\x01\x01\x01\x02\x01\x02\x01\x17\x02\x03\x12\x16\x15\b;\x16\x16\r\b\x01\x01\x01\x02\x01\r\x06\x02\x01\x0f"},
+ {"crypto/tls/internal/fips140tls", "\x17\xa1\x02"},
+ {"crypto/x509", "\x03\v\x01\x01\x01\x01\x01\x01\x01\x012\x05\x01\x01\x02\x05\x0e\x06\x02\x02\x03E\x038\x01\x02\b\x01\x01\x02\a\x10\x05\x01\x06\x02\x05\n\x01\x02\x0e\x02\x01\x01\x02\x03\x01"},
+ {"crypto/x509/pkix", "d\x06\a\x8d\x01G"},
+ {"database/sql", "\x03\nK\x16\x03\x80\x01\v\a\"\x05\b\x02\x03\x01\r\x02\x02\x02"},
+ {"database/sql/driver", "\ra\x03\xb4\x01\x0f\x11"},
+ {"debug/buildinfo", "\x03X\x02\x01\x01\b\a\x03e\x19\x02\x01+\x0f\x1f"},
+ {"debug/dwarf", "\x03d\a\x03\x80\x011\x11\x01\x01"},
+ {"debug/elf", "\x03\x06Q\r\a\x03e\x1a\x01,\x17\x01\x16"},
+ {"debug/gosym", "\x03d\n\xc2\x01\x01\x01\x02"},
+ {"debug/macho", "\x03\x06Q\r\ne\x1b,\x17\x01"},
+ {"debug/pe", "\x03\x06Q\r\a\x03e\x1b,\x17\x01\x16"},
+ {"debug/plan9obj", "g\a\x03e\x1b,"},
+ {"embed", "n*@\x19\x01S"},
{"embed/internal/embedtest", ""},
{"encoding", ""},
- {"encoding/ascii85", "\xf5\x01C"},
- {"encoding/asn1", "\x03n\x03e(\x01'\r\x02\x01\x10\x03\x01"},
- {"encoding/base32", "\xf5\x01A\x02"},
- {"encoding/base64", "\x9c\x01YA\x02"},
- {"encoding/binary", "q\x84\x01\f(\r\x05"},
- {"encoding/csv", "\x02\x01n\x03\x81\x01D\x12\x02"},
- {"encoding/gob", "\x02c\x05\a\x03e\x1c\v\x01\x03\x1d\b\x12\x01\x0f\x02"},
- {"encoding/hex", "q\x03\x81\x01A\x03"},
- {"encoding/json", "\x03\x01a\x04\b\x03\x81\x01\f(\r\x02\x01\x02\x10\x01\x01\x02"},
- {"encoding/pem", "\x03f\b\x84\x01A\x03"},
- {"encoding/xml", "\x02\x01b\f\x03\x81\x014\x05\n\x01\x02\x10\x02"},
- {"errors", "\xcc\x01\x83\x01"},
- {"expvar", "nK@\b\v\x15\r\b\x02\x03\x01\x11"},
- {"flag", "e\f\x03\x81\x01,\b\x05\b\x02\x01\x10"},
- {"fmt", "qE&\x19\f \b\r\x02\x03\x12"},
- {"go/ast", "\x03\x01p\x0e\x01r\x03)\b\r\x02\x01\x12\x02"},
- {"go/build", "\x02\x01n\x03\x01\x02\x02\a\x02\x01\x17\x1f\x04\x02\b\x1b\x13\x01+\x01\x04\x01\a\b\x02\x01\x12\x02\x02"},
- {"go/build/constraint", "q\xc7\x01\x01\x12\x02"},
- {"go/constant", "t\x0f~\x01\x024\x01\x02\x12"},
- {"go/doc", "\x04p\x01\x05\t=51\x10\x02\x01\x12\x02"},
- {"go/doc/comment", "\x03q\xc2\x01\x01\x01\x01\x12\x02"},
- {"go/format", "\x03q\x01\v\x01\x02rD"},
- {"go/importer", "v\a\x01\x01\x04\x01q9"},
- {"go/internal/gccgoimporter", "\x02\x01[\x13\x03\x04\v\x01o\x02,\x01\x05\x11\x01\f\b"},
- {"go/internal/gcimporter", "\x02r\x0f\x010\x05\r/,\x15\x03\x02"},
- {"go/internal/srcimporter", "t\x01\x01\n\x03\x01q,\x01\x05\x12\x02\x14"},
- {"go/parser", "\x03n\x03\x01\x02\v\x01r\x01+\x06\x12"},
- {"go/printer", "t\x01\x02\x03\tr\f \x15\x02\x01\x02\v\x05\x02"},
- {"go/scanner", "\x03q\x0fr2\x10\x01\x13\x02"},
- {"go/token", "\x04p\x84\x01>\x02\x03\x01\x0f\x02"},
- {"go/types", "\x03\x01\x06g\x03\x01\x03\b\x03\x024\x062\x04\x03\t \x06\a\b\x01\x01\x01\x02\x01\x0f\x02\x02"},
- {"go/version", "\xbe\x01{"},
- {"hash", "\xf5\x01"},
- {"hash/adler32", "q\x15\x16"},
- {"hash/crc32", "q\x15\x16\x15\x8a\x01\x01\x13"},
- {"hash/crc64", "q\x15\x16\x9f\x01"},
- {"hash/fnv", "q\x15\x16h"},
- {"hash/maphash", "\x86\x01\x11<|"},
- {"html", "\xb9\x02\x02\x12"},
- {"html/template", "\x03k\x06\x18-<\x01\n!\x05\x01\x02\x03\f\x01\x02\f\x01\x03\x02"},
- {"image", "\x02o\x1ef\x0f4\x03\x01"},
+ {"encoding/ascii85", "\xf1\x01C"},
+ {"encoding/asn1", "\x03k\x03\x8c\x01\x01'\r\x02\x01\x10\x03\x01"},
+ {"encoding/base32", "\xf1\x01A\x02"},
+ {"encoding/base64", "\x99\x01XA\x02"},
+ {"encoding/binary", "n\x83\x01\f(\r\x05"},
+ {"encoding/csv", "\x02\x01k\x03\x80\x01D\x12\x02"},
+ {"encoding/gob", "\x02`\x05\a\x03e\x1b\v\x01\x03\x1d\b\x12\x01\x0f\x02"},
+ {"encoding/hex", "n\x03\x80\x01A\x03"},
+ {"encoding/json", "\x03\x01^\x04\b\x03\x80\x01\f(\r\x02\x01\x02\x10\x01\x01\x02"},
+ {"encoding/pem", "\x03c\b\x83\x01A\x03"},
+ {"encoding/xml", "\x02\x01_\f\x03\x80\x014\x05\n\x01\x02\x10\x02"},
+ {"errors", "\xca\x01\x81\x01"},
+ {"expvar", "kK?\b\v\x15\r\b\x02\x03\x01\x11"},
+ {"flag", "b\f\x03\x80\x01,\b\x05\b\x02\x01\x10"},
+ {"fmt", "nE>\f \b\r\x02\x03\x12"},
+ {"go/ast", "\x03\x01m\x0e\x01q\x03)\b\r\x02\x01"},
+ {"go/build", "\x02\x01k\x03\x01\x02\x02\a\x02\x01\x17\x1f\x04\x02\t\x19\x13\x01+\x01\x04\x01\a\b\x02\x01\x12\x02\x02"},
+ {"go/build/constraint", "n\xc6\x01\x01\x12\x02"},
+ {"go/constant", "q\x0f}\x01\x024\x01\x02\x12"},
+ {"go/doc", "\x04m\x01\x05\t>31\x10\x02\x01\x12\x02"},
+ {"go/doc/comment", "\x03n\xc1\x01\x01\x01\x01\x12\x02"},
+ {"go/format", "\x03n\x01\v\x01\x02qD"},
+ {"go/importer", "s\a\x01\x01\x04\x01p9"},
+ {"go/internal/gccgoimporter", "\x02\x01X\x13\x03\x04\v\x01n\x02,\x01\x05\x11\x01\f\b"},
+ {"go/internal/gcimporter", "\x02o\x0f\x010\x05\x0e-,\x15\x03\x02"},
+ {"go/internal/srcimporter", "q\x01\x01\n\x03\x01p,\x01\x05\x12\x02\x14"},
+ {"go/parser", "\x03k\x03\x01\x02\v\x01q\x01+\x06\x12"},
+ {"go/printer", "q\x01\x02\x03\tq\f \x15\x02\x01\x02\v\x05\x02"},
+ {"go/scanner", "\x03n\x0fq2\x10\x01\x13\x02"},
+ {"go/token", "\x04m\x83\x01>\x02\x03\x01\x0f\x02"},
+ {"go/types", "\x03\x01\x06d\x03\x01\x03\b\x03\x02\x15\x1f\x061\x04\x03\t \x06\a\b\x01\x01\x01\x02\x01\x0f\x02\x02"},
+ {"go/version", "\xbb\x01z"},
+ {"hash", "\xf1\x01"},
+ {"hash/adler32", "n\x15\x16"},
+ {"hash/crc32", "n\x15\x16\x15\x89\x01\x01\x13"},
+ {"hash/crc64", "n\x15\x16\x9e\x01"},
+ {"hash/fnv", "n\x15\x16g"},
+ {"hash/maphash", "\x83\x01\x11!\x03\x93\x01"},
+ {"html", "\xb5\x02\x02\x12"},
+ {"html/template", "\x03h\x06\x18-;\x01\n!\x05\x01\x02\x03\f\x01\x02\f\x01\x03\x02"},
+ {"image", "\x02l\x1ee\x0f4\x03\x01"},
{"image/color", ""},
- {"image/color/palette", "\x8f\x01"},
- {"image/draw", "\x8e\x01\x01\x04"},
- {"image/gif", "\x02\x01\x05i\x03\x1a\x01\x01\x01\vY"},
- {"image/internal/imageutil", "\x8e\x01"},
- {"image/jpeg", "\x02o\x1d\x01\x04b"},
- {"image/png", "\x02\aa\n\x12\x02\x06\x01fC"},
- {"index/suffixarray", "\x03g\a\x84\x01\f+\n\x01"},
- {"internal/abi", "\xb8\x01\x97\x01"},
- {"internal/asan", "\xcf\x02"},
- {"internal/bisect", "\xae\x02\r\x01"},
- {"internal/buildcfg", "tGf\x06\x02\x05\n\x01"},
- {"internal/bytealg", "\xb1\x01\x9e\x01"},
+ {"image/color/palette", "\x8c\x01"},
+ {"image/draw", "\x8b\x01\x01\x04"},
+ {"image/gif", "\x02\x01\x05f\x03\x1a\x01\x01\x01\vX"},
+ {"image/internal/imageutil", "\x8b\x01"},
+ {"image/jpeg", "\x02l\x1d\x01\x04a"},
+ {"image/png", "\x02\a^\n\x12\x02\x06\x01eC"},
+ {"index/suffixarray", "\x03d\a\x83\x01\f+\n\x01"},
+ {"internal/abi", "\xb5\x01\x96\x01"},
+ {"internal/asan", "\xcb\x02"},
+ {"internal/bisect", "\xaa\x02\r\x01"},
+ {"internal/buildcfg", "qGe\x06\x02\x05\n\x01"},
+ {"internal/bytealg", "\xae\x01\x9d\x01"},
{"internal/byteorder", ""},
{"internal/cfg", ""},
- {"internal/cgrouptest", "tZS\x06\x0f\x02\x01\x04\x01"},
- {"internal/chacha8rand", "\x9c\x01\x15\a\x97\x01"},
+ {"internal/cgrouptest", "q[Q\x06\x0f\x02\x01\x04\x01"},
+ {"internal/chacha8rand", "\x99\x01\x15\a\x96\x01"},
{"internal/copyright", ""},
{"internal/coverage", ""},
{"internal/coverage/calloc", ""},
- {"internal/coverage/cfile", "n\x06\x16\x17\x01\x02\x01\x01\x01\x01\x01\x01\x01\"\x02&,\x06\a\n\x01\x03\r\x06"},
- {"internal/coverage/cformat", "\x04p-\x04P\v6\x01\x02\r"},
- {"internal/coverage/cmerge", "t-`"},
- {"internal/coverage/decodecounter", "j\n-\v\x02G,\x17\x17"},
- {"internal/coverage/decodemeta", "\x02h\n\x16\x17\v\x02G,"},
- {"internal/coverage/encodecounter", "\x02h\n-\f\x01\x02E\v!\x15"},
- {"internal/coverage/encodemeta", "\x02\x01g\n\x12\x04\x17\r\x02E,."},
- {"internal/coverage/pods", "\x04p-\x80\x01\x06\x05\n\x02\x01"},
- {"internal/coverage/rtcov", "\xcf\x02"},
- {"internal/coverage/slicereader", "j\n\x81\x01Z"},
- {"internal/coverage/slicewriter", "t\x81\x01"},
- {"internal/coverage/stringtab", "t8\x04E"},
+ {"internal/coverage/cfile", "k\x06\x16\x17\x01\x02\x01\x01\x01\x01\x01\x01\x01#\x02$,\x06\a\n\x01\x03\r\x06"},
+ {"internal/coverage/cformat", "\x04m-\x04O\v6\x01\x02\r"},
+ {"internal/coverage/cmerge", "q-_"},
+ {"internal/coverage/decodecounter", "g\n-\v\x02F,\x17\x17"},
+ {"internal/coverage/decodemeta", "\x02e\n\x16\x17\v\x02F,"},
+ {"internal/coverage/encodecounter", "\x02e\n-\f\x01\x02D\v!\x15"},
+ {"internal/coverage/encodemeta", "\x02\x01d\n\x12\x04\x17\r\x02D,."},
+ {"internal/coverage/pods", "\x04m-\x7f\x06\x05\n\x02\x01"},
+ {"internal/coverage/rtcov", "\xcb\x02"},
+ {"internal/coverage/slicereader", "g\n\x80\x01Z"},
+ {"internal/coverage/slicewriter", "q\x80\x01"},
+ {"internal/coverage/stringtab", "q8\x04D"},
{"internal/coverage/test", ""},
{"internal/coverage/uleb128", ""},
- {"internal/cpu", "\xcf\x02"},
- {"internal/dag", "\x04p\xc2\x01\x03"},
- {"internal/diff", "\x03q\xc3\x01\x02"},
- {"internal/exportdata", "\x02\x01n\x03\x02c\x1c,\x01\x05\x11\x01\x02"},
- {"internal/filepathlite", "q*A\x1a@"},
- {"internal/fmtsort", "\x04\xa5\x02\r"},
- {"internal/fuzz", "\x03\nE\x18\x04\x03\x03\x01\v\x036<\f\x03\x1d\x01\x05\x02\x05\n\x01\x02\x01\x01\f\x04\x02"},
+ {"internal/cpu", "\xcb\x02"},
+ {"internal/dag", "\x04m\xc1\x01\x03"},
+ {"internal/diff", "\x03n\xc2\x01\x02"},
+ {"internal/exportdata", "\x02\x01k\x03\x02c\x1b,\x01\x05\x11\x01\x02"},
+ {"internal/filepathlite", "n*@\x1a@"},
+ {"internal/fmtsort", "\x04\xa1\x02\r"},
+ {"internal/fuzz", "\x03\nB\x18\x04\x03\x03\x01\v\x036;\f\x03\x1d\x01\x05\x02\x05\n\x01\x02\x01\x01\f\x04\x02"},
{"internal/goarch", ""},
- {"internal/godebug", "\x99\x01!\x81\x01\x01\x13"},
+ {"internal/godebug", "\x96\x01!\x80\x01\x01\x13"},
{"internal/godebugs", ""},
{"internal/goexperiment", ""},
{"internal/goos", ""},
- {"internal/goroot", "\xa1\x02\x01\x05\x12\x02"},
+ {"internal/goroot", "\x9d\x02\x01\x05\x12\x02"},
{"internal/gover", "\x04"},
{"internal/goversion", ""},
- {"internal/lazyregexp", "\xa1\x02\v\r\x02"},
- {"internal/lazytemplate", "\xf5\x01,\x18\x02\f"},
- {"internal/msan", "\xcf\x02"},
+ {"internal/itoa", ""},
+ {"internal/lazyregexp", "\x9d\x02\v\r\x02"},
+ {"internal/lazytemplate", "\xf1\x01,\x18\x02\f"},
+ {"internal/msan", "\xcb\x02"},
{"internal/nettrace", ""},
- {"internal/obscuretestdata", "i\x8c\x01,"},
- {"internal/oserror", "q"},
- {"internal/pkgbits", "\x03O\x18\a\x03\x04\vr\r\x1f\r\n\x01"},
+ {"internal/obscuretestdata", "f\x8b\x01,"},
+ {"internal/oserror", "n"},
+ {"internal/pkgbits", "\x03L\x18\a\x03\x04\vq\r\x1f\r\n\x01"},
{"internal/platform", ""},
- {"internal/poll", "qj\x05\x159\r\x01\x01\f\x06"},
- {"internal/profile", "\x03\x04j\x03\x81\x017\n\x01\x01\x01\x10"},
+ {"internal/poll", "nO\x1f\x159\r\x01\x01\f\x06"},
+ {"internal/profile", "\x03\x04g\x03\x80\x017\v\x01\x01\x10"},
{"internal/profilerecord", ""},
- {"internal/race", "\x97\x01\xb8\x01"},
- {"internal/reflectlite", "\x97\x01!:\b\x13\x01\a\x03E;\x01\x03\a\x01\x03\x02\x02\x01\x02\x06\x02\x01\x01\n\x01\x01\x05\x01\x02\x05\b\x01\x01\x01\x02\x01\r\x02\x02\x02\b\x01\x01\x01"},
+ {"net/http/cgi", "\x02Q\x1b\x03\x80\x01\x04\a\v\x01\x13\x01\x01\x01\x04\x01\x05\x02\b\x02\x01\x10\x0e"},
+ {"net/http/cookiejar", "\x04j\x03\x96\x01\x01\b\f\x16\x03\x02\x0e\x04"},
+ {"net/http/fcgi", "\x02\x01\nZ\a\x03\x80\x01\x16\x01\x01\x14\x18\x02\x0e"},
+ {"net/http/httptest", "\x02\x01\nF\x02\x1b\x01\x80\x01\x04\x12\x01\n\t\x02\x17\x01\x02\x0e\x0e"},
+ {"net/http/httptrace", "\rFnF\x14\n "},
+ {"net/http/httputil", "\x02\x01\na\x03\x80\x01\x04\x0f\x03\x01\x05\x02\x01\v\x01\x19\x02\x0e\x0e"},
+ {"net/http/internal", "\x02\x01k\x03\x80\x01"},
+ {"net/http/internal/ascii", "\xb5\x02\x12"},
+ {"net/http/internal/httpcommon", "\ra\x03\x9c\x01\x0e\x01\x17\x01\x01\x02\x1c\x02"},
+ {"net/http/internal/testcert", "\xb5\x02"},
+ {"net/http/pprof", "\x02\x01\nd\x18-\x11*\x04\x13\x14\x01\r\x04\x03\x01\x02\x01\x10"},
{"net/internal/cgotest", ""},
- {"net/internal/socktest", "t\xc7\x01\x02"},
- {"net/mail", "\x02o\x03\x81\x01\x04\x0f\x03\x14\x1a\x02\x0e\x04"},
- {"net/netip", "\x04m*\x01e\x034\x16"},
- {"net/rpc", "\x02j\x05\x03\x0f\nh\x04\x12\x01\x1d\r\x03\x02"},
- {"net/rpc/jsonrpc", "n\x03\x03\x81\x01\x16\x11\x1f"},
- {"net/smtp", "\x192\v\x13\b\x03\x81\x01\x16\x14\x1a"},
- {"net/textproto", "\x02\x01n\x03\x81\x01\f\n-\x01\x02\x14"},
- {"net/url", "q\x03\xa7\x01\v\x10\x02\x01\x16"},
- {"os", "q*\x01\x19\x03\x10\x13\x01\x03\x01\x05\x10\x018\b\x05\x01\x01\f\x06"},
- {"os/exec", "\x03\ndH&\x01\x15\x01+\x06\a\n\x01\x04\f"},
- {"os/exec/internal/fdtest", "\xbd\x02"},
- {"os/signal", "\r\x94\x02\x15\x05\x02"},
- {"os/user", "\x02\x01n\x03\x81\x01,\r\n\x01\x02"},
- {"path", "q*\xb2\x01"},
- {"path/filepath", "q*\x1aA+\r\b\x03\x04\x10"},
- {"plugin", "q"},
- {"reflect", "q&\x04\x1d\x13\b\x03\x05\x17\x06\t-\n\x03\x10\x02\x02"},
+ {"net/internal/socktest", "q\xc6\x01\x02"},
+ {"net/mail", "\x02l\x03\x80\x01\x04\x0f\x03\x14\x1a\x02\x0e\x04"},
+ {"net/netip", "\x04j*\x01$@\x034\x16"},
+ {"net/rpc", "\x02g\x05\x03\x0f\ng\x04\x12\x01\x1d\r\x03\x02"},
+ {"net/rpc/jsonrpc", "k\x03\x03\x80\x01\x16\x11\x1f"},
+ {"net/smtp", "\x19/\v\x13\b\x03\x80\x01\x16\x14\x1a"},
+ {"net/textproto", "\x02\x01k\x03\x80\x01\f\n-\x01\x02\x14"},
+ {"net/url", "n\x03\x8b\x01&\x10\x02\x01\x16"},
+ {"os", "n*\x01\x19\x03\b\t\x12\x03\x01\x05\x10\x018\b\x05\x01\x01\f\x06"},
+ {"os/exec", "\x03\naH%\x01\x15\x01+\x06\a\n\x01\x04\f"},
+ {"os/exec/internal/fdtest", "\xb9\x02"},
+ {"os/signal", "\r\x90\x02\x15\x05\x02"},
+ {"os/user", "\x02\x01k\x03\x80\x01,\r\n\x01\x02"},
+ {"path", "n*\xb1\x01"},
+ {"path/filepath", "n*\x1a@+\r\b\x03\x04\x10"},
+ {"plugin", "n"},
+ {"reflect", "n&\x04\x1d\b\f\x06\x04\x1b\x06\t-\n\x03\x10\x02\x02"},
{"reflect/internal/example1", ""},
{"reflect/internal/example2", ""},
- {"regexp", "\x03\xf2\x018\t\x02\x01\x02\x10\x02"},
- {"regexp/syntax", "\xb6\x02\x01\x01\x01\x02\x10\x02"},
- {"runtime", "\x97\x01\x04\x01\x03\f\x06\a\x02\x01\x01\x0e\x03\x01\x01\x01\x02\x01\x01\x02\x01\x04\x01\x10c"},
- {"runtime/coverage", "\xa3\x01R"},
- {"runtime/debug", "tTY\r\b\x02\x01\x10\x06"},
- {"runtime/metrics", "\xba\x01G-!"},
- {"runtime/pprof", "\x02\x01\x01\x03\x06]\a\x03#$\x0f+\f \r\b\x01\x01\x01\x02\x02\t\x03\x06"},
- {"runtime/race", "\xb4\x02"},
+ {"regexp", "\x03\xee\x018\t\x02\x01\x02\x10\x02"},
+ {"regexp/syntax", "\xb2\x02\x01\x01\x01\x02\x10\x02"},
+ {"runtime", "\x94\x01\x04\x01\x03\f\x06\a\x02\x01\x01\x0f\x03\x01\x01\x01\x01\x01\x02\x01\x01\x04\x10c"},
+ {"runtime/coverage", "\xa0\x01Q"},
+ {"runtime/debug", "qUW\r\b\x02\x01\x10\x06"},
+ {"runtime/metrics", "\xb7\x01F-!"},
+ {"runtime/pprof", "\x02\x01\x01\x03\x06Z\a\x03#4)\f \r\b\x01\x01\x01\x02\x02\t\x03\x06"},
+ {"runtime/race", "\xb0\x02"},
{"runtime/race/internal/amd64v1", ""},
- {"runtime/trace", "\rd\x03x\t9\b\x05\x01\r\x06"},
- {"slices", "\x04\xf4\x01\fK"},
- {"sort", "\xcc\x0182"},
- {"strconv", "q*@\x01q"},
- {"strings", "q&\x04A\x19\x03\f7\x10\x02\x02"},
+ {"runtime/trace", "\ra\x03w\t9\b\x05\x01\r\x06"},
+ {"slices", "\x04\xf0\x01\fK"},
+ {"sort", "\xca\x0162"},
+ {"strconv", "n*@%\x03I"},
+ {"strings", "n&\x04@\x19\x03\f7\x10\x02\x02"},
{"structs", ""},
- {"sync", "\xcb\x01\x12\x01P\x0e\x13"},
- {"sync/atomic", "\xcf\x02"},
- {"syscall", "q'\x03\x01\x1c\n\x03\x06\f\x04S\b\x05\x01\x13"},
- {"testing", "\x03\nd\x02\x01W\x16\x14\f\x05\x1b\x06\x02\x05\x02\x05\x01\x02\x01\x02\x01\r\x02\x04"},
- {"testing/fstest", "q\x03\x81\x01\x01\n&\x10\x03\b\b"},
- {"testing/internal/testdeps", "\x02\v\xaa\x01.\x10,\x03\x05\x03\x06\a\x02\x0e"},
- {"testing/iotest", "\x03n\x03\x81\x01\x04"},
- {"testing/quick", "s\x01\x8d\x01\x05#\x10\x10"},
- {"testing/slogtest", "\rd\x03\x87\x01.\x05\x10\v"},
- {"testing/synctest", "\xde\x01`\x11"},
- {"text/scanner", "\x03q\x81\x01,*\x02"},
- {"text/tabwriter", "t\x81\x01X"},
- {"text/template", "q\x03B?\x01\n \x01\x05\x01\x02\x05\v\x02\r\x03\x02"},
- {"text/template/parse", "\x03q\xba\x01\n\x01\x12\x02"},
- {"time", "q*\x1e#(*\r\x02\x12"},
- {"time/tzdata", "q\xcc\x01\x12"},
+ {"sync", "\xc9\x01\x10\x01P\x0e\x13"},
+ {"sync/atomic", "\xcb\x02"},
+ {"syscall", "n'\x03\x01\x1c\b\x03\x03\x06\vV\b\x05\x01\x13"},
+ {"testing", "\x03\na\x02\x01X\x14\x14\f\x05\x1b\x06\x02\x05\x02\x05\x01\x02\x01\x02\x01\r\x02\x02\x02"},
+ {"testing/fstest", "n\x03\x80\x01\x01\n&\x10\x03\b\b"},
+ {"testing/internal/testdeps", "\x02\v\xa7\x01-\x10,\x03\x05\x03\x06\a\x02\x0e"},
+ {"testing/iotest", "\x03k\x03\x80\x01\x04"},
+ {"testing/quick", "p\x01\x8c\x01\x05#\x10\x10"},
+ {"testing/slogtest", "\ra\x03\x86\x01.\x05\x10\v"},
+ {"testing/synctest", "\xda\x01`\x11"},
+ {"text/scanner", "\x03n\x80\x01,*\x02"},
+ {"text/tabwriter", "q\x80\x01X"},
+ {"text/template", "n\x03B>\x01\n \x01\x05\x01\x02\x05\v\x02\r\x03\x02"},
+ {"text/template/parse", "\x03n\xb9\x01\n\x01\x12\x02"},
+ {"time", "n*\x1e\"(*\r\x02\x12"},
+ {"time/tzdata", "n\xcb\x01\x12"},
{"unicode", ""},
{"unicode/utf16", ""},
{"unicode/utf8", ""},
- {"unique", "\x97\x01!$\x01Q\r\x01\x13\x12"},
+ {"unique", "\x94\x01!#\x01Q\r\x01\x13\x12"},
{"unsafe", ""},
- {"vendor/golang.org/x/crypto/chacha20", "\x10Z\a\x93\x01*&"},
- {"vendor/golang.org/x/crypto/chacha20poly1305", "\x10Z\a\xdf\x01\x04\x01\a"},
- {"vendor/golang.org/x/crypto/cryptobyte", "g\n\x03\x8e\x01' \n"},
+ {"vendor/golang.org/x/crypto/chacha20", "\x10W\a\x92\x01*&"},
+ {"vendor/golang.org/x/crypto/chacha20poly1305", "\x10W\a\xde\x01\x04\x01\a"},
+ {"vendor/golang.org/x/crypto/cryptobyte", "d\n\x03\x8d\x01' \n"},
{"vendor/golang.org/x/crypto/cryptobyte/asn1", ""},
- {"vendor/golang.org/x/crypto/internal/alias", "\xcf\x02"},
- {"vendor/golang.org/x/crypto/internal/poly1305", "U\x15\x9a\x01"},
- {"vendor/golang.org/x/net/dns/dnsmessage", "q"},
- {"vendor/golang.org/x/net/http/httpguts", "\x8b\x02\x14\x1a\x14\r"},
- {"vendor/golang.org/x/net/http/httpproxy", "q\x03\x97\x01\x10\x05\x01\x18\x14\r"},
- {"vendor/golang.org/x/net/http2/hpack", "\x03n\x03\x81\x01F"},
- {"vendor/golang.org/x/net/idna", "t\x8d\x018\x14\x10\x02\x01"},
- {"vendor/golang.org/x/net/nettest", "\x03g\a\x03\x81\x01\x11\x05\x16\x01\f\n\x01\x02\x02\x01\v"},
- {"vendor/golang.org/x/sys/cpu", "\xa1\x02\r\n\x01\x16"},
- {"vendor/golang.org/x/text/secure/bidirule", "q\xdc\x01\x11\x01"},
- {"vendor/golang.org/x/text/transform", "\x03n\x84\x01X"},
- {"vendor/golang.org/x/text/unicode/bidi", "\x03\bi\x85\x01>\x16"},
- {"vendor/golang.org/x/text/unicode/norm", "j\n\x81\x01F\x12\x11"},
- {"weak", "\x97\x01\x97\x01!"},
+ {"vendor/golang.org/x/crypto/internal/alias", "\xcb\x02"},
+ {"vendor/golang.org/x/crypto/internal/poly1305", "R\x15\x99\x01"},
+ {"vendor/golang.org/x/net/dns/dnsmessage", "n"},
+ {"vendor/golang.org/x/net/http/httpguts", "\x87\x02\x14\x1a\x14\r"},
+ {"vendor/golang.org/x/net/http/httpproxy", "n\x03\x96\x01\x10\x05\x01\x18\x14\r"},
+ {"vendor/golang.org/x/net/http2/hpack", "\x03k\x03\x80\x01F"},
+ {"vendor/golang.org/x/net/idna", "q\x8c\x018\x14\x10\x02\x01"},
+ {"vendor/golang.org/x/net/nettest", "\x03d\a\x03\x80\x01\x11\x05\x16\x01\f\n\x01\x02\x02\x01\v"},
+ {"vendor/golang.org/x/sys/cpu", "\x9d\x02\r\n\x01\x16"},
+ {"vendor/golang.org/x/text/secure/bidirule", "n\xdb\x01\x11\x01"},
+ {"vendor/golang.org/x/text/transform", "\x03k\x83\x01X"},
+ {"vendor/golang.org/x/text/unicode/bidi", "\x03\bf\x84\x01>\x16"},
+ {"vendor/golang.org/x/text/unicode/norm", "g\n\x80\x01F\x12\x11"},
+ {"weak", "\x94\x01\x96\x01!"},
}
-
-// bootstrap is the list of bootstrap packages extracted from cmd/dist.
-var bootstrap = map[string]bool{
- "cmp": true,
- "cmd/asm": true,
- "cmd/asm/internal/arch": true,
- "cmd/asm/internal/asm": true,
- "cmd/asm/internal/flags": true,
- "cmd/asm/internal/lex": true,
- "cmd/cgo": true,
- "cmd/compile": true,
- "cmd/compile/internal/abi": true,
- "cmd/compile/internal/abt": true,
- "cmd/compile/internal/amd64": true,
- "cmd/compile/internal/arm": true,
- "cmd/compile/internal/arm64": true,
- "cmd/compile/internal/base": true,
- "cmd/compile/internal/bitvec": true,
- "cmd/compile/internal/compare": true,
- "cmd/compile/internal/coverage": true,
- "cmd/compile/internal/deadlocals": true,
- "cmd/compile/internal/devirtualize": true,
- "cmd/compile/internal/dwarfgen": true,
- "cmd/compile/internal/escape": true,
- "cmd/compile/internal/gc": true,
- "cmd/compile/internal/importer": true,
- "cmd/compile/internal/inline": true,
- "cmd/compile/internal/inline/inlheur": true,
- "cmd/compile/internal/inline/interleaved": true,
- "cmd/compile/internal/ir": true,
- "cmd/compile/internal/liveness": true,
- "cmd/compile/internal/logopt": true,
- "cmd/compile/internal/loong64": true,
- "cmd/compile/internal/loopvar": true,
- "cmd/compile/internal/mips": true,
- "cmd/compile/internal/mips64": true,
- "cmd/compile/internal/noder": true,
- "cmd/compile/internal/objw": true,
- "cmd/compile/internal/pgoir": true,
- "cmd/compile/internal/pkginit": true,
- "cmd/compile/internal/ppc64": true,
- "cmd/compile/internal/rangefunc": true,
- "cmd/compile/internal/reflectdata": true,
- "cmd/compile/internal/riscv64": true,
- "cmd/compile/internal/rttype": true,
- "cmd/compile/internal/s390x": true,
- "cmd/compile/internal/ssa": true,
- "cmd/compile/internal/ssagen": true,
- "cmd/compile/internal/staticdata": true,
- "cmd/compile/internal/staticinit": true,
- "cmd/compile/internal/syntax": true,
- "cmd/compile/internal/test": true,
- "cmd/compile/internal/typebits": true,
- "cmd/compile/internal/typecheck": true,
- "cmd/compile/internal/types": true,
- "cmd/compile/internal/types2": true,
- "cmd/compile/internal/walk": true,
- "cmd/compile/internal/wasm": true,
- "cmd/compile/internal/x86": true,
- "cmd/internal/archive": true,
- "cmd/internal/bio": true,
- "cmd/internal/codesign": true,
- "cmd/internal/dwarf": true,
- "cmd/internal/edit": true,
- "cmd/internal/gcprog": true,
- "cmd/internal/goobj": true,
- "cmd/internal/hash": true,
- "cmd/internal/macho": true,
- "cmd/internal/obj": true,
- "cmd/internal/obj/arm": true,
- "cmd/internal/obj/arm64": true,
- "cmd/internal/obj/loong64": true,
- "cmd/internal/obj/mips": true,
- "cmd/internal/obj/ppc64": true,
- "cmd/internal/obj/riscv": true,
- "cmd/internal/obj/s390x": true,
- "cmd/internal/obj/wasm": true,
- "cmd/internal/obj/x86": true,
- "cmd/internal/objabi": true,
- "cmd/internal/par": true,
- "cmd/internal/pgo": true,
- "cmd/internal/pkgpath": true,
- "cmd/internal/quoted": true,
- "cmd/internal/src": true,
- "cmd/internal/sys": true,
- "cmd/internal/telemetry": true,
- "cmd/internal/telemetry/counter": true,
- "cmd/link": true,
- "cmd/link/internal/amd64": true,
- "cmd/link/internal/arm": true,
- "cmd/link/internal/arm64": true,
- "cmd/link/internal/benchmark": true,
- "cmd/link/internal/dwtest": true,
- "cmd/link/internal/ld": true,
- "cmd/link/internal/loadelf": true,
- "cmd/link/internal/loader": true,
- "cmd/link/internal/loadmacho": true,
- "cmd/link/internal/loadpe": true,
- "cmd/link/internal/loadxcoff": true,
- "cmd/link/internal/loong64": true,
- "cmd/link/internal/mips": true,
- "cmd/link/internal/mips64": true,
- "cmd/link/internal/ppc64": true,
- "cmd/link/internal/riscv64": true,
- "cmd/link/internal/s390x": true,
- "cmd/link/internal/sym": true,
- "cmd/link/internal/wasm": true,
- "cmd/link/internal/x86": true,
- "compress/flate": true,
- "compress/zlib": true,
- "container/heap": true,
- "debug/dwarf": true,
- "debug/elf": true,
- "debug/macho": true,
- "debug/pe": true,
- "go/build/constraint": true,
- "go/constant": true,
- "go/version": true,
- "internal/abi": true,
- "internal/coverage": true,
- "cmd/internal/cov/covcmd": true,
- "internal/bisect": true,
- "internal/buildcfg": true,
- "internal/exportdata": true,
- "internal/goarch": true,
- "internal/godebugs": true,
- "internal/goexperiment": true,
- "internal/goroot": true,
- "internal/gover": true,
- "internal/goversion": true,
- "internal/lazyregexp": true,
- "internal/pkgbits": true,
- "internal/platform": true,
- "internal/profile": true,
- "internal/race": true,
- "internal/runtime/gc": true,
- "internal/saferio": true,
- "internal/syscall/unix": true,
- "internal/types/errors": true,
- "internal/unsafeheader": true,
- "internal/xcoff": true,
- "internal/zstd": true,
- "math/bits": true,
- "sort": true,
-}
-
-// BootstrapVersion is the minor version of Go used during toolchain
-// bootstrapping. Packages for which [IsBootstrapPackage] must not use
-// features of Go newer than this version.
-const BootstrapVersion = Version(24) // go1.24.6
diff --git a/vendor/golang.org/x/tools/internal/stdlib/import.go b/vendor/golang.org/x/tools/internal/stdlib/import.go
index 8ecc672b8b..f6909878a8 100644
--- a/vendor/golang.org/x/tools/internal/stdlib/import.go
+++ b/vendor/golang.org/x/tools/internal/stdlib/import.go
@@ -87,11 +87,3 @@ func find(pkg string) (int, bool) {
return strings.Compare(p.name, n)
})
}
-
-// IsBootstrapPackage reports whether pkg is one of the low-level
-// packages in the Go distribution that must compile with the older
-// language version specified by [BootstrapVersion] during toolchain
-// bootstrapping; see golang.org/s/go15bootstrap.
-func IsBootstrapPackage(pkg string) bool {
- return bootstrap[pkg]
-}
diff --git a/vendor/golang.org/x/tools/internal/stdlib/manifest.go b/vendor/golang.org/x/tools/internal/stdlib/manifest.go
index 362f23c436..c1faa50d36 100644
--- a/vendor/golang.org/x/tools/internal/stdlib/manifest.go
+++ b/vendor/golang.org/x/tools/internal/stdlib/manifest.go
@@ -225,7 +225,6 @@ var PackageSymbols = map[string][]Symbol{
{"(*Buffer).Grow", Method, 1, ""},
{"(*Buffer).Len", Method, 0, ""},
{"(*Buffer).Next", Method, 0, ""},
- {"(*Buffer).Peek", Method, 26, ""},
{"(*Buffer).Read", Method, 0, ""},
{"(*Buffer).ReadByte", Method, 0, ""},
{"(*Buffer).ReadBytes", Method, 0, ""},
@@ -1629,7 +1628,6 @@ var PackageSymbols = map[string][]Symbol{
{"ResultNoRows", Var, 0, ""},
{"Rows", Type, 0, ""},
{"RowsAffected", Type, 0, ""},
- {"RowsColumnScanner", Type, 26, ""},
{"RowsColumnTypeDatabaseTypeName", Type, 8, ""},
{"RowsColumnTypeLength", Type, 8, ""},
{"RowsColumnTypeNullable", Type, 8, ""},
@@ -4955,7 +4953,6 @@ var PackageSymbols = map[string][]Symbol{
},
"errors": {
{"As", Func, 13, "func(err error, target any) bool"},
- {"AsType", Func, 26, "func[E error](err error) (E, bool)"},
{"ErrUnsupported", Var, 21, ""},
{"Is", Func, 13, "func(err error, target error) bool"},
{"Join", Func, 20, "func(errs ...error) error"},
@@ -5093,7 +5090,7 @@ var PackageSymbols = map[string][]Symbol{
{"Append", Func, 19, "func(b []byte, a ...any) []byte"},
{"Appendf", Func, 19, "func(b []byte, format string, a ...any) []byte"},
{"Appendln", Func, 19, "func(b []byte, a ...any) []byte"},
- {"Errorf", Func, 0, "func(format string, a ...any) (err error)"},
+ {"Errorf", Func, 0, "func(format string, a ...any) error"},
{"FormatString", Func, 20, "func(state State, verb rune) string"},
{"Formatter", Type, 0, ""},
{"Fprint", Func, 0, "func(w io.Writer, a ...any) (n int, err error)"},
@@ -5158,9 +5155,6 @@ var PackageSymbols = map[string][]Symbol{
{"(*DeclStmt).Pos", Method, 0, ""},
{"(*DeferStmt).End", Method, 0, ""},
{"(*DeferStmt).Pos", Method, 0, ""},
- {"(*Directive).End", Method, 26, ""},
- {"(*Directive).ParseArgs", Method, 26, ""},
- {"(*Directive).Pos", Method, 26, ""},
{"(*Ellipsis).End", Method, 0, ""},
{"(*Ellipsis).Pos", Method, 0, ""},
{"(*EmptyStmt).End", Method, 0, ""},
@@ -5326,15 +5320,6 @@ var PackageSymbols = map[string][]Symbol{
{"DeferStmt", Type, 0, ""},
{"DeferStmt.Call", Field, 0, ""},
{"DeferStmt.Defer", Field, 0, ""},
- {"Directive", Type, 26, ""},
- {"Directive.Args", Field, 26, ""},
- {"Directive.ArgsPos", Field, 26, ""},
- {"Directive.Name", Field, 26, ""},
- {"Directive.Slash", Field, 26, ""},
- {"Directive.Tool", Field, 26, ""},
- {"DirectiveArg", Type, 26, ""},
- {"DirectiveArg.Arg", Field, 26, ""},
- {"DirectiveArg.Pos", Field, 26, ""},
{"Ellipsis", Type, 0, ""},
{"Ellipsis.Ellipsis", Field, 0, ""},
{"Ellipsis.Elt", Field, 0, ""},
@@ -5484,7 +5469,6 @@ var PackageSymbols = map[string][]Symbol{
{"ParenExpr.Lparen", Field, 0, ""},
{"ParenExpr.Rparen", Field, 0, ""},
{"ParenExpr.X", Field, 0, ""},
- {"ParseDirective", Func, 26, "func(pos token.Pos, c string) (Directive, bool)"},
{"Pkg", Const, 0, ""},
{"Preorder", Func, 23, "func(root Node) iter.Seq[Node]"},
{"PreorderStack", Func, 25, "func(root Node, stack []Node, f func(n Node, stack []Node) bool)"},
@@ -7287,10 +7271,6 @@ var PackageSymbols = map[string][]Symbol{
{"(*Logger).WarnContext", Method, 21, ""},
{"(*Logger).With", Method, 21, ""},
{"(*Logger).WithGroup", Method, 21, ""},
- {"(*MultiHandler).Enabled", Method, 26, ""},
- {"(*MultiHandler).Handle", Method, 26, ""},
- {"(*MultiHandler).WithAttrs", Method, 26, ""},
- {"(*MultiHandler).WithGroup", Method, 26, ""},
{"(*Record).Add", Method, 21, ""},
{"(*Record).AddAttrs", Method, 21, ""},
{"(*TextHandler).Enabled", Method, 21, ""},
@@ -7378,11 +7358,9 @@ var PackageSymbols = map[string][]Symbol{
{"LogValuer", Type, 21, ""},
{"Logger", Type, 21, ""},
{"MessageKey", Const, 21, ""},
- {"MultiHandler", Type, 26, ""},
{"New", Func, 21, "func(h Handler) *Logger"},
{"NewJSONHandler", Func, 21, "func(w io.Writer, opts *HandlerOptions) *JSONHandler"},
{"NewLogLogger", Func, 21, "func(h Handler, level Level) *log.Logger"},
- {"NewMultiHandler", Func, 26, "func(handlers ...Handler) *MultiHandler"},
{"NewRecord", Func, 21, "func(t time.Time, level Level, msg string, pc uintptr) Record"},
{"NewTextHandler", Func, 21, "func(w io.Writer, opts *HandlerOptions) *TextHandler"},
{"Record", Type, 21, ""},
@@ -7537,7 +7515,7 @@ var PackageSymbols = map[string][]Symbol{
{"MinInt64", Const, 0, ""},
{"MinInt8", Const, 0, ""},
{"Mod", Func, 0, "func(x float64, y float64) float64"},
- {"Modf", Func, 0, "func(f float64) (integer float64, fractional float64)"},
+ {"Modf", Func, 0, "func(f float64) (int float64, frac float64)"},
{"NaN", Func, 0, "func() float64"},
{"Nextafter", Func, 0, "func(x float64, y float64) (r float64)"},
{"Nextafter32", Func, 4, "func(x float32, y float32) (r float32)"},
@@ -7994,10 +7972,6 @@ var PackageSymbols = map[string][]Symbol{
{"(*DNSError).Unwrap", Method, 23, ""},
{"(*Dialer).Dial", Method, 1, ""},
{"(*Dialer).DialContext", Method, 7, ""},
- {"(*Dialer).DialIP", Method, 26, ""},
- {"(*Dialer).DialTCP", Method, 26, ""},
- {"(*Dialer).DialUDP", Method, 26, ""},
- {"(*Dialer).DialUnix", Method, 26, ""},
{"(*Dialer).MultipathTCP", Method, 21, ""},
{"(*Dialer).SetMultipathTCP", Method, 21, ""},
{"(*IP).UnmarshalText", Method, 2, ""},
@@ -8483,7 +8457,6 @@ var PackageSymbols = map[string][]Symbol{
{"HTTP2Config.PermitProhibitedCipherSuites", Field, 24, ""},
{"HTTP2Config.PingTimeout", Field, 24, ""},
{"HTTP2Config.SendPingTimeout", Field, 24, ""},
- {"HTTP2Config.StrictMaxConcurrentRequests", Field, 26, ""},
{"HTTP2Config.WriteByteTimeout", Field, 24, ""},
{"Handle", Func, 0, "func(pattern string, handler Handler)"},
{"HandleFunc", Func, 0, "func(pattern string, handler func(ResponseWriter, *Request))"},
@@ -8931,7 +8904,6 @@ var PackageSymbols = map[string][]Symbol{
{"(Prefix).AppendText", Method, 24, ""},
{"(Prefix).AppendTo", Method, 18, ""},
{"(Prefix).Bits", Method, 18, ""},
- {"(Prefix).Compare", Method, 26, ""},
{"(Prefix).Contains", Method, 18, ""},
{"(Prefix).IsSingleIP", Method, 18, ""},
{"(Prefix).IsValid", Method, 18, ""},
@@ -9205,7 +9177,6 @@ var PackageSymbols = map[string][]Symbol{
{"(*Process).Release", Method, 0, ""},
{"(*Process).Signal", Method, 0, ""},
{"(*Process).Wait", Method, 0, ""},
- {"(*Process).WithHandle", Method, 26, ""},
{"(*ProcessState).ExitCode", Method, 12, ""},
{"(*ProcessState).Exited", Method, 0, ""},
{"(*ProcessState).Pid", Method, 0, ""},
@@ -9263,7 +9234,6 @@ var PackageSymbols = map[string][]Symbol{
{"ErrExist", Var, 0, ""},
{"ErrInvalid", Var, 0, ""},
{"ErrNoDeadline", Var, 10, ""},
- {"ErrNoHandle", Var, 26, ""},
{"ErrNotExist", Var, 0, ""},
{"ErrPermission", Var, 0, ""},
{"ErrProcessDone", Var, 16, ""},
@@ -9491,7 +9461,7 @@ var PackageSymbols = map[string][]Symbol{
{"ListSeparator", Const, 0, ""},
{"Localize", Func, 23, "func(path string) (string, error)"},
{"Match", Func, 0, "func(pattern string, name string) (matched bool, err error)"},
- {"Rel", Func, 0, "func(basePath string, targPath string) (string, error)"},
+ {"Rel", Func, 0, "func(basepath string, targpath string) (string, error)"},
{"Separator", Const, 0, ""},
{"SkipAll", Var, 20, ""},
{"SkipDir", Var, 0, ""},
@@ -9962,7 +9932,7 @@ var PackageSymbols = map[string][]Symbol{
{"PanicNilError", Type, 21, ""},
{"Pinner", Type, 21, ""},
{"ReadMemStats", Func, 0, "func(m *MemStats)"},
- {"ReadTrace", Func, 5, "func() (buf []byte)"},
+ {"ReadTrace", Func, 5, "func() []byte"},
{"SetBlockProfileRate", Func, 1, "func(rate int)"},
{"SetCPUProfileRate", Func, 0, "func(hz int)"},
{"SetCgoTraceback", Func, 7, "func(version int, traceback unsafe.Pointer, context unsafe.Pointer, symbolizer unsafe.Pointer)"},
@@ -16709,7 +16679,6 @@ var PackageSymbols = map[string][]Symbol{
{"ValueOf", Func, 0, ""},
},
"testing": {
- {"(*B).ArtifactDir", Method, 26, ""},
{"(*B).Attr", Method, 25, ""},
{"(*B).Chdir", Method, 24, ""},
{"(*B).Cleanup", Method, 14, ""},
@@ -16744,7 +16713,6 @@ var PackageSymbols = map[string][]Symbol{
{"(*B).StopTimer", Method, 0, ""},
{"(*B).TempDir", Method, 15, ""},
{"(*F).Add", Method, 18, ""},
- {"(*F).ArtifactDir", Method, 26, ""},
{"(*F).Attr", Method, 25, ""},
{"(*F).Chdir", Method, 24, ""},
{"(*F).Cleanup", Method, 18, ""},
@@ -16770,7 +16738,6 @@ var PackageSymbols = map[string][]Symbol{
{"(*F).TempDir", Method, 18, ""},
{"(*M).Run", Method, 4, ""},
{"(*PB).Next", Method, 3, ""},
- {"(*T).ArtifactDir", Method, 26, ""},
{"(*T).Attr", Method, 25, ""},
{"(*T).Chdir", Method, 24, ""},
{"(*T).Cleanup", Method, 14, ""},
diff --git a/vendor/golang.org/x/tools/internal/typeparams/normalize.go b/vendor/golang.org/x/tools/internal/typeparams/normalize.go
index 8d13f12147..f49802b8ef 100644
--- a/vendor/golang.org/x/tools/internal/typeparams/normalize.go
+++ b/vendor/golang.org/x/tools/internal/typeparams/normalize.go
@@ -160,7 +160,8 @@ func computeTermSetInternal(t types.Type, seen map[types.Type]*termSet, depth in
// The term set of an interface is the intersection of the term sets of its
// embedded types.
tset.terms = allTermlist
- for embedded := range u.EmbeddedTypes() {
+ for i := 0; i < u.NumEmbeddeds(); i++ {
+ embedded := u.EmbeddedType(i)
if _, ok := embedded.Underlying().(*types.TypeParam); ok {
return nil, fmt.Errorf("invalid embedded type %T", embedded)
}
@@ -173,7 +174,8 @@ func computeTermSetInternal(t types.Type, seen map[types.Type]*termSet, depth in
case *types.Union:
// The term set of a union is the union of term sets of its terms.
tset.terms = nil
- for t := range u.Terms() {
+ for i := 0; i < u.Len(); i++ {
+ t := u.Term(i)
var terms termlist
switch t.Type().Underlying().(type) {
case *types.Interface:
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/element.go b/vendor/golang.org/x/tools/internal/typesinternal/element.go
index 5fe4d8abcb..4957f02164 100644
--- a/vendor/golang.org/x/tools/internal/typesinternal/element.go
+++ b/vendor/golang.org/x/tools/internal/typesinternal/element.go
@@ -35,8 +35,8 @@ func ForEachElement(rtypes *typeutil.Map, msets *typeutil.MethodSetCache, T type
// Recursion over signatures of each method.
tmset := msets.MethodSet(T)
- for method := range tmset.Methods() {
- sig := method.Type().(*types.Signature)
+ for i := 0; i < tmset.Len(); i++ {
+ sig := tmset.At(i).Type().(*types.Signature)
// It is tempting to call visit(sig, false)
// but, as noted in golang.org/cl/65450043,
// the Signature.Recv field is ignored by
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/fx.go b/vendor/golang.org/x/tools/internal/typesinternal/fx.go
deleted file mode 100644
index c846a53d5f..0000000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/fx.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2025 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 file.
-
-package typesinternal
-
-import (
- "go/ast"
- "go/token"
- "go/types"
-)
-
-// NoEffects reports whether the expression has no side effects, i.e., it
-// does not modify the memory state. This function is conservative: it may
-// return false even when the expression has no effect.
-func NoEffects(info *types.Info, expr ast.Expr) bool {
- noEffects := true
- ast.Inspect(expr, func(n ast.Node) bool {
- switch v := n.(type) {
- case nil, *ast.Ident, *ast.BasicLit, *ast.BinaryExpr, *ast.ParenExpr,
- *ast.SelectorExpr, *ast.IndexExpr, *ast.SliceExpr, *ast.TypeAssertExpr,
- *ast.StarExpr, *ast.CompositeLit,
- // non-expressions that may appear within expressions
- *ast.KeyValueExpr,
- *ast.FieldList,
- *ast.Field,
- *ast.Ellipsis,
- *ast.IndexListExpr:
- // No effect.
-
- case *ast.ArrayType,
- *ast.StructType,
- *ast.ChanType,
- *ast.FuncType,
- *ast.MapType,
- *ast.InterfaceType:
- // Type syntax: no effects, recursively.
- // Prune descent.
- return false
-
- case *ast.UnaryExpr:
- // Channel send <-ch has effects.
- if v.Op == token.ARROW {
- noEffects = false
- }
-
- case *ast.CallExpr:
- // Type conversion has no effects.
- if !info.Types[v.Fun].IsType() {
- if CallsPureBuiltin(info, v) {
- // A call such as len(e) has no effects of its
- // own, though the subexpression e might.
- } else {
- noEffects = false
- }
- }
-
- case *ast.FuncLit:
- // A FuncLit has no effects, but do not descend into it.
- return false
-
- default:
- // All other expressions have effects
- noEffects = false
- }
-
- return noEffects
- })
- return noEffects
-}
-
-// CallsPureBuiltin reports whether call is a call of a built-in
-// function that is a pure computation over its operands (analogous to
-// a + operator). Because it does not depend on program state, it may
-// be evaluated at any point--though not necessarily at multiple
-// points (consider new, make).
-func CallsPureBuiltin(info *types.Info, call *ast.CallExpr) bool {
- if id, ok := ast.Unparen(call.Fun).(*ast.Ident); ok {
- if b, ok := info.ObjectOf(id).(*types.Builtin); ok {
- switch b.Name() {
- case "len", "cap", "complex", "imag", "real", "make", "new", "max", "min":
- return true
- }
- // Not: append clear close copy delete panic print println recover
- }
- }
- return false
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/isnamed.go b/vendor/golang.org/x/tools/internal/typesinternal/isnamed.go
deleted file mode 100644
index e0d63c46c6..0000000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/isnamed.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2025 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 file.
-
-package typesinternal
-
-import (
- "go/types"
- "slices"
-)
-
-// IsTypeNamed reports whether t is (or is an alias for) a
-// package-level defined type with the given package path and one of
-// the given names. It returns false if t is nil.
-//
-// This function avoids allocating the concatenation of "pkg.Name",
-// which is important for the performance of syntax matching.
-func IsTypeNamed(t types.Type, pkgPath string, names ...string) bool {
- if named, ok := types.Unalias(t).(*types.Named); ok {
- tname := named.Obj()
- return tname != nil &&
- IsPackageLevel(tname) &&
- tname.Pkg().Path() == pkgPath &&
- slices.Contains(names, tname.Name())
- }
- return false
-}
-
-// IsPointerToNamed reports whether t is (or is an alias for) a pointer to a
-// package-level defined type with the given package path and one of the given
-// names. It returns false if t is not a pointer type.
-func IsPointerToNamed(t types.Type, pkgPath string, names ...string) bool {
- r := Unpointer(t)
- if r == t {
- return false
- }
- return IsTypeNamed(r, pkgPath, names...)
-}
-
-// IsFunctionNamed reports whether obj is a package-level function
-// defined in the given package and has one of the given names.
-// It returns false if obj is nil.
-//
-// This function avoids allocating the concatenation of "pkg.Name",
-// which is important for the performance of syntax matching.
-func IsFunctionNamed(obj types.Object, pkgPath string, names ...string) bool {
- f, ok := obj.(*types.Func)
- return ok &&
- IsPackageLevel(obj) &&
- f.Pkg().Path() == pkgPath &&
- f.Signature().Recv() == nil &&
- slices.Contains(names, f.Name())
-}
-
-// IsMethodNamed reports whether obj is a method defined on a
-// package-level type with the given package and type name, and has
-// one of the given names. It returns false if obj is nil.
-//
-// This function avoids allocating the concatenation of "pkg.TypeName.Name",
-// which is important for the performance of syntax matching.
-func IsMethodNamed(obj types.Object, pkgPath string, typeName string, names ...string) bool {
- if fn, ok := obj.(*types.Func); ok {
- if recv := fn.Signature().Recv(); recv != nil {
- _, T := ReceiverNamed(recv)
- return T != nil &&
- IsTypeNamed(T, pkgPath, typeName) &&
- slices.Contains(names, fn.Name())
- }
- }
- return false
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/qualifier.go b/vendor/golang.org/x/tools/internal/typesinternal/qualifier.go
index 4e2756fc49..b64f714eb3 100644
--- a/vendor/golang.org/x/tools/internal/typesinternal/qualifier.go
+++ b/vendor/golang.org/x/tools/internal/typesinternal/qualifier.go
@@ -15,14 +15,6 @@ import (
// file.
// If the same package is imported multiple times, the last appearance is
// recorded.
-//
-// TODO(adonovan): this function ignores the effect of shadowing. It
-// should accept a [token.Pos] and a [types.Info] and compute only the
-// set of imports that are not shadowed at that point, analogous to
-// [analysis.AddImport]. It could also compute (as a side
-// effect) the set of additional imports required to ensure that there
-// is an accessible import for each necessary package, making it
-// converge even more closely with AddImport.
func FileQualifier(f *ast.File, pkg *types.Package) types.Qualifier {
// Construct mapping of import paths to their defined names.
// It is only necessary to look at renaming imports.
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/types.go b/vendor/golang.org/x/tools/internal/typesinternal/types.go
index fef74a7856..a5cd7e8dbf 100644
--- a/vendor/golang.org/x/tools/internal/typesinternal/types.go
+++ b/vendor/golang.org/x/tools/internal/typesinternal/types.go
@@ -2,20 +2,8 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-// Package typesinternal provides helpful operators for dealing with
-// go/types:
-//
-// - operators for querying typed syntax trees (e.g. [Imports], [IsFunctionNamed]);
-// - functions for converting types to strings or syntax (e.g. [TypeExpr], FileQualifier]);
-// - helpers for working with the [go/types] API (e.g. [NewTypesInfo]);
-// - access to internal go/types APIs that are not yet
-// exported (e.g. [SetUsesCgo], [ErrorCodeStartEnd], [VarKind]); and
-// - common algorithms related to types (e.g. [TooNewStdSymbols]).
-//
-// See also:
-// - [golang.org/x/tools/internal/astutil], for operations on untyped syntax;
-// - [golang.org/x/tools/internal/analysisinernal], for helpers for analyzers;
-// - [golang.org/x/tools/internal/refactor], for operators to compute text edits.
+// Package typesinternal provides access to internal go/types APIs that are not
+// yet exported.
package typesinternal
import (
@@ -25,7 +13,6 @@ import (
"reflect"
"unsafe"
- "golang.org/x/tools/go/ast/inspector"
"golang.org/x/tools/internal/aliases"
)
@@ -73,9 +60,6 @@ func ErrorCodeStartEnd(err types.Error) (code ErrorCode, start, end token.Pos, o
// which is often excessive.)
//
// If pkg is nil, it is equivalent to [*types.Package.Name].
-//
-// TODO(adonovan): all uses of this with TypeString should be
-// eliminated when https://go.dev/issues/75604 is resolved.
func NameRelativeTo(pkg *types.Package) types.Qualifier {
return func(other *types.Package) string {
if pkg != nil && pkg == other {
@@ -169,31 +153,3 @@ func NewTypesInfo() *types.Info {
FileVersions: map[*ast.File]string{},
}
}
-
-// EnclosingScope returns the innermost block logically enclosing the cursor.
-func EnclosingScope(info *types.Info, cur inspector.Cursor) *types.Scope {
- for cur := range cur.Enclosing() {
- n := cur.Node()
- // A function's Scope is associated with its FuncType.
- switch f := n.(type) {
- case *ast.FuncDecl:
- n = f.Type
- case *ast.FuncLit:
- n = f.Type
- }
- if b := info.Scopes[n]; b != nil {
- return b
- }
- }
- panic("no Scope for *ast.File")
-}
-
-// Imports reports whether path is imported by pkg.
-func Imports(pkg *types.Package, path string) bool {
- for _, imp := range pkg.Imports() {
- if imp.Path() == path {
- return true
- }
- }
- return false
-}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/varkind.go b/vendor/golang.org/x/tools/internal/typesinternal/varkind.go
index 26499cdd2e..e5da049511 100644
--- a/vendor/golang.org/x/tools/internal/typesinternal/varkind.go
+++ b/vendor/golang.org/x/tools/internal/typesinternal/varkind.go
@@ -2,22 +2,39 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-//go:build go1.25
-
package typesinternal
+// TODO(adonovan): when CL 645115 lands, define the go1.25 version of
+// this API that actually does something.
+
import "go/types"
-type VarKind = types.VarKind
+type VarKind uint8
const (
- PackageVar = types.PackageVar
- LocalVar = types.LocalVar
- RecvVar = types.RecvVar
- ParamVar = types.ParamVar
- ResultVar = types.ResultVar
- FieldVar = types.FieldVar
+ _ VarKind = iota // (not meaningful)
+ PackageVar // a package-level variable
+ LocalVar // a local variable
+ RecvVar // a method receiver variable
+ ParamVar // a function parameter variable
+ ResultVar // a function result variable
+ FieldVar // a struct field
)
-func GetVarKind(v *types.Var) VarKind { return v.Kind() }
-func SetVarKind(v *types.Var, kind VarKind) { v.SetKind(kind) }
+func (kind VarKind) String() string {
+ return [...]string{
+ 0: "VarKind(0)",
+ PackageVar: "PackageVar",
+ LocalVar: "LocalVar",
+ RecvVar: "RecvVar",
+ ParamVar: "ParamVar",
+ ResultVar: "ResultVar",
+ FieldVar: "FieldVar",
+ }[kind]
+}
+
+// GetVarKind returns an invalid VarKind.
+func GetVarKind(v *types.Var) VarKind { return 0 }
+
+// SetVarKind has no effect.
+func SetVarKind(v *types.Var, kind VarKind) {}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/varkind_go124.go b/vendor/golang.org/x/tools/internal/typesinternal/varkind_go124.go
deleted file mode 100644
index 17b1804b4e..0000000000
--- a/vendor/golang.org/x/tools/internal/typesinternal/varkind_go124.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2024 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 file.
-
-//go:build !go1.25
-
-package typesinternal
-
-import "go/types"
-
-type VarKind uint8
-
-const (
- _ VarKind = iota // (not meaningful)
- PackageVar // a package-level variable
- LocalVar // a local variable
- RecvVar // a method receiver variable
- ParamVar // a function parameter variable
- ResultVar // a function result variable
- FieldVar // a struct field
-)
-
-func (kind VarKind) String() string {
- return [...]string{
- 0: "VarKind(0)",
- PackageVar: "PackageVar",
- LocalVar: "LocalVar",
- RecvVar: "RecvVar",
- ParamVar: "ParamVar",
- ResultVar: "ResultVar",
- FieldVar: "FieldVar",
- }[kind]
-}
-
-// GetVarKind returns an invalid VarKind.
-func GetVarKind(v *types.Var) VarKind { return 0 }
-
-// SetVarKind has no effect.
-func SetVarKind(v *types.Var, kind VarKind) {}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/zerovalue.go b/vendor/golang.org/x/tools/internal/typesinternal/zerovalue.go
index d612a71029..d272949c17 100644
--- a/vendor/golang.org/x/tools/internal/typesinternal/zerovalue.go
+++ b/vendor/golang.org/x/tools/internal/typesinternal/zerovalue.go
@@ -204,12 +204,23 @@ func ZeroExpr(t types.Type, qual types.Qualifier) (_ ast.Expr, isValid bool) {
}
}
+// IsZeroExpr uses simple syntactic heuristics to report whether expr
+// is a obvious zero value, such as 0, "", nil, or false.
+// It cannot do better without type information.
+func IsZeroExpr(expr ast.Expr) bool {
+ switch e := expr.(type) {
+ case *ast.BasicLit:
+ return e.Value == "0" || e.Value == `""`
+ case *ast.Ident:
+ return e.Name == "nil" || e.Name == "false"
+ default:
+ return false
+ }
+}
+
// TypeExpr returns syntax for the specified type. References to named types
// are qualified by an appropriate (optional) qualifier function.
// It may panic for types such as Tuple or Union.
-//
-// See also https://go.dev/issues/75604, which will provide a robust
-// Type-to-valid-Go-syntax formatter.
func TypeExpr(t types.Type, qual types.Qualifier) ast.Expr {
switch t := t.(type) {
case *types.Basic:
@@ -258,12 +269,12 @@ func TypeExpr(t types.Type, qual types.Qualifier) ast.Expr {
case *types.Signature:
var params []*ast.Field
- for v := range t.Params().Variables() {
+ for i := 0; i < t.Params().Len(); i++ {
params = append(params, &ast.Field{
- Type: TypeExpr(v.Type(), qual),
+ Type: TypeExpr(t.Params().At(i).Type(), qual),
Names: []*ast.Ident{
{
- Name: v.Name(),
+ Name: t.Params().At(i).Name(),
},
},
})
@@ -273,9 +284,9 @@ func TypeExpr(t types.Type, qual types.Qualifier) ast.Expr {
last.Type = &ast.Ellipsis{Elt: last.Type.(*ast.ArrayType).Elt}
}
var returns []*ast.Field
- for v := range t.Results().Variables() {
+ for i := 0; i < t.Results().Len(); i++ {
returns = append(returns, &ast.Field{
- Type: TypeExpr(v.Type(), qual),
+ Type: TypeExpr(t.Results().At(i).Type(), qual),
})
}
return &ast.FuncType{
@@ -315,8 +326,8 @@ func TypeExpr(t types.Type, qual types.Qualifier) ast.Expr {
if hasTypeArgs, ok := t.(interface{ TypeArgs() *types.TypeList }); ok {
if typeArgs := hasTypeArgs.TypeArgs(); typeArgs != nil && typeArgs.Len() > 0 {
var indices []ast.Expr
- for t0 := range typeArgs.Types() {
- indices = append(indices, TypeExpr(t0, qual))
+ for i := range typeArgs.Len() {
+ indices = append(indices, TypeExpr(typeArgs.At(i), qual))
}
expr = &ast.IndexListExpr{
X: expr,
diff --git a/vendor/golang.org/x/tools/internal/versions/features.go b/vendor/golang.org/x/tools/internal/versions/features.go
index a5f4e3252c..b53f178616 100644
--- a/vendor/golang.org/x/tools/internal/versions/features.go
+++ b/vendor/golang.org/x/tools/internal/versions/features.go
@@ -7,17 +7,13 @@ package versions
// This file contains predicates for working with file versions to
// decide when a tool should consider a language feature enabled.
-// named constants, to avoid misspelling
+// GoVersions that features in x/tools can be gated to.
const (
Go1_18 = "go1.18"
Go1_19 = "go1.19"
Go1_20 = "go1.20"
Go1_21 = "go1.21"
Go1_22 = "go1.22"
- Go1_23 = "go1.23"
- Go1_24 = "go1.24"
- Go1_25 = "go1.25"
- Go1_26 = "go1.26"
)
// Future is an invalid unknown Go version sometime in the future.
diff --git a/vendor/google.golang.org/grpc/balancer/balancer.go b/vendor/google.golang.org/grpc/balancer/balancer.go
index d08b7ad637..b1264017db 100644
--- a/vendor/google.golang.org/grpc/balancer/balancer.go
+++ b/vendor/google.golang.org/grpc/balancer/balancer.go
@@ -75,6 +75,8 @@ func unregisterForTesting(name string) {
func init() {
internal.BalancerUnregister = unregisterForTesting
+ internal.ConnectedAddress = connectedAddress
+ internal.SetConnectedAddress = setConnectedAddress
}
// Get returns the resolver builder registered with the given name.
diff --git a/vendor/google.golang.org/grpc/balancer/pickfirst/internal/internal.go b/vendor/google.golang.org/grpc/balancer/pickfirst/internal/internal.go
index cc902a4de6..7d66cb491c 100644
--- a/vendor/google.golang.org/grpc/balancer/pickfirst/internal/internal.go
+++ b/vendor/google.golang.org/grpc/balancer/pickfirst/internal/internal.go
@@ -26,8 +26,6 @@ import (
var (
// RandShuffle pseudo-randomizes the order of addresses.
RandShuffle = rand.Shuffle
- // RandFloat64 returns, as a float64, a pseudo-random number in [0.0,1.0).
- RandFloat64 = rand.Float64
// TimeAfterFunc allows mocking the timer for testing connection delay
// related functionality.
TimeAfterFunc = func(d time.Duration, f func()) func() {
diff --git a/vendor/google.golang.org/grpc/balancer/pickfirst/pickfirst.go b/vendor/google.golang.org/grpc/balancer/pickfirst/pickfirst.go
index dccd9f0bf3..b15c10e46b 100644
--- a/vendor/google.golang.org/grpc/balancer/pickfirst/pickfirst.go
+++ b/vendor/google.golang.org/grpc/balancer/pickfirst/pickfirst.go
@@ -16,129 +16,55 @@
*
*/
-// Package pickfirst contains the pick_first load balancing policy which
-// is the universal leaf policy.
+// Package pickfirst contains the pick_first load balancing policy.
package pickfirst
import (
- "cmp"
"encoding/json"
"errors"
"fmt"
- "math"
- "net"
- "net/netip"
- "slices"
- "sync"
- "time"
+ rand "math/rand/v2"
"google.golang.org/grpc/balancer"
"google.golang.org/grpc/balancer/pickfirst/internal"
"google.golang.org/grpc/connectivity"
- expstats "google.golang.org/grpc/experimental/stats"
"google.golang.org/grpc/grpclog"
- "google.golang.org/grpc/internal/balancer/weight"
"google.golang.org/grpc/internal/envconfig"
internalgrpclog "google.golang.org/grpc/internal/grpclog"
"google.golang.org/grpc/internal/pretty"
"google.golang.org/grpc/resolver"
"google.golang.org/grpc/serviceconfig"
+
+ _ "google.golang.org/grpc/balancer/pickfirst/pickfirstleaf" // For automatically registering the new pickfirst if required.
)
func init() {
+ if envconfig.NewPickFirstEnabled {
+ return
+ }
balancer.Register(pickfirstBuilder{})
}
-// Name is the name of the pick_first balancer.
-const Name = "pick_first"
-
-// enableHealthListenerKeyType is a unique key type used in resolver
-// attributes to indicate whether the health listener usage is enabled.
-type enableHealthListenerKeyType struct{}
-
-var (
- logger = grpclog.Component("pick-first-leaf-lb")
- disconnectionsMetric = expstats.RegisterInt64Count(expstats.MetricDescriptor{
- Name: "grpc.lb.pick_first.disconnections",
- Description: "EXPERIMENTAL. Number of times the selected subchannel becomes disconnected.",
- Unit: "{disconnection}",
- Labels: []string{"grpc.target"},
- Default: false,
- })
- connectionAttemptsSucceededMetric = expstats.RegisterInt64Count(expstats.MetricDescriptor{
- Name: "grpc.lb.pick_first.connection_attempts_succeeded",
- Description: "EXPERIMENTAL. Number of successful connection attempts.",
- Unit: "{attempt}",
- Labels: []string{"grpc.target"},
- Default: false,
- })
- connectionAttemptsFailedMetric = expstats.RegisterInt64Count(expstats.MetricDescriptor{
- Name: "grpc.lb.pick_first.connection_attempts_failed",
- Description: "EXPERIMENTAL. Number of failed connection attempts.",
- Unit: "{attempt}",
- Labels: []string{"grpc.target"},
- Default: false,
- })
-)
+var logger = grpclog.Component("pick-first-lb")
const (
- // TODO: change to pick-first when this becomes the default pick_first policy.
- logPrefix = "[pick-first-leaf-lb %p] "
- // connectionDelayInterval is the time to wait for during the happy eyeballs
- // pass before starting the next connection attempt.
- connectionDelayInterval = 250 * time.Millisecond
-)
-
-type ipAddrFamily int
-
-const (
- // ipAddrFamilyUnknown represents strings that can't be parsed as an IP
- // address.
- ipAddrFamilyUnknown ipAddrFamily = iota
- ipAddrFamilyV4
- ipAddrFamilyV6
+ // Name is the name of the pick_first balancer.
+ Name = "pick_first"
+ logPrefix = "[pick-first-lb %p] "
)
type pickfirstBuilder struct{}
-func (pickfirstBuilder) Build(cc balancer.ClientConn, bo balancer.BuildOptions) balancer.Balancer {
- b := &pickfirstBalancer{
- cc: cc,
- target: bo.Target.String(),
- metricsRecorder: cc.MetricsRecorder(),
-
- subConns: resolver.NewAddressMapV2[*scData](),
- state: connectivity.Connecting,
- cancelConnectionTimer: func() {},
- }
+func (pickfirstBuilder) Build(cc balancer.ClientConn, _ balancer.BuildOptions) balancer.Balancer {
+ b := &pickfirstBalancer{cc: cc}
b.logger = internalgrpclog.NewPrefixLogger(logger, fmt.Sprintf(logPrefix, b))
return b
}
-func (b pickfirstBuilder) Name() string {
+func (pickfirstBuilder) Name() string {
return Name
}
-func (pickfirstBuilder) ParseConfig(js json.RawMessage) (serviceconfig.LoadBalancingConfig, error) {
- var cfg pfConfig
- if err := json.Unmarshal(js, &cfg); err != nil {
- return nil, fmt.Errorf("pickfirst: unable to unmarshal LB policy config: %s, error: %v", string(js), err)
- }
- return cfg, nil
-}
-
-// EnableHealthListener updates the state to configure pickfirst for using a
-// generic health listener.
-//
-// # Experimental
-//
-// Notice: This API is EXPERIMENTAL and may be changed or removed in a later
-// release.
-func EnableHealthListener(state resolver.State) resolver.State {
- state.Attributes = state.Attributes.WithValue(enableHealthListenerKeyType{}, true)
- return state
-}
-
type pfConfig struct {
serviceconfig.LoadBalancingConfig `json:"-"`
@@ -148,163 +74,90 @@ type pfConfig struct {
ShuffleAddressList bool `json:"shuffleAddressList"`
}
-// scData keeps track of the current state of the subConn.
-// It is not safe for concurrent access.
-type scData struct {
- // The following fields are initialized at build time and read-only after
- // that.
- subConn balancer.SubConn
- addr resolver.Address
-
- rawConnectivityState connectivity.State
- // The effective connectivity state based on raw connectivity, health state
- // and after following sticky TransientFailure behaviour defined in A62.
- effectiveState connectivity.State
- lastErr error
- connectionFailedInFirstPass bool
-}
-
-func (b *pickfirstBalancer) newSCData(addr resolver.Address) (*scData, error) {
- sd := &scData{
- rawConnectivityState: connectivity.Idle,
- effectiveState: connectivity.Idle,
- addr: addr,
- }
- sc, err := b.cc.NewSubConn([]resolver.Address{addr}, balancer.NewSubConnOptions{
- StateListener: func(state balancer.SubConnState) {
- b.updateSubConnState(sd, state)
- },
- })
- if err != nil {
- return nil, err
+func (pickfirstBuilder) ParseConfig(js json.RawMessage) (serviceconfig.LoadBalancingConfig, error) {
+ var cfg pfConfig
+ if err := json.Unmarshal(js, &cfg); err != nil {
+ return nil, fmt.Errorf("pickfirst: unable to unmarshal LB policy config: %s, error: %v", string(js), err)
}
- sd.subConn = sc
- return sd, nil
+ return cfg, nil
}
type pickfirstBalancer struct {
- // The following fields are initialized at build time and read-only after
- // that and therefore do not need to be guarded by a mutex.
- logger *internalgrpclog.PrefixLogger
- cc balancer.ClientConn
- target string
- metricsRecorder expstats.MetricsRecorder // guaranteed to be non nil
-
- // The mutex is used to ensure synchronization of updates triggered
- // from the idle picker and the already serialized resolver,
- // SubConn state updates.
- mu sync.Mutex
- // State reported to the channel based on SubConn states and resolver
- // updates.
- state connectivity.State
- // scData for active subonns mapped by address.
- subConns *resolver.AddressMapV2[*scData]
- addressList addressList
- firstPass bool
- numTF int
- cancelConnectionTimer func()
- healthCheckingEnabled bool
+ logger *internalgrpclog.PrefixLogger
+ state connectivity.State
+ cc balancer.ClientConn
+ subConn balancer.SubConn
}
-// ResolverError is called by the ClientConn when the name resolver produces
-// an error or when pickfirst determined the resolver update to be invalid.
func (b *pickfirstBalancer) ResolverError(err error) {
- b.mu.Lock()
- defer b.mu.Unlock()
- b.resolverErrorLocked(err)
-}
-
-func (b *pickfirstBalancer) resolverErrorLocked(err error) {
if b.logger.V(2) {
b.logger.Infof("Received error from the name resolver: %v", err)
}
+ if b.subConn == nil {
+ b.state = connectivity.TransientFailure
+ }
- // The picker will not change since the balancer does not currently
- // report an error. If the balancer hasn't received a single good resolver
- // update yet, transition to TRANSIENT_FAILURE.
- if b.state != connectivity.TransientFailure && b.addressList.size() > 0 {
- if b.logger.V(2) {
- b.logger.Infof("Ignoring resolver error because balancer is using a previous good update.")
- }
+ if b.state != connectivity.TransientFailure {
+ // The picker will not change since the balancer does not currently
+ // report an error.
return
}
-
- b.updateBalancerState(balancer.State{
+ b.cc.UpdateState(balancer.State{
ConnectivityState: connectivity.TransientFailure,
Picker: &picker{err: fmt.Errorf("name resolver error: %v", err)},
})
}
+// Shuffler is an interface for shuffling an address list.
+type Shuffler interface {
+ ShuffleAddressListForTesting(n int, swap func(i, j int))
+}
+
+// ShuffleAddressListForTesting pseudo-randomizes the order of addresses. n
+// is the number of elements. swap swaps the elements with indexes i and j.
+func ShuffleAddressListForTesting(n int, swap func(i, j int)) { rand.Shuffle(n, swap) }
+
func (b *pickfirstBalancer) UpdateClientConnState(state balancer.ClientConnState) error {
- b.mu.Lock()
- defer b.mu.Unlock()
- b.cancelConnectionTimer()
if len(state.ResolverState.Addresses) == 0 && len(state.ResolverState.Endpoints) == 0 {
- // Cleanup state pertaining to the previous resolver state.
- // Treat an empty address list like an error by calling b.ResolverError.
- b.closeSubConnsLocked()
- b.addressList.updateAddrs(nil)
- b.resolverErrorLocked(errors.New("produced zero addresses"))
+ // The resolver reported an empty address list. Treat it like an error by
+ // calling b.ResolverError.
+ if b.subConn != nil {
+ // Shut down the old subConn. All addresses were removed, so it is
+ // no longer valid.
+ b.subConn.Shutdown()
+ b.subConn = nil
+ }
+ b.ResolverError(errors.New("produced zero addresses"))
return balancer.ErrBadResolverState
}
- b.healthCheckingEnabled = state.ResolverState.Attributes.Value(enableHealthListenerKeyType{}) != nil
+ // We don't have to guard this block with the env var because ParseConfig
+ // already does so.
cfg, ok := state.BalancerConfig.(pfConfig)
if state.BalancerConfig != nil && !ok {
- return fmt.Errorf("pickfirst: received illegal BalancerConfig (type %T): %v: %w", state.BalancerConfig, state.BalancerConfig, balancer.ErrBadResolverState)
+ return fmt.Errorf("pickfirst: received illegal BalancerConfig (type %T): %v", state.BalancerConfig, state.BalancerConfig)
}
if b.logger.V(2) {
b.logger.Infof("Received new config %s, resolver state %s", pretty.ToJSON(cfg), pretty.ToJSON(state.ResolverState))
}
- var newAddrs []resolver.Address
+ var addrs []resolver.Address
if endpoints := state.ResolverState.Endpoints; len(endpoints) != 0 {
- // Perform the optional shuffling described in gRFC A62. The shuffling
- // will change the order of endpoints but not touch the order of the
- // addresses within each endpoint. - A61
+ // Perform the optional shuffling described in gRFC A62. The shuffling will
+ // change the order of endpoints but not touch the order of the addresses
+ // within each endpoint. - A61
if cfg.ShuffleAddressList {
- if envconfig.PickFirstWeightedShuffling {
- type weightedEndpoint struct {
- endpoint resolver.Endpoint
- weight float64
- }
-
- // For each endpoint, compute a key as described in A113 and
- // https://utopia.duth.gr/~pefraimi/research/data/2007EncOfAlg.pdf:
- var weightedEndpoints []weightedEndpoint
- for _, endpoint := range endpoints {
- u := internal.RandFloat64() // Random number in [0.0, 1.0)
- weight := weightAttribute(endpoint)
- weightedEndpoints = append(weightedEndpoints, weightedEndpoint{
- endpoint: endpoint,
- weight: math.Pow(u, 1.0/float64(weight)),
- })
- }
- // Sort endpoints by key in descending order and reconstruct the
- // endpoints slice.
- slices.SortFunc(weightedEndpoints, func(a, b weightedEndpoint) int {
- return cmp.Compare(b.weight, a.weight)
- })
-
- // Here, and in the "else" block below, we clone the endpoints
- // slice to avoid mutating the resolver state. Doing the latter
- // would lead to data races if the caller is accessing the same
- // slice concurrently.
- sortedEndpoints := make([]resolver.Endpoint, len(endpoints))
- for i, we := range weightedEndpoints {
- sortedEndpoints[i] = we.endpoint
- }
- endpoints = sortedEndpoints
- } else {
- endpoints = slices.Clone(endpoints)
- internal.RandShuffle(len(endpoints), func(i, j int) { endpoints[i], endpoints[j] = endpoints[j], endpoints[i] })
- }
+ endpoints = append([]resolver.Endpoint{}, endpoints...)
+ internal.RandShuffle(len(endpoints), func(i, j int) { endpoints[i], endpoints[j] = endpoints[j], endpoints[i] })
}
- // "Flatten the list by concatenating the ordered list of addresses for
- // each of the endpoints, in order." - A61
+ // "Flatten the list by concatenating the ordered list of addresses for each
+ // of the endpoints, in order." - A61
for _, endpoint := range endpoints {
- newAddrs = append(newAddrs, endpoint.Addresses...)
+ // "In the flattened list, interleave addresses from the two address
+ // families, as per RFC-8304 section 4." - A61
+ // TODO: support the above language.
+ addrs = append(addrs, endpoint.Addresses...)
}
} else {
// Endpoints not set, process addresses until we migrate resolver
@@ -313,53 +166,42 @@ func (b *pickfirstBalancer) UpdateClientConnState(state balancer.ClientConnState
// target do not forward the corresponding correct endpoints down/split
// endpoints properly. Once all balancers correctly forward endpoints
// down, can delete this else conditional.
- newAddrs = state.ResolverState.Addresses
+ addrs = state.ResolverState.Addresses
if cfg.ShuffleAddressList {
- newAddrs = append([]resolver.Address{}, newAddrs...)
- internal.RandShuffle(len(newAddrs), func(i, j int) { newAddrs[i], newAddrs[j] = newAddrs[j], newAddrs[i] })
+ addrs = append([]resolver.Address{}, addrs...)
+ internal.RandShuffle(len(addrs), func(i, j int) { addrs[i], addrs[j] = addrs[j], addrs[i] })
}
}
- // If an address appears in multiple endpoints or in the same endpoint
- // multiple times, we keep it only once. We will create only one SubConn
- // for the address because an AddressMap is used to store SubConns.
- // Not de-duplicating would result in attempting to connect to the same
- // SubConn multiple times in the same pass. We don't want this.
- newAddrs = deDupAddresses(newAddrs)
- newAddrs = interleaveAddresses(newAddrs)
-
- prevAddr := b.addressList.currentAddress()
- prevSCData, found := b.subConns.Get(prevAddr)
- prevAddrsCount := b.addressList.size()
- isPrevRawConnectivityStateReady := found && prevSCData.rawConnectivityState == connectivity.Ready
- b.addressList.updateAddrs(newAddrs)
-
- // If the previous ready SubConn exists in new address list,
- // keep this connection and don't create new SubConns.
- if isPrevRawConnectivityStateReady && b.addressList.seekTo(prevAddr) {
+ if b.subConn != nil {
+ b.cc.UpdateAddresses(b.subConn, addrs)
return nil
}
- b.reconcileSubConnsLocked(newAddrs)
- // If it's the first resolver update or the balancer was already READY
- // (but the new address list does not contain the ready SubConn) or
- // CONNECTING, enter CONNECTING.
- // We may be in TRANSIENT_FAILURE due to a previous empty address list,
- // we should still enter CONNECTING because the sticky TF behaviour
- // mentioned in A62 applies only when the TRANSIENT_FAILURE is reported
- // due to connectivity failures.
- if isPrevRawConnectivityStateReady || b.state == connectivity.Connecting || prevAddrsCount == 0 {
- // Start connection attempt at first address.
- b.forceUpdateConcludedStateLocked(balancer.State{
- ConnectivityState: connectivity.Connecting,
- Picker: &picker{err: balancer.ErrNoSubConnAvailable},
+ var subConn balancer.SubConn
+ subConn, err := b.cc.NewSubConn(addrs, balancer.NewSubConnOptions{
+ StateListener: func(state balancer.SubConnState) {
+ b.updateSubConnState(subConn, state)
+ },
+ })
+ if err != nil {
+ if b.logger.V(2) {
+ b.logger.Infof("Failed to create new SubConn: %v", err)
+ }
+ b.state = connectivity.TransientFailure
+ b.cc.UpdateState(balancer.State{
+ ConnectivityState: connectivity.TransientFailure,
+ Picker: &picker{err: fmt.Errorf("error creating connection: %v", err)},
})
- b.startFirstPassLocked()
- } else if b.state == connectivity.TransientFailure {
- // If we're in TRANSIENT_FAILURE, we stay in TRANSIENT_FAILURE until
- // we're READY. See A62.
- b.startFirstPassLocked()
+ return balancer.ErrBadResolverState
}
+ b.subConn = subConn
+ b.state = connectivity.Idle
+ b.cc.UpdateState(balancer.State{
+ ConnectivityState: connectivity.Connecting,
+ Picker: &picker{err: balancer.ErrNoSubConnAvailable},
+ })
+ b.subConn.Connect()
return nil
}
@@ -369,484 +211,63 @@ func (b *pickfirstBalancer) UpdateSubConnState(subConn balancer.SubConn, state b
b.logger.Errorf("UpdateSubConnState(%v, %+v) called unexpectedly", subConn, state)
}
-func (b *pickfirstBalancer) Close() {
- b.mu.Lock()
- defer b.mu.Unlock()
- b.closeSubConnsLocked()
- b.cancelConnectionTimer()
- b.state = connectivity.Shutdown
-}
-
-// ExitIdle moves the balancer out of idle state. It can be called concurrently
-// by the idlePicker and clientConn so access to variables should be
-// synchronized.
-func (b *pickfirstBalancer) ExitIdle() {
- b.mu.Lock()
- defer b.mu.Unlock()
- if b.state == connectivity.Idle {
- // Move the balancer into CONNECTING state immediately. This is done to
- // avoid staying in IDLE if a resolver update arrives before the first
- // SubConn reports CONNECTING.
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.Connecting,
- Picker: &picker{err: balancer.ErrNoSubConnAvailable},
- })
- b.startFirstPassLocked()
- }
-}
-
-func (b *pickfirstBalancer) startFirstPassLocked() {
- b.firstPass = true
- b.numTF = 0
- // Reset the connection attempt record for existing SubConns.
- for _, sd := range b.subConns.Values() {
- sd.connectionFailedInFirstPass = false
- }
- b.requestConnectionLocked()
-}
-
-func (b *pickfirstBalancer) closeSubConnsLocked() {
- for _, sd := range b.subConns.Values() {
- sd.subConn.Shutdown()
- }
- b.subConns = resolver.NewAddressMapV2[*scData]()
-}
-
-// deDupAddresses ensures that each address appears only once in the slice.
-func deDupAddresses(addrs []resolver.Address) []resolver.Address {
- seenAddrs := resolver.NewAddressMapV2[bool]()
- retAddrs := []resolver.Address{}
-
- for _, addr := range addrs {
- if _, ok := seenAddrs.Get(addr); ok {
- continue
- }
- seenAddrs.Set(addr, true)
- retAddrs = append(retAddrs, addr)
- }
- return retAddrs
-}
-
-// interleaveAddresses interleaves addresses of both families (IPv4 and IPv6)
-// as per RFC-8305 section 4.
-// Whichever address family is first in the list is followed by an address of
-// the other address family; that is, if the first address in the list is IPv6,
-// then the first IPv4 address should be moved up in the list to be second in
-// the list. It doesn't support configuring "First Address Family Count", i.e.
-// there will always be a single member of the first address family at the
-// beginning of the interleaved list.
-// Addresses that are neither IPv4 nor IPv6 are treated as part of a third
-// "unknown" family for interleaving.
-// See: https://datatracker.ietf.org/doc/html/rfc8305#autoid-6
-func interleaveAddresses(addrs []resolver.Address) []resolver.Address {
- familyAddrsMap := map[ipAddrFamily][]resolver.Address{}
- interleavingOrder := []ipAddrFamily{}
- for _, addr := range addrs {
- family := addressFamily(addr.Addr)
- if _, found := familyAddrsMap[family]; !found {
- interleavingOrder = append(interleavingOrder, family)
- }
- familyAddrsMap[family] = append(familyAddrsMap[family], addr)
- }
-
- interleavedAddrs := make([]resolver.Address, 0, len(addrs))
-
- for curFamilyIdx := 0; len(interleavedAddrs) < len(addrs); curFamilyIdx = (curFamilyIdx + 1) % len(interleavingOrder) {
- // Some IP types may have fewer addresses than others, so we look for
- // the next type that has a remaining member to add to the interleaved
- // list.
- family := interleavingOrder[curFamilyIdx]
- remainingMembers := familyAddrsMap[family]
- if len(remainingMembers) > 0 {
- interleavedAddrs = append(interleavedAddrs, remainingMembers[0])
- familyAddrsMap[family] = remainingMembers[1:]
- }
- }
-
- return interleavedAddrs
-}
-
-// addressFamily returns the ipAddrFamily after parsing the address string.
-// If the address isn't of the format "ip-address:port", it returns
-// ipAddrFamilyUnknown. The address may be valid even if it's not an IP when
-// using a resolver like passthrough where the address may be a hostname in
-// some format that the dialer can resolve.
-func addressFamily(address string) ipAddrFamily {
- // Parse the IP after removing the port.
- host, _, err := net.SplitHostPort(address)
- if err != nil {
- return ipAddrFamilyUnknown
- }
- ip, err := netip.ParseAddr(host)
- if err != nil {
- return ipAddrFamilyUnknown
- }
- switch {
- case ip.Is4() || ip.Is4In6():
- return ipAddrFamilyV4
- case ip.Is6():
- return ipAddrFamilyV6
- default:
- return ipAddrFamilyUnknown
- }
-}
-
-// reconcileSubConnsLocked updates the active subchannels based on a new address
-// list from the resolver. It does this by:
-// - closing subchannels: any existing subchannels associated with addresses
-// that are no longer in the updated list are shut down.
-// - removing subchannels: entries for these closed subchannels are removed
-// from the subchannel map.
-//
-// This ensures that the subchannel map accurately reflects the current set of
-// addresses received from the name resolver.
-func (b *pickfirstBalancer) reconcileSubConnsLocked(newAddrs []resolver.Address) {
- newAddrsMap := resolver.NewAddressMapV2[bool]()
- for _, addr := range newAddrs {
- newAddrsMap.Set(addr, true)
- }
-
- for _, oldAddr := range b.subConns.Keys() {
- if _, ok := newAddrsMap.Get(oldAddr); ok {
- continue
- }
- val, _ := b.subConns.Get(oldAddr)
- val.subConn.Shutdown()
- b.subConns.Delete(oldAddr)
- }
-}
-
-// shutdownRemainingLocked shuts down remaining subConns. Called when a subConn
-// becomes ready, which means that all other subConn must be shutdown.
-func (b *pickfirstBalancer) shutdownRemainingLocked(selected *scData) {
- b.cancelConnectionTimer()
- for _, sd := range b.subConns.Values() {
- if sd.subConn != selected.subConn {
- sd.subConn.Shutdown()
- }
- }
- b.subConns = resolver.NewAddressMapV2[*scData]()
- b.subConns.Set(selected.addr, selected)
-}
-
-// requestConnectionLocked starts connecting on the subchannel corresponding to
-// the current address. If no subchannel exists, one is created. If the current
-// subchannel is in TransientFailure, a connection to the next address is
-// attempted until a subchannel is found.
-func (b *pickfirstBalancer) requestConnectionLocked() {
- if !b.addressList.isValid() {
- return
- }
- var lastErr error
- for valid := true; valid; valid = b.addressList.increment() {
- curAddr := b.addressList.currentAddress()
- sd, ok := b.subConns.Get(curAddr)
- if !ok {
- var err error
- // We want to assign the new scData to sd from the outer scope,
- // hence we can't use := below.
- sd, err = b.newSCData(curAddr)
- if err != nil {
- // This should never happen, unless the clientConn is being shut
- // down.
- if b.logger.V(2) {
- b.logger.Infof("Failed to create a subConn for address %v: %v", curAddr.String(), err)
- }
- // Do nothing, the LB policy will be closed soon.
- return
- }
- b.subConns.Set(curAddr, sd)
- }
-
- switch sd.rawConnectivityState {
- case connectivity.Idle:
- sd.subConn.Connect()
- b.scheduleNextConnectionLocked()
- return
- case connectivity.TransientFailure:
- // The SubConn is being re-used and failed during a previous pass
- // over the addressList. It has not completed backoff yet.
- // Mark it as having failed and try the next address.
- sd.connectionFailedInFirstPass = true
- lastErr = sd.lastErr
- continue
- case connectivity.Connecting:
- // Wait for the connection attempt to complete or the timer to fire
- // before attempting the next address.
- b.scheduleNextConnectionLocked()
- return
- default:
- b.logger.Errorf("SubConn with unexpected state %v present in SubConns map.", sd.rawConnectivityState)
- return
-
- }
- }
-
- // All the remaining addresses in the list are in TRANSIENT_FAILURE, end the
- // first pass if possible.
- b.endFirstPassIfPossibleLocked(lastErr)
-}
-
-func (b *pickfirstBalancer) scheduleNextConnectionLocked() {
- b.cancelConnectionTimer()
- if !b.addressList.hasNext() {
- return
+func (b *pickfirstBalancer) updateSubConnState(subConn balancer.SubConn, state balancer.SubConnState) {
+ if b.logger.V(2) {
+ b.logger.Infof("Received SubConn state update: %p, %+v", subConn, state)
}
- curAddr := b.addressList.currentAddress()
- cancelled := false // Access to this is protected by the balancer's mutex.
- closeFn := internal.TimeAfterFunc(connectionDelayInterval, func() {
- b.mu.Lock()
- defer b.mu.Unlock()
- // If the scheduled task is cancelled while acquiring the mutex, return.
- if cancelled {
- return
- }
+ if b.subConn != subConn {
if b.logger.V(2) {
- b.logger.Infof("Happy Eyeballs timer expired while waiting for connection to %q.", curAddr.Addr)
- }
- if b.addressList.increment() {
- b.requestConnectionLocked()
+ b.logger.Infof("Ignored state change because subConn is not recognized")
}
- })
- // Access to the cancellation callback held by the balancer is guarded by
- // the balancer's mutex, so it's safe to set the boolean from the callback.
- b.cancelConnectionTimer = sync.OnceFunc(func() {
- cancelled = true
- closeFn()
- })
-}
-
-func (b *pickfirstBalancer) updateSubConnState(sd *scData, newState balancer.SubConnState) {
- b.mu.Lock()
- defer b.mu.Unlock()
- oldState := sd.rawConnectivityState
- sd.rawConnectivityState = newState.ConnectivityState
- // Previously relevant SubConns can still callback with state updates.
- // To prevent pickers from returning these obsolete SubConns, this logic
- // is included to check if the current list of active SubConns includes this
- // SubConn.
- if !b.isActiveSCData(sd) {
return
}
- if newState.ConnectivityState == connectivity.Shutdown {
- sd.effectiveState = connectivity.Shutdown
+ if state.ConnectivityState == connectivity.Shutdown {
+ b.subConn = nil
return
}
- // Record a connection attempt when exiting CONNECTING.
- if newState.ConnectivityState == connectivity.TransientFailure {
- sd.connectionFailedInFirstPass = true
- connectionAttemptsFailedMetric.Record(b.metricsRecorder, 1, b.target)
- }
-
- if newState.ConnectivityState == connectivity.Ready {
- connectionAttemptsSucceededMetric.Record(b.metricsRecorder, 1, b.target)
- b.shutdownRemainingLocked(sd)
- if !b.addressList.seekTo(sd.addr) {
- // This should not fail as we should have only one SubConn after
- // entering READY. The SubConn should be present in the addressList.
- b.logger.Errorf("Address %q not found address list in %v", sd.addr, b.addressList.addresses)
- return
- }
- if !b.healthCheckingEnabled {
- if b.logger.V(2) {
- b.logger.Infof("SubConn %p reported connectivity state READY and the health listener is disabled. Transitioning SubConn to READY.", sd.subConn)
- }
-
- sd.effectiveState = connectivity.Ready
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.Ready,
- Picker: &picker{result: balancer.PickResult{SubConn: sd.subConn}},
- })
+ switch state.ConnectivityState {
+ case connectivity.Ready:
+ b.cc.UpdateState(balancer.State{
+ ConnectivityState: state.ConnectivityState,
+ Picker: &picker{result: balancer.PickResult{SubConn: subConn}},
+ })
+ case connectivity.Connecting:
+ if b.state == connectivity.TransientFailure {
+ // We stay in TransientFailure until we are Ready. See A62.
return
}
- if b.logger.V(2) {
- b.logger.Infof("SubConn %p reported connectivity state READY. Registering health listener.", sd.subConn)
- }
- // Send a CONNECTING update to take the SubConn out of sticky-TF if
- // required.
- sd.effectiveState = connectivity.Connecting
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.Connecting,
+ b.cc.UpdateState(balancer.State{
+ ConnectivityState: state.ConnectivityState,
Picker: &picker{err: balancer.ErrNoSubConnAvailable},
})
- sd.subConn.RegisterHealthListener(func(scs balancer.SubConnState) {
- b.updateSubConnHealthState(sd, scs)
- })
- return
- }
-
- // If the LB policy is READY, and it receives a subchannel state change,
- // it means that the READY subchannel has failed.
- // A SubConn can also transition from CONNECTING directly to IDLE when
- // a transport is successfully created, but the connection fails
- // before the SubConn can send the notification for READY. We treat
- // this as a successful connection and transition to IDLE.
- // TODO: https://github.com/grpc/grpc-go/issues/7862 - Remove the second
- // part of the if condition below once the issue is fixed.
- if oldState == connectivity.Ready || (oldState == connectivity.Connecting && newState.ConnectivityState == connectivity.Idle) {
- // Once a transport fails, the balancer enters IDLE and starts from
- // the first address when the picker is used.
- b.shutdownRemainingLocked(sd)
- sd.effectiveState = newState.ConnectivityState
- // READY SubConn interspliced in between CONNECTING and IDLE, need to
- // account for that.
- if oldState == connectivity.Connecting {
- // A known issue (https://github.com/grpc/grpc-go/issues/7862)
- // causes a race that prevents the READY state change notification.
- // This works around it.
- connectionAttemptsSucceededMetric.Record(b.metricsRecorder, 1, b.target)
- }
- disconnectionsMetric.Record(b.metricsRecorder, 1, b.target)
- b.addressList.reset()
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.Idle,
- Picker: &idlePicker{exitIdle: sync.OnceFunc(b.ExitIdle)},
- })
- return
- }
-
- if b.firstPass {
- switch newState.ConnectivityState {
- case connectivity.Connecting:
- // The effective state can be in either IDLE, CONNECTING or
- // TRANSIENT_FAILURE. If it's TRANSIENT_FAILURE, stay in
- // TRANSIENT_FAILURE until it's READY. See A62.
- if sd.effectiveState != connectivity.TransientFailure {
- sd.effectiveState = connectivity.Connecting
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.Connecting,
- Picker: &picker{err: balancer.ErrNoSubConnAvailable},
- })
- }
- case connectivity.TransientFailure:
- sd.lastErr = newState.ConnectionError
- sd.effectiveState = connectivity.TransientFailure
- // Since we're re-using common SubConns while handling resolver
- // updates, we could receive an out of turn TRANSIENT_FAILURE from
- // a pass over the previous address list. Happy Eyeballs will also
- // cause out of order updates to arrive.
-
- if curAddr := b.addressList.currentAddress(); equalAddressIgnoringBalAttributes(&curAddr, &sd.addr) {
- b.cancelConnectionTimer()
- if b.addressList.increment() {
- b.requestConnectionLocked()
- return
- }
- }
-
- // End the first pass if we've seen a TRANSIENT_FAILURE from all
- // SubConns once.
- b.endFirstPassIfPossibleLocked(newState.ConnectionError)
- }
- return
- }
-
- // We have finished the first pass, keep re-connecting failing SubConns.
- switch newState.ConnectivityState {
- case connectivity.TransientFailure:
- b.numTF = (b.numTF + 1) % b.subConns.Len()
- sd.lastErr = newState.ConnectionError
- if b.numTF%b.subConns.Len() == 0 {
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.TransientFailure,
- Picker: &picker{err: newState.ConnectionError},
- })
- }
- // We don't need to request re-resolution since the SubConn already
- // does that before reporting TRANSIENT_FAILURE.
- // TODO: #7534 - Move re-resolution requests from SubConn into
- // pick_first.
case connectivity.Idle:
- sd.subConn.Connect()
- }
-}
-
-// endFirstPassIfPossibleLocked ends the first happy-eyeballs pass if all the
-// addresses are tried and their SubConns have reported a failure.
-func (b *pickfirstBalancer) endFirstPassIfPossibleLocked(lastErr error) {
- // An optimization to avoid iterating over the entire SubConn map.
- if b.addressList.isValid() {
- return
- }
- // Connect() has been called on all the SubConns. The first pass can be
- // ended if all the SubConns have reported a failure.
- for _, sd := range b.subConns.Values() {
- if !sd.connectionFailedInFirstPass {
+ if b.state == connectivity.TransientFailure {
+ // We stay in TransientFailure until we are Ready. Also kick the
+ // subConn out of Idle into Connecting. See A62.
+ b.subConn.Connect()
return
}
- }
- b.firstPass = false
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.TransientFailure,
- Picker: &picker{err: lastErr},
- })
- // Start re-connecting all the SubConns that are already in IDLE.
- for _, sd := range b.subConns.Values() {
- if sd.rawConnectivityState == connectivity.Idle {
- sd.subConn.Connect()
- }
- }
-}
-
-func (b *pickfirstBalancer) isActiveSCData(sd *scData) bool {
- activeSD, found := b.subConns.Get(sd.addr)
- return found && activeSD == sd
-}
-
-func (b *pickfirstBalancer) updateSubConnHealthState(sd *scData, state balancer.SubConnState) {
- b.mu.Lock()
- defer b.mu.Unlock()
- // Previously relevant SubConns can still callback with state updates.
- // To prevent pickers from returning these obsolete SubConns, this logic
- // is included to check if the current list of active SubConns includes
- // this SubConn.
- if !b.isActiveSCData(sd) {
- return
- }
- sd.effectiveState = state.ConnectivityState
- switch state.ConnectivityState {
- case connectivity.Ready:
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.Ready,
- Picker: &picker{result: balancer.PickResult{SubConn: sd.subConn}},
+ b.cc.UpdateState(balancer.State{
+ ConnectivityState: state.ConnectivityState,
+ Picker: &idlePicker{subConn: subConn},
})
case connectivity.TransientFailure:
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.TransientFailure,
- Picker: &picker{err: fmt.Errorf("pickfirst: health check failure: %v", state.ConnectionError)},
- })
- case connectivity.Connecting:
- b.updateBalancerState(balancer.State{
- ConnectivityState: connectivity.Connecting,
- Picker: &picker{err: balancer.ErrNoSubConnAvailable},
+ b.cc.UpdateState(balancer.State{
+ ConnectivityState: state.ConnectivityState,
+ Picker: &picker{err: state.ConnectionError},
})
- default:
- b.logger.Errorf("Got unexpected health update for SubConn %p: %v", state)
}
+ b.state = state.ConnectivityState
}
-// updateBalancerState stores the state reported to the channel and calls
-// ClientConn.UpdateState(). As an optimization, it avoids sending duplicate
-// updates to the channel.
-func (b *pickfirstBalancer) updateBalancerState(newState balancer.State) {
- // In case of TransientFailures allow the picker to be updated to update
- // the connectivity error, in all other cases don't send duplicate state
- // updates.
- if newState.ConnectivityState == b.state && b.state != connectivity.TransientFailure {
- return
- }
- b.forceUpdateConcludedStateLocked(newState)
+func (b *pickfirstBalancer) Close() {
}
-// forceUpdateConcludedStateLocked stores the state reported to the channel and
-// calls ClientConn.UpdateState().
-// A separate function is defined to force update the ClientConn state since the
-// channel doesn't correctly assume that LB policies start in CONNECTING and
-// relies on LB policy to send an initial CONNECTING update.
-func (b *pickfirstBalancer) forceUpdateConcludedStateLocked(newState balancer.State) {
- b.state = newState.ConnectivityState
- b.cc.UpdateState(newState)
+func (b *pickfirstBalancer) ExitIdle() {
+ if b.subConn != nil && b.state == connectivity.Idle {
+ b.subConn.Connect()
+ }
}
type picker struct {
@@ -861,101 +282,10 @@ func (p *picker) Pick(balancer.PickInfo) (balancer.PickResult, error) {
// idlePicker is used when the SubConn is IDLE and kicks the SubConn into
// CONNECTING when Pick is called.
type idlePicker struct {
- exitIdle func()
+ subConn balancer.SubConn
}
func (i *idlePicker) Pick(balancer.PickInfo) (balancer.PickResult, error) {
- i.exitIdle()
+ i.subConn.Connect()
return balancer.PickResult{}, balancer.ErrNoSubConnAvailable
}
-
-// addressList manages sequentially iterating over addresses present in a list
-// of endpoints. It provides a 1 dimensional view of the addresses present in
-// the endpoints.
-// This type is not safe for concurrent access.
-type addressList struct {
- addresses []resolver.Address
- idx int
-}
-
-func (al *addressList) isValid() bool {
- return al.idx < len(al.addresses)
-}
-
-func (al *addressList) size() int {
- return len(al.addresses)
-}
-
-// increment moves to the next index in the address list.
-// This method returns false if it went off the list, true otherwise.
-func (al *addressList) increment() bool {
- if !al.isValid() {
- return false
- }
- al.idx++
- return al.idx < len(al.addresses)
-}
-
-// currentAddress returns the current address pointed to in the addressList.
-// If the list is in an invalid state, it returns an empty address instead.
-func (al *addressList) currentAddress() resolver.Address {
- if !al.isValid() {
- return resolver.Address{}
- }
- return al.addresses[al.idx]
-}
-
-func (al *addressList) reset() {
- al.idx = 0
-}
-
-func (al *addressList) updateAddrs(addrs []resolver.Address) {
- al.addresses = addrs
- al.reset()
-}
-
-// seekTo returns false if the needle was not found and the current index was
-// left unchanged.
-func (al *addressList) seekTo(needle resolver.Address) bool {
- for ai, addr := range al.addresses {
- if !equalAddressIgnoringBalAttributes(&addr, &needle) {
- continue
- }
- al.idx = ai
- return true
- }
- return false
-}
-
-// hasNext returns whether incrementing the addressList will result in moving
-// past the end of the list. If the list has already moved past the end, it
-// returns false.
-func (al *addressList) hasNext() bool {
- if !al.isValid() {
- return false
- }
- return al.idx+1 < len(al.addresses)
-}
-
-// equalAddressIgnoringBalAttributes returns true is a and b are considered
-// equal. This is different from the Equal method on the resolver.Address type
-// which considers all fields to determine equality. Here, we only consider
-// fields that are meaningful to the SubConn.
-func equalAddressIgnoringBalAttributes(a, b *resolver.Address) bool {
- return a.Addr == b.Addr && a.ServerName == b.ServerName &&
- a.Attributes.Equal(b.Attributes)
-}
-
-// weightAttribute is a convenience function which returns the value of the
-// weight endpoint Attribute.
-//
-// When used in the xDS context, the weight attribute is guaranteed to be
-// non-zero. But, when used in a non-xDS context, the weight attribute could be
-// unset. A Default of 1 is used in the latter case.
-func weightAttribute(e resolver.Endpoint) uint32 {
- w := weight.FromEndpoint(e).Weight
- if w == 0 {
- return 1
- }
- return w
-}
diff --git a/vendor/google.golang.org/grpc/balancer/pickfirst/pickfirstleaf/pickfirstleaf.go b/vendor/google.golang.org/grpc/balancer/pickfirst/pickfirstleaf/pickfirstleaf.go
new file mode 100644
index 0000000000..9ffdd28a01
--- /dev/null
+++ b/vendor/google.golang.org/grpc/balancer/pickfirst/pickfirstleaf/pickfirstleaf.go
@@ -0,0 +1,913 @@
+/*
+ *
+ * Copyright 2024 gRPC 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 pickfirstleaf contains the pick_first load balancing policy which
+// will be the universal leaf policy after dualstack changes are implemented.
+//
+// # Experimental
+//
+// Notice: This package is EXPERIMENTAL and may be changed or removed in a
+// later release.
+package pickfirstleaf
+
+import (
+ "encoding/json"
+ "errors"
+ "fmt"
+ "net"
+ "net/netip"
+ "sync"
+ "time"
+
+ "google.golang.org/grpc/balancer"
+ "google.golang.org/grpc/balancer/pickfirst/internal"
+ "google.golang.org/grpc/connectivity"
+ expstats "google.golang.org/grpc/experimental/stats"
+ "google.golang.org/grpc/grpclog"
+ "google.golang.org/grpc/internal/envconfig"
+ internalgrpclog "google.golang.org/grpc/internal/grpclog"
+ "google.golang.org/grpc/internal/pretty"
+ "google.golang.org/grpc/resolver"
+ "google.golang.org/grpc/serviceconfig"
+)
+
+func init() {
+ if envconfig.NewPickFirstEnabled {
+ // Register as the default pick_first balancer.
+ Name = "pick_first"
+ }
+ balancer.Register(pickfirstBuilder{})
+}
+
+// enableHealthListenerKeyType is a unique key type used in resolver
+// attributes to indicate whether the health listener usage is enabled.
+type enableHealthListenerKeyType struct{}
+
+var (
+ logger = grpclog.Component("pick-first-leaf-lb")
+ // Name is the name of the pick_first_leaf balancer.
+ // It is changed to "pick_first" in init() if this balancer is to be
+ // registered as the default pickfirst.
+ Name = "pick_first_leaf"
+ disconnectionsMetric = expstats.RegisterInt64Count(expstats.MetricDescriptor{
+ Name: "grpc.lb.pick_first.disconnections",
+ Description: "EXPERIMENTAL. Number of times the selected subchannel becomes disconnected.",
+ Unit: "{disconnection}",
+ Labels: []string{"grpc.target"},
+ Default: false,
+ })
+ connectionAttemptsSucceededMetric = expstats.RegisterInt64Count(expstats.MetricDescriptor{
+ Name: "grpc.lb.pick_first.connection_attempts_succeeded",
+ Description: "EXPERIMENTAL. Number of successful connection attempts.",
+ Unit: "{attempt}",
+ Labels: []string{"grpc.target"},
+ Default: false,
+ })
+ connectionAttemptsFailedMetric = expstats.RegisterInt64Count(expstats.MetricDescriptor{
+ Name: "grpc.lb.pick_first.connection_attempts_failed",
+ Description: "EXPERIMENTAL. Number of failed connection attempts.",
+ Unit: "{attempt}",
+ Labels: []string{"grpc.target"},
+ Default: false,
+ })
+)
+
+const (
+ // TODO: change to pick-first when this becomes the default pick_first policy.
+ logPrefix = "[pick-first-leaf-lb %p] "
+ // connectionDelayInterval is the time to wait for during the happy eyeballs
+ // pass before starting the next connection attempt.
+ connectionDelayInterval = 250 * time.Millisecond
+)
+
+type ipAddrFamily int
+
+const (
+ // ipAddrFamilyUnknown represents strings that can't be parsed as an IP
+ // address.
+ ipAddrFamilyUnknown ipAddrFamily = iota
+ ipAddrFamilyV4
+ ipAddrFamilyV6
+)
+
+type pickfirstBuilder struct{}
+
+func (pickfirstBuilder) Build(cc balancer.ClientConn, bo balancer.BuildOptions) balancer.Balancer {
+ b := &pickfirstBalancer{
+ cc: cc,
+ target: bo.Target.String(),
+ metricsRecorder: cc.MetricsRecorder(),
+
+ subConns: resolver.NewAddressMapV2[*scData](),
+ state: connectivity.Connecting,
+ cancelConnectionTimer: func() {},
+ }
+ b.logger = internalgrpclog.NewPrefixLogger(logger, fmt.Sprintf(logPrefix, b))
+ return b
+}
+
+func (b pickfirstBuilder) Name() string {
+ return Name
+}
+
+func (pickfirstBuilder) ParseConfig(js json.RawMessage) (serviceconfig.LoadBalancingConfig, error) {
+ var cfg pfConfig
+ if err := json.Unmarshal(js, &cfg); err != nil {
+ return nil, fmt.Errorf("pickfirst: unable to unmarshal LB policy config: %s, error: %v", string(js), err)
+ }
+ return cfg, nil
+}
+
+// EnableHealthListener updates the state to configure pickfirst for using a
+// generic health listener.
+func EnableHealthListener(state resolver.State) resolver.State {
+ state.Attributes = state.Attributes.WithValue(enableHealthListenerKeyType{}, true)
+ return state
+}
+
+type pfConfig struct {
+ serviceconfig.LoadBalancingConfig `json:"-"`
+
+ // If set to true, instructs the LB policy to shuffle the order of the list
+ // of endpoints received from the name resolver before attempting to
+ // connect to them.
+ ShuffleAddressList bool `json:"shuffleAddressList"`
+}
+
+// scData keeps track of the current state of the subConn.
+// It is not safe for concurrent access.
+type scData struct {
+ // The following fields are initialized at build time and read-only after
+ // that.
+ subConn balancer.SubConn
+ addr resolver.Address
+
+ rawConnectivityState connectivity.State
+ // The effective connectivity state based on raw connectivity, health state
+ // and after following sticky TransientFailure behaviour defined in A62.
+ effectiveState connectivity.State
+ lastErr error
+ connectionFailedInFirstPass bool
+}
+
+func (b *pickfirstBalancer) newSCData(addr resolver.Address) (*scData, error) {
+ sd := &scData{
+ rawConnectivityState: connectivity.Idle,
+ effectiveState: connectivity.Idle,
+ addr: addr,
+ }
+ sc, err := b.cc.NewSubConn([]resolver.Address{addr}, balancer.NewSubConnOptions{
+ StateListener: func(state balancer.SubConnState) {
+ b.updateSubConnState(sd, state)
+ },
+ })
+ if err != nil {
+ return nil, err
+ }
+ sd.subConn = sc
+ return sd, nil
+}
+
+type pickfirstBalancer struct {
+ // The following fields are initialized at build time and read-only after
+ // that and therefore do not need to be guarded by a mutex.
+ logger *internalgrpclog.PrefixLogger
+ cc balancer.ClientConn
+ target string
+ metricsRecorder expstats.MetricsRecorder // guaranteed to be non nil
+
+ // The mutex is used to ensure synchronization of updates triggered
+ // from the idle picker and the already serialized resolver,
+ // SubConn state updates.
+ mu sync.Mutex
+ // State reported to the channel based on SubConn states and resolver
+ // updates.
+ state connectivity.State
+ // scData for active subonns mapped by address.
+ subConns *resolver.AddressMapV2[*scData]
+ addressList addressList
+ firstPass bool
+ numTF int
+ cancelConnectionTimer func()
+ healthCheckingEnabled bool
+}
+
+// ResolverError is called by the ClientConn when the name resolver produces
+// an error or when pickfirst determined the resolver update to be invalid.
+func (b *pickfirstBalancer) ResolverError(err error) {
+ b.mu.Lock()
+ defer b.mu.Unlock()
+ b.resolverErrorLocked(err)
+}
+
+func (b *pickfirstBalancer) resolverErrorLocked(err error) {
+ if b.logger.V(2) {
+ b.logger.Infof("Received error from the name resolver: %v", err)
+ }
+
+ // The picker will not change since the balancer does not currently
+ // report an error. If the balancer hasn't received a single good resolver
+ // update yet, transition to TRANSIENT_FAILURE.
+ if b.state != connectivity.TransientFailure && b.addressList.size() > 0 {
+ if b.logger.V(2) {
+ b.logger.Infof("Ignoring resolver error because balancer is using a previous good update.")
+ }
+ return
+ }
+
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.TransientFailure,
+ Picker: &picker{err: fmt.Errorf("name resolver error: %v", err)},
+ })
+}
+
+func (b *pickfirstBalancer) UpdateClientConnState(state balancer.ClientConnState) error {
+ b.mu.Lock()
+ defer b.mu.Unlock()
+ b.cancelConnectionTimer()
+ if len(state.ResolverState.Addresses) == 0 && len(state.ResolverState.Endpoints) == 0 {
+ // Cleanup state pertaining to the previous resolver state.
+ // Treat an empty address list like an error by calling b.ResolverError.
+ b.closeSubConnsLocked()
+ b.addressList.updateAddrs(nil)
+ b.resolverErrorLocked(errors.New("produced zero addresses"))
+ return balancer.ErrBadResolverState
+ }
+ b.healthCheckingEnabled = state.ResolverState.Attributes.Value(enableHealthListenerKeyType{}) != nil
+ cfg, ok := state.BalancerConfig.(pfConfig)
+ if state.BalancerConfig != nil && !ok {
+ return fmt.Errorf("pickfirst: received illegal BalancerConfig (type %T): %v: %w", state.BalancerConfig, state.BalancerConfig, balancer.ErrBadResolverState)
+ }
+
+ if b.logger.V(2) {
+ b.logger.Infof("Received new config %s, resolver state %s", pretty.ToJSON(cfg), pretty.ToJSON(state.ResolverState))
+ }
+
+ var newAddrs []resolver.Address
+ if endpoints := state.ResolverState.Endpoints; len(endpoints) != 0 {
+ // Perform the optional shuffling described in gRFC A62. The shuffling
+ // will change the order of endpoints but not touch the order of the
+ // addresses within each endpoint. - A61
+ if cfg.ShuffleAddressList {
+ endpoints = append([]resolver.Endpoint{}, endpoints...)
+ internal.RandShuffle(len(endpoints), func(i, j int) { endpoints[i], endpoints[j] = endpoints[j], endpoints[i] })
+ }
+
+ // "Flatten the list by concatenating the ordered list of addresses for
+ // each of the endpoints, in order." - A61
+ for _, endpoint := range endpoints {
+ newAddrs = append(newAddrs, endpoint.Addresses...)
+ }
+ } else {
+ // Endpoints not set, process addresses until we migrate resolver
+ // emissions fully to Endpoints. The top channel does wrap emitted
+ // addresses with endpoints, however some balancers such as weighted
+ // target do not forward the corresponding correct endpoints down/split
+ // endpoints properly. Once all balancers correctly forward endpoints
+ // down, can delete this else conditional.
+ newAddrs = state.ResolverState.Addresses
+ if cfg.ShuffleAddressList {
+ newAddrs = append([]resolver.Address{}, newAddrs...)
+ internal.RandShuffle(len(newAddrs), func(i, j int) { newAddrs[i], newAddrs[j] = newAddrs[j], newAddrs[i] })
+ }
+ }
+
+ // If an address appears in multiple endpoints or in the same endpoint
+ // multiple times, we keep it only once. We will create only one SubConn
+ // for the address because an AddressMap is used to store SubConns.
+ // Not de-duplicating would result in attempting to connect to the same
+ // SubConn multiple times in the same pass. We don't want this.
+ newAddrs = deDupAddresses(newAddrs)
+ newAddrs = interleaveAddresses(newAddrs)
+
+ prevAddr := b.addressList.currentAddress()
+ prevSCData, found := b.subConns.Get(prevAddr)
+ prevAddrsCount := b.addressList.size()
+ isPrevRawConnectivityStateReady := found && prevSCData.rawConnectivityState == connectivity.Ready
+ b.addressList.updateAddrs(newAddrs)
+
+ // If the previous ready SubConn exists in new address list,
+ // keep this connection and don't create new SubConns.
+ if isPrevRawConnectivityStateReady && b.addressList.seekTo(prevAddr) {
+ return nil
+ }
+
+ b.reconcileSubConnsLocked(newAddrs)
+ // If it's the first resolver update or the balancer was already READY
+ // (but the new address list does not contain the ready SubConn) or
+ // CONNECTING, enter CONNECTING.
+ // We may be in TRANSIENT_FAILURE due to a previous empty address list,
+ // we should still enter CONNECTING because the sticky TF behaviour
+ // mentioned in A62 applies only when the TRANSIENT_FAILURE is reported
+ // due to connectivity failures.
+ if isPrevRawConnectivityStateReady || b.state == connectivity.Connecting || prevAddrsCount == 0 {
+ // Start connection attempt at first address.
+ b.forceUpdateConcludedStateLocked(balancer.State{
+ ConnectivityState: connectivity.Connecting,
+ Picker: &picker{err: balancer.ErrNoSubConnAvailable},
+ })
+ b.startFirstPassLocked()
+ } else if b.state == connectivity.TransientFailure {
+ // If we're in TRANSIENT_FAILURE, we stay in TRANSIENT_FAILURE until
+ // we're READY. See A62.
+ b.startFirstPassLocked()
+ }
+ return nil
+}
+
+// UpdateSubConnState is unused as a StateListener is always registered when
+// creating SubConns.
+func (b *pickfirstBalancer) UpdateSubConnState(subConn balancer.SubConn, state balancer.SubConnState) {
+ b.logger.Errorf("UpdateSubConnState(%v, %+v) called unexpectedly", subConn, state)
+}
+
+func (b *pickfirstBalancer) Close() {
+ b.mu.Lock()
+ defer b.mu.Unlock()
+ b.closeSubConnsLocked()
+ b.cancelConnectionTimer()
+ b.state = connectivity.Shutdown
+}
+
+// ExitIdle moves the balancer out of idle state. It can be called concurrently
+// by the idlePicker and clientConn so access to variables should be
+// synchronized.
+func (b *pickfirstBalancer) ExitIdle() {
+ b.mu.Lock()
+ defer b.mu.Unlock()
+ if b.state == connectivity.Idle {
+ // Move the balancer into CONNECTING state immediately. This is done to
+ // avoid staying in IDLE if a resolver update arrives before the first
+ // SubConn reports CONNECTING.
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.Connecting,
+ Picker: &picker{err: balancer.ErrNoSubConnAvailable},
+ })
+ b.startFirstPassLocked()
+ }
+}
+
+func (b *pickfirstBalancer) startFirstPassLocked() {
+ b.firstPass = true
+ b.numTF = 0
+ // Reset the connection attempt record for existing SubConns.
+ for _, sd := range b.subConns.Values() {
+ sd.connectionFailedInFirstPass = false
+ }
+ b.requestConnectionLocked()
+}
+
+func (b *pickfirstBalancer) closeSubConnsLocked() {
+ for _, sd := range b.subConns.Values() {
+ sd.subConn.Shutdown()
+ }
+ b.subConns = resolver.NewAddressMapV2[*scData]()
+}
+
+// deDupAddresses ensures that each address appears only once in the slice.
+func deDupAddresses(addrs []resolver.Address) []resolver.Address {
+ seenAddrs := resolver.NewAddressMapV2[*scData]()
+ retAddrs := []resolver.Address{}
+
+ for _, addr := range addrs {
+ if _, ok := seenAddrs.Get(addr); ok {
+ continue
+ }
+ retAddrs = append(retAddrs, addr)
+ }
+ return retAddrs
+}
+
+// interleaveAddresses interleaves addresses of both families (IPv4 and IPv6)
+// as per RFC-8305 section 4.
+// Whichever address family is first in the list is followed by an address of
+// the other address family; that is, if the first address in the list is IPv6,
+// then the first IPv4 address should be moved up in the list to be second in
+// the list. It doesn't support configuring "First Address Family Count", i.e.
+// there will always be a single member of the first address family at the
+// beginning of the interleaved list.
+// Addresses that are neither IPv4 nor IPv6 are treated as part of a third
+// "unknown" family for interleaving.
+// See: https://datatracker.ietf.org/doc/html/rfc8305#autoid-6
+func interleaveAddresses(addrs []resolver.Address) []resolver.Address {
+ familyAddrsMap := map[ipAddrFamily][]resolver.Address{}
+ interleavingOrder := []ipAddrFamily{}
+ for _, addr := range addrs {
+ family := addressFamily(addr.Addr)
+ if _, found := familyAddrsMap[family]; !found {
+ interleavingOrder = append(interleavingOrder, family)
+ }
+ familyAddrsMap[family] = append(familyAddrsMap[family], addr)
+ }
+
+ interleavedAddrs := make([]resolver.Address, 0, len(addrs))
+
+ for curFamilyIdx := 0; len(interleavedAddrs) < len(addrs); curFamilyIdx = (curFamilyIdx + 1) % len(interleavingOrder) {
+ // Some IP types may have fewer addresses than others, so we look for
+ // the next type that has a remaining member to add to the interleaved
+ // list.
+ family := interleavingOrder[curFamilyIdx]
+ remainingMembers := familyAddrsMap[family]
+ if len(remainingMembers) > 0 {
+ interleavedAddrs = append(interleavedAddrs, remainingMembers[0])
+ familyAddrsMap[family] = remainingMembers[1:]
+ }
+ }
+
+ return interleavedAddrs
+}
+
+// addressFamily returns the ipAddrFamily after parsing the address string.
+// If the address isn't of the format "ip-address:port", it returns
+// ipAddrFamilyUnknown. The address may be valid even if it's not an IP when
+// using a resolver like passthrough where the address may be a hostname in
+// some format that the dialer can resolve.
+func addressFamily(address string) ipAddrFamily {
+ // Parse the IP after removing the port.
+ host, _, err := net.SplitHostPort(address)
+ if err != nil {
+ return ipAddrFamilyUnknown
+ }
+ ip, err := netip.ParseAddr(host)
+ if err != nil {
+ return ipAddrFamilyUnknown
+ }
+ switch {
+ case ip.Is4() || ip.Is4In6():
+ return ipAddrFamilyV4
+ case ip.Is6():
+ return ipAddrFamilyV6
+ default:
+ return ipAddrFamilyUnknown
+ }
+}
+
+// reconcileSubConnsLocked updates the active subchannels based on a new address
+// list from the resolver. It does this by:
+// - closing subchannels: any existing subchannels associated with addresses
+// that are no longer in the updated list are shut down.
+// - removing subchannels: entries for these closed subchannels are removed
+// from the subchannel map.
+//
+// This ensures that the subchannel map accurately reflects the current set of
+// addresses received from the name resolver.
+func (b *pickfirstBalancer) reconcileSubConnsLocked(newAddrs []resolver.Address) {
+ newAddrsMap := resolver.NewAddressMapV2[bool]()
+ for _, addr := range newAddrs {
+ newAddrsMap.Set(addr, true)
+ }
+
+ for _, oldAddr := range b.subConns.Keys() {
+ if _, ok := newAddrsMap.Get(oldAddr); ok {
+ continue
+ }
+ val, _ := b.subConns.Get(oldAddr)
+ val.subConn.Shutdown()
+ b.subConns.Delete(oldAddr)
+ }
+}
+
+// shutdownRemainingLocked shuts down remaining subConns. Called when a subConn
+// becomes ready, which means that all other subConn must be shutdown.
+func (b *pickfirstBalancer) shutdownRemainingLocked(selected *scData) {
+ b.cancelConnectionTimer()
+ for _, sd := range b.subConns.Values() {
+ if sd.subConn != selected.subConn {
+ sd.subConn.Shutdown()
+ }
+ }
+ b.subConns = resolver.NewAddressMapV2[*scData]()
+ b.subConns.Set(selected.addr, selected)
+}
+
+// requestConnectionLocked starts connecting on the subchannel corresponding to
+// the current address. If no subchannel exists, one is created. If the current
+// subchannel is in TransientFailure, a connection to the next address is
+// attempted until a subchannel is found.
+func (b *pickfirstBalancer) requestConnectionLocked() {
+ if !b.addressList.isValid() {
+ return
+ }
+ var lastErr error
+ for valid := true; valid; valid = b.addressList.increment() {
+ curAddr := b.addressList.currentAddress()
+ sd, ok := b.subConns.Get(curAddr)
+ if !ok {
+ var err error
+ // We want to assign the new scData to sd from the outer scope,
+ // hence we can't use := below.
+ sd, err = b.newSCData(curAddr)
+ if err != nil {
+ // This should never happen, unless the clientConn is being shut
+ // down.
+ if b.logger.V(2) {
+ b.logger.Infof("Failed to create a subConn for address %v: %v", curAddr.String(), err)
+ }
+ // Do nothing, the LB policy will be closed soon.
+ return
+ }
+ b.subConns.Set(curAddr, sd)
+ }
+
+ switch sd.rawConnectivityState {
+ case connectivity.Idle:
+ sd.subConn.Connect()
+ b.scheduleNextConnectionLocked()
+ return
+ case connectivity.TransientFailure:
+ // The SubConn is being re-used and failed during a previous pass
+ // over the addressList. It has not completed backoff yet.
+ // Mark it as having failed and try the next address.
+ sd.connectionFailedInFirstPass = true
+ lastErr = sd.lastErr
+ continue
+ case connectivity.Connecting:
+ // Wait for the connection attempt to complete or the timer to fire
+ // before attempting the next address.
+ b.scheduleNextConnectionLocked()
+ return
+ default:
+ b.logger.Errorf("SubConn with unexpected state %v present in SubConns map.", sd.rawConnectivityState)
+ return
+
+ }
+ }
+
+ // All the remaining addresses in the list are in TRANSIENT_FAILURE, end the
+ // first pass if possible.
+ b.endFirstPassIfPossibleLocked(lastErr)
+}
+
+func (b *pickfirstBalancer) scheduleNextConnectionLocked() {
+ b.cancelConnectionTimer()
+ if !b.addressList.hasNext() {
+ return
+ }
+ curAddr := b.addressList.currentAddress()
+ cancelled := false // Access to this is protected by the balancer's mutex.
+ closeFn := internal.TimeAfterFunc(connectionDelayInterval, func() {
+ b.mu.Lock()
+ defer b.mu.Unlock()
+ // If the scheduled task is cancelled while acquiring the mutex, return.
+ if cancelled {
+ return
+ }
+ if b.logger.V(2) {
+ b.logger.Infof("Happy Eyeballs timer expired while waiting for connection to %q.", curAddr.Addr)
+ }
+ if b.addressList.increment() {
+ b.requestConnectionLocked()
+ }
+ })
+ // Access to the cancellation callback held by the balancer is guarded by
+ // the balancer's mutex, so it's safe to set the boolean from the callback.
+ b.cancelConnectionTimer = sync.OnceFunc(func() {
+ cancelled = true
+ closeFn()
+ })
+}
+
+func (b *pickfirstBalancer) updateSubConnState(sd *scData, newState balancer.SubConnState) {
+ b.mu.Lock()
+ defer b.mu.Unlock()
+ oldState := sd.rawConnectivityState
+ sd.rawConnectivityState = newState.ConnectivityState
+ // Previously relevant SubConns can still callback with state updates.
+ // To prevent pickers from returning these obsolete SubConns, this logic
+ // is included to check if the current list of active SubConns includes this
+ // SubConn.
+ if !b.isActiveSCData(sd) {
+ return
+ }
+ if newState.ConnectivityState == connectivity.Shutdown {
+ sd.effectiveState = connectivity.Shutdown
+ return
+ }
+
+ // Record a connection attempt when exiting CONNECTING.
+ if newState.ConnectivityState == connectivity.TransientFailure {
+ sd.connectionFailedInFirstPass = true
+ connectionAttemptsFailedMetric.Record(b.metricsRecorder, 1, b.target)
+ }
+
+ if newState.ConnectivityState == connectivity.Ready {
+ connectionAttemptsSucceededMetric.Record(b.metricsRecorder, 1, b.target)
+ b.shutdownRemainingLocked(sd)
+ if !b.addressList.seekTo(sd.addr) {
+ // This should not fail as we should have only one SubConn after
+ // entering READY. The SubConn should be present in the addressList.
+ b.logger.Errorf("Address %q not found address list in %v", sd.addr, b.addressList.addresses)
+ return
+ }
+ if !b.healthCheckingEnabled {
+ if b.logger.V(2) {
+ b.logger.Infof("SubConn %p reported connectivity state READY and the health listener is disabled. Transitioning SubConn to READY.", sd.subConn)
+ }
+
+ sd.effectiveState = connectivity.Ready
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.Ready,
+ Picker: &picker{result: balancer.PickResult{SubConn: sd.subConn}},
+ })
+ return
+ }
+ if b.logger.V(2) {
+ b.logger.Infof("SubConn %p reported connectivity state READY. Registering health listener.", sd.subConn)
+ }
+ // Send a CONNECTING update to take the SubConn out of sticky-TF if
+ // required.
+ sd.effectiveState = connectivity.Connecting
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.Connecting,
+ Picker: &picker{err: balancer.ErrNoSubConnAvailable},
+ })
+ sd.subConn.RegisterHealthListener(func(scs balancer.SubConnState) {
+ b.updateSubConnHealthState(sd, scs)
+ })
+ return
+ }
+
+ // If the LB policy is READY, and it receives a subchannel state change,
+ // it means that the READY subchannel has failed.
+ // A SubConn can also transition from CONNECTING directly to IDLE when
+ // a transport is successfully created, but the connection fails
+ // before the SubConn can send the notification for READY. We treat
+ // this as a successful connection and transition to IDLE.
+ // TODO: https://github.com/grpc/grpc-go/issues/7862 - Remove the second
+ // part of the if condition below once the issue is fixed.
+ if oldState == connectivity.Ready || (oldState == connectivity.Connecting && newState.ConnectivityState == connectivity.Idle) {
+ // Once a transport fails, the balancer enters IDLE and starts from
+ // the first address when the picker is used.
+ b.shutdownRemainingLocked(sd)
+ sd.effectiveState = newState.ConnectivityState
+ // READY SubConn interspliced in between CONNECTING and IDLE, need to
+ // account for that.
+ if oldState == connectivity.Connecting {
+ // A known issue (https://github.com/grpc/grpc-go/issues/7862)
+ // causes a race that prevents the READY state change notification.
+ // This works around it.
+ connectionAttemptsSucceededMetric.Record(b.metricsRecorder, 1, b.target)
+ }
+ disconnectionsMetric.Record(b.metricsRecorder, 1, b.target)
+ b.addressList.reset()
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.Idle,
+ Picker: &idlePicker{exitIdle: sync.OnceFunc(b.ExitIdle)},
+ })
+ return
+ }
+
+ if b.firstPass {
+ switch newState.ConnectivityState {
+ case connectivity.Connecting:
+ // The effective state can be in either IDLE, CONNECTING or
+ // TRANSIENT_FAILURE. If it's TRANSIENT_FAILURE, stay in
+ // TRANSIENT_FAILURE until it's READY. See A62.
+ if sd.effectiveState != connectivity.TransientFailure {
+ sd.effectiveState = connectivity.Connecting
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.Connecting,
+ Picker: &picker{err: balancer.ErrNoSubConnAvailable},
+ })
+ }
+ case connectivity.TransientFailure:
+ sd.lastErr = newState.ConnectionError
+ sd.effectiveState = connectivity.TransientFailure
+ // Since we're re-using common SubConns while handling resolver
+ // updates, we could receive an out of turn TRANSIENT_FAILURE from
+ // a pass over the previous address list. Happy Eyeballs will also
+ // cause out of order updates to arrive.
+
+ if curAddr := b.addressList.currentAddress(); equalAddressIgnoringBalAttributes(&curAddr, &sd.addr) {
+ b.cancelConnectionTimer()
+ if b.addressList.increment() {
+ b.requestConnectionLocked()
+ return
+ }
+ }
+
+ // End the first pass if we've seen a TRANSIENT_FAILURE from all
+ // SubConns once.
+ b.endFirstPassIfPossibleLocked(newState.ConnectionError)
+ }
+ return
+ }
+
+ // We have finished the first pass, keep re-connecting failing SubConns.
+ switch newState.ConnectivityState {
+ case connectivity.TransientFailure:
+ b.numTF = (b.numTF + 1) % b.subConns.Len()
+ sd.lastErr = newState.ConnectionError
+ if b.numTF%b.subConns.Len() == 0 {
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.TransientFailure,
+ Picker: &picker{err: newState.ConnectionError},
+ })
+ }
+ // We don't need to request re-resolution since the SubConn already
+ // does that before reporting TRANSIENT_FAILURE.
+ // TODO: #7534 - Move re-resolution requests from SubConn into
+ // pick_first.
+ case connectivity.Idle:
+ sd.subConn.Connect()
+ }
+}
+
+// endFirstPassIfPossibleLocked ends the first happy-eyeballs pass if all the
+// addresses are tried and their SubConns have reported a failure.
+func (b *pickfirstBalancer) endFirstPassIfPossibleLocked(lastErr error) {
+ // An optimization to avoid iterating over the entire SubConn map.
+ if b.addressList.isValid() {
+ return
+ }
+ // Connect() has been called on all the SubConns. The first pass can be
+ // ended if all the SubConns have reported a failure.
+ for _, sd := range b.subConns.Values() {
+ if !sd.connectionFailedInFirstPass {
+ return
+ }
+ }
+ b.firstPass = false
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.TransientFailure,
+ Picker: &picker{err: lastErr},
+ })
+ // Start re-connecting all the SubConns that are already in IDLE.
+ for _, sd := range b.subConns.Values() {
+ if sd.rawConnectivityState == connectivity.Idle {
+ sd.subConn.Connect()
+ }
+ }
+}
+
+func (b *pickfirstBalancer) isActiveSCData(sd *scData) bool {
+ activeSD, found := b.subConns.Get(sd.addr)
+ return found && activeSD == sd
+}
+
+func (b *pickfirstBalancer) updateSubConnHealthState(sd *scData, state balancer.SubConnState) {
+ b.mu.Lock()
+ defer b.mu.Unlock()
+ // Previously relevant SubConns can still callback with state updates.
+ // To prevent pickers from returning these obsolete SubConns, this logic
+ // is included to check if the current list of active SubConns includes
+ // this SubConn.
+ if !b.isActiveSCData(sd) {
+ return
+ }
+ sd.effectiveState = state.ConnectivityState
+ switch state.ConnectivityState {
+ case connectivity.Ready:
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.Ready,
+ Picker: &picker{result: balancer.PickResult{SubConn: sd.subConn}},
+ })
+ case connectivity.TransientFailure:
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.TransientFailure,
+ Picker: &picker{err: fmt.Errorf("pickfirst: health check failure: %v", state.ConnectionError)},
+ })
+ case connectivity.Connecting:
+ b.updateBalancerState(balancer.State{
+ ConnectivityState: connectivity.Connecting,
+ Picker: &picker{err: balancer.ErrNoSubConnAvailable},
+ })
+ default:
+ b.logger.Errorf("Got unexpected health update for SubConn %p: %v", state)
+ }
+}
+
+// updateBalancerState stores the state reported to the channel and calls
+// ClientConn.UpdateState(). As an optimization, it avoids sending duplicate
+// updates to the channel.
+func (b *pickfirstBalancer) updateBalancerState(newState balancer.State) {
+ // In case of TransientFailures allow the picker to be updated to update
+ // the connectivity error, in all other cases don't send duplicate state
+ // updates.
+ if newState.ConnectivityState == b.state && b.state != connectivity.TransientFailure {
+ return
+ }
+ b.forceUpdateConcludedStateLocked(newState)
+}
+
+// forceUpdateConcludedStateLocked stores the state reported to the channel and
+// calls ClientConn.UpdateState().
+// A separate function is defined to force update the ClientConn state since the
+// channel doesn't correctly assume that LB policies start in CONNECTING and
+// relies on LB policy to send an initial CONNECTING update.
+func (b *pickfirstBalancer) forceUpdateConcludedStateLocked(newState balancer.State) {
+ b.state = newState.ConnectivityState
+ b.cc.UpdateState(newState)
+}
+
+type picker struct {
+ result balancer.PickResult
+ err error
+}
+
+func (p *picker) Pick(balancer.PickInfo) (balancer.PickResult, error) {
+ return p.result, p.err
+}
+
+// idlePicker is used when the SubConn is IDLE and kicks the SubConn into
+// CONNECTING when Pick is called.
+type idlePicker struct {
+ exitIdle func()
+}
+
+func (i *idlePicker) Pick(balancer.PickInfo) (balancer.PickResult, error) {
+ i.exitIdle()
+ return balancer.PickResult{}, balancer.ErrNoSubConnAvailable
+}
+
+// addressList manages sequentially iterating over addresses present in a list
+// of endpoints. It provides a 1 dimensional view of the addresses present in
+// the endpoints.
+// This type is not safe for concurrent access.
+type addressList struct {
+ addresses []resolver.Address
+ idx int
+}
+
+func (al *addressList) isValid() bool {
+ return al.idx < len(al.addresses)
+}
+
+func (al *addressList) size() int {
+ return len(al.addresses)
+}
+
+// increment moves to the next index in the address list.
+// This method returns false if it went off the list, true otherwise.
+func (al *addressList) increment() bool {
+ if !al.isValid() {
+ return false
+ }
+ al.idx++
+ return al.idx < len(al.addresses)
+}
+
+// currentAddress returns the current address pointed to in the addressList.
+// If the list is in an invalid state, it returns an empty address instead.
+func (al *addressList) currentAddress() resolver.Address {
+ if !al.isValid() {
+ return resolver.Address{}
+ }
+ return al.addresses[al.idx]
+}
+
+func (al *addressList) reset() {
+ al.idx = 0
+}
+
+func (al *addressList) updateAddrs(addrs []resolver.Address) {
+ al.addresses = addrs
+ al.reset()
+}
+
+// seekTo returns false if the needle was not found and the current index was
+// left unchanged.
+func (al *addressList) seekTo(needle resolver.Address) bool {
+ for ai, addr := range al.addresses {
+ if !equalAddressIgnoringBalAttributes(&addr, &needle) {
+ continue
+ }
+ al.idx = ai
+ return true
+ }
+ return false
+}
+
+// hasNext returns whether incrementing the addressList will result in moving
+// past the end of the list. If the list has already moved past the end, it
+// returns false.
+func (al *addressList) hasNext() bool {
+ if !al.isValid() {
+ return false
+ }
+ return al.idx+1 < len(al.addresses)
+}
+
+// equalAddressIgnoringBalAttributes returns true is a and b are considered
+// equal. This is different from the Equal method on the resolver.Address type
+// which considers all fields to determine equality. Here, we only consider
+// fields that are meaningful to the SubConn.
+func equalAddressIgnoringBalAttributes(a, b *resolver.Address) bool {
+ return a.Addr == b.Addr && a.ServerName == b.ServerName &&
+ a.Attributes.Equal(b.Attributes)
+}
diff --git a/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go b/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go
index 22e6e32679..22045bf394 100644
--- a/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go
+++ b/vendor/google.golang.org/grpc/balancer/roundrobin/roundrobin.go
@@ -26,7 +26,7 @@ import (
"google.golang.org/grpc/balancer"
"google.golang.org/grpc/balancer/endpointsharding"
- "google.golang.org/grpc/balancer/pickfirst"
+ "google.golang.org/grpc/balancer/pickfirst/pickfirstleaf"
"google.golang.org/grpc/grpclog"
internalgrpclog "google.golang.org/grpc/internal/grpclog"
)
@@ -47,7 +47,7 @@ func (bb builder) Name() string {
}
func (bb builder) Build(cc balancer.ClientConn, opts balancer.BuildOptions) balancer.Balancer {
- childBuilder := balancer.Get(pickfirst.Name).Build
+ childBuilder := balancer.Get(pickfirstleaf.Name).Build
bal := &rrBalancer{
cc: cc,
Balancer: endpointsharding.NewBalancer(cc, opts, childBuilder, endpointsharding.Options{}),
@@ -67,6 +67,6 @@ func (b *rrBalancer) UpdateClientConnState(ccs balancer.ClientConnState) error {
return b.Balancer.UpdateClientConnState(balancer.ClientConnState{
// Enable the health listener in pickfirst children for client side health
// checks and outlier detection, if configured.
- ResolverState: pickfirst.EnableHealthListener(ccs.ResolverState),
+ ResolverState: pickfirstleaf.EnableHealthListener(ccs.ResolverState),
})
}
diff --git a/vendor/google.golang.org/grpc/balancer/subconn.go b/vendor/google.golang.org/grpc/balancer/subconn.go
index c1ca7c92e7..9ee44d4af0 100644
--- a/vendor/google.golang.org/grpc/balancer/subconn.go
+++ b/vendor/google.golang.org/grpc/balancer/subconn.go
@@ -111,6 +111,20 @@ type SubConnState struct {
// ConnectionError is set if the ConnectivityState is TransientFailure,
// describing the reason the SubConn failed. Otherwise, it is nil.
ConnectionError error
+ // connectedAddr contains the connected address when ConnectivityState is
+ // Ready. Otherwise, it is indeterminate.
+ connectedAddress resolver.Address
+}
+
+// connectedAddress returns the connected address for a SubConnState. The
+// address is only valid if the state is READY.
+func connectedAddress(scs SubConnState) resolver.Address {
+ return scs.connectedAddress
+}
+
+// setConnectedAddress sets the connected address for a SubConnState.
+func setConnectedAddress(scs *SubConnState, addr resolver.Address) {
+ scs.connectedAddress = addr
}
// A Producer is a type shared among potentially many consumers. It is
diff --git a/vendor/google.golang.org/grpc/balancer_wrapper.go b/vendor/google.golang.org/grpc/balancer_wrapper.go
index a1e56a3893..948a21ef68 100644
--- a/vendor/google.golang.org/grpc/balancer_wrapper.go
+++ b/vendor/google.golang.org/grpc/balancer_wrapper.go
@@ -36,6 +36,7 @@ import (
)
var (
+ setConnectedAddress = internal.SetConnectedAddress.(func(*balancer.SubConnState, resolver.Address))
// noOpRegisterHealthListenerFn is used when client side health checking is
// disabled. It sends a single READY update on the registered listener.
noOpRegisterHealthListenerFn = func(_ context.Context, listener func(balancer.SubConnState)) func() {
@@ -304,7 +305,7 @@ func newHealthData(s connectivity.State) *healthData {
// updateState is invoked by grpc to push a subConn state update to the
// underlying balancer.
-func (acbw *acBalancerWrapper) updateState(s connectivity.State, err error) {
+func (acbw *acBalancerWrapper) updateState(s connectivity.State, curAddr resolver.Address, err error) {
acbw.ccb.serializer.TrySchedule(func(ctx context.Context) {
if ctx.Err() != nil || acbw.ccb.balancer == nil {
return
@@ -316,6 +317,9 @@ func (acbw *acBalancerWrapper) updateState(s connectivity.State, err error) {
// opts.StateListener is set, so this cannot ever be nil.
// TODO: delete this comment when UpdateSubConnState is removed.
scs := balancer.SubConnState{ConnectivityState: s, ConnectionError: err}
+ if s == connectivity.Ready {
+ setConnectedAddress(&scs, curAddr)
+ }
// Invalidate the health listener by updating the healthData.
acbw.healthMu.Lock()
// A race may occur if a health listener is registered soon after the
@@ -446,14 +450,13 @@ func (acbw *acBalancerWrapper) healthListenerRegFn() func(context.Context, func(
if acbw.ccb.cc.dopts.disableHealthCheck {
return noOpRegisterHealthListenerFn
}
- cfg := acbw.ac.cc.healthCheckConfig()
- if cfg == nil {
- return noOpRegisterHealthListenerFn
- }
regHealthLisFn := internal.RegisterClientHealthCheckListener
if regHealthLisFn == nil {
// The health package is not imported.
- channelz.Error(logger, acbw.ac.channelz, "Health check is requested but health package is not imported.")
+ return noOpRegisterHealthListenerFn
+ }
+ cfg := acbw.ac.cc.healthCheckConfig()
+ if cfg == nil {
return noOpRegisterHealthListenerFn
}
return func(ctx context.Context, listener func(balancer.SubConnState)) func() {
diff --git a/vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go b/vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
index 42c61cf9fe..b1364a0325 100644
--- a/vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
+++ b/vendor/google.golang.org/grpc/binarylog/grpc_binarylog_v1/binarylog.pb.go
@@ -18,7 +18,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.6
// protoc v5.27.1
// source: grpc/binlog/v1/binarylog.proto
diff --git a/vendor/google.golang.org/grpc/clientconn.go b/vendor/google.golang.org/grpc/clientconn.go
index 5dec2dacc0..a3c315f2d7 100644
--- a/vendor/google.golang.org/grpc/clientconn.go
+++ b/vendor/google.golang.org/grpc/clientconn.go
@@ -35,19 +35,16 @@ import (
"google.golang.org/grpc/balancer/pickfirst"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/connectivity"
- "google.golang.org/grpc/credentials"
- expstats "google.golang.org/grpc/experimental/stats"
"google.golang.org/grpc/internal"
"google.golang.org/grpc/internal/channelz"
"google.golang.org/grpc/internal/grpcsync"
"google.golang.org/grpc/internal/idle"
iresolver "google.golang.org/grpc/internal/resolver"
- istats "google.golang.org/grpc/internal/stats"
+ "google.golang.org/grpc/internal/stats"
"google.golang.org/grpc/internal/transport"
"google.golang.org/grpc/keepalive"
"google.golang.org/grpc/resolver"
"google.golang.org/grpc/serviceconfig"
- "google.golang.org/grpc/stats"
"google.golang.org/grpc/status"
_ "google.golang.org/grpc/balancer/roundrobin" // To register roundrobin.
@@ -100,41 +97,6 @@ var (
errTransportCredentialsMissing = errors.New("grpc: the credentials require transport level security (use grpc.WithTransportCredentials() to set)")
)
-var (
- disconnectionsMetric = expstats.RegisterInt64Count(expstats.MetricDescriptor{
- Name: "grpc.subchannel.disconnections",
- Description: "EXPERIMENTAL. Number of times the selected subchannel becomes disconnected.",
- Unit: "{disconnection}",
- Labels: []string{"grpc.target"},
- OptionalLabels: []string{"grpc.lb.backend_service", "grpc.lb.locality", "grpc.disconnect_error"},
- Default: false,
- })
- connectionAttemptsSucceededMetric = expstats.RegisterInt64Count(expstats.MetricDescriptor{
- Name: "grpc.subchannel.connection_attempts_succeeded",
- Description: "EXPERIMENTAL. Number of successful connection attempts.",
- Unit: "{attempt}",
- Labels: []string{"grpc.target"},
- OptionalLabels: []string{"grpc.lb.backend_service", "grpc.lb.locality"},
- Default: false,
- })
- connectionAttemptsFailedMetric = expstats.RegisterInt64Count(expstats.MetricDescriptor{
- Name: "grpc.subchannel.connection_attempts_failed",
- Description: "EXPERIMENTAL. Number of failed connection attempts.",
- Unit: "{attempt}",
- Labels: []string{"grpc.target"},
- OptionalLabels: []string{"grpc.lb.backend_service", "grpc.lb.locality"},
- Default: false,
- })
- openConnectionsMetric = expstats.RegisterInt64UpDownCount(expstats.MetricDescriptor{
- Name: "grpc.subchannel.open_connections",
- Description: "EXPERIMENTAL. Number of open connections.",
- Unit: "{attempt}",
- Labels: []string{"grpc.target"},
- OptionalLabels: []string{"grpc.lb.backend_service", "grpc.security_level", "grpc.lb.locality"},
- Default: false,
- })
-)
-
const (
defaultClientMaxReceiveMessageSize = 1024 * 1024 * 4
defaultClientMaxSendMessageSize = math.MaxInt32
@@ -248,8 +210,7 @@ func NewClient(target string, opts ...DialOption) (conn *ClientConn, err error)
cc.csMgr = newConnectivityStateManager(cc.ctx, cc.channelz)
cc.pickerWrapper = newPickerWrapper()
- cc.metricsRecorderList = istats.NewMetricsRecorderList(cc.dopts.copts.StatsHandlers)
- cc.statsHandler = istats.NewCombinedHandler(cc.dopts.copts.StatsHandlers...)
+ cc.metricsRecorderList = stats.NewMetricsRecorderList(cc.dopts.copts.StatsHandlers)
cc.initIdleStateLocked() // Safe to call without the lock, since nothing else has a reference to cc.
cc.idlenessMgr = idle.NewManager((*idler)(cc), cc.dopts.idleTimeout)
@@ -299,10 +260,9 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (conn *
}()
// This creates the name resolver, load balancer, etc.
- if err := cc.exitIdleMode(); err != nil {
- return nil, fmt.Errorf("failed to exit idle mode: %w", err)
+ if err := cc.idlenessMgr.ExitIdleMode(); err != nil {
+ return nil, err
}
- cc.idlenessMgr.UnsafeSetNotIdle()
// Return now for non-blocking dials.
if !cc.dopts.block {
@@ -370,7 +330,7 @@ func (cc *ClientConn) addTraceEvent(msg string) {
Severity: channelz.CtInfo,
}
}
- channelz.AddTraceEvent(logger, cc.channelz, 1, ted)
+ channelz.AddTraceEvent(logger, cc.channelz, 0, ted)
}
type idler ClientConn
@@ -379,17 +339,14 @@ func (i *idler) EnterIdleMode() {
(*ClientConn)(i).enterIdleMode()
}
-func (i *idler) ExitIdleMode() {
- // Ignore the error returned from this method, because from the perspective
- // of the caller (idleness manager), the channel would have always moved out
- // of IDLE by the time this method returns.
- (*ClientConn)(i).exitIdleMode()
+func (i *idler) ExitIdleMode() error {
+ return (*ClientConn)(i).exitIdleMode()
}
// exitIdleMode moves the channel out of idle mode by recreating the name
// resolver and load balancer. This should never be called directly; use
// cc.idlenessMgr.ExitIdleMode instead.
-func (cc *ClientConn) exitIdleMode() error {
+func (cc *ClientConn) exitIdleMode() (err error) {
cc.mu.Lock()
if cc.conns == nil {
cc.mu.Unlock()
@@ -397,23 +354,11 @@ func (cc *ClientConn) exitIdleMode() error {
}
cc.mu.Unlock()
- // Set state to CONNECTING before building the name resolver
- // so the channel does not remain in IDLE.
- cc.csMgr.updateState(connectivity.Connecting)
-
// This needs to be called without cc.mu because this builds a new resolver
// which might update state or report error inline, which would then need to
// acquire cc.mu.
if err := cc.resolverWrapper.start(); err != nil {
- // If resolver creation fails, treat it like an error reported by the
- // resolver before any valid updates. Set channel's state to
- // TransientFailure, and set an erroring picker with the resolver build
- // error, which will returned as part of any subsequent RPCs.
- logger.Warningf("Failed to start resolver: %v", err)
- cc.csMgr.updateState(connectivity.TransientFailure)
- cc.mu.Lock()
- cc.updateResolverStateAndUnlock(resolver.State{}, err)
- return fmt.Errorf("failed to start resolver: %w", err)
+ return err
}
cc.addTraceEvent("exiting idle mode")
@@ -676,8 +621,7 @@ type ClientConn struct {
channelz *channelz.Channel // Channelz object.
resolverBuilder resolver.Builder // See initParsedTargetAndResolverBuilder().
idlenessMgr *idle.Manager
- metricsRecorderList *istats.MetricsRecorderList
- statsHandler stats.Handler
+ metricsRecorderList *stats.MetricsRecorderList
// The following provide their own synchronization, and therefore don't
// require cc.mu to be held to access them.
@@ -734,8 +678,10 @@ func (cc *ClientConn) GetState() connectivity.State {
// Notice: This API is EXPERIMENTAL and may be changed or removed in a later
// release.
func (cc *ClientConn) Connect() {
- cc.idlenessMgr.ExitIdleMode()
-
+ if err := cc.idlenessMgr.ExitIdleMode(); err != nil {
+ cc.addTraceEvent(err.Error())
+ return
+ }
// If the ClientConn was not in idle mode, we need to call ExitIdle on the
// LB policy so that connections can be created.
cc.mu.Lock()
@@ -786,8 +732,8 @@ func init() {
internal.EnterIdleModeForTesting = func(cc *ClientConn) {
cc.idlenessMgr.EnterIdleModeForTesting()
}
- internal.ExitIdleModeForTesting = func(cc *ClientConn) {
- cc.idlenessMgr.ExitIdleMode()
+ internal.ExitIdleModeForTesting = func(cc *ClientConn) error {
+ return cc.idlenessMgr.ExitIdleMode()
}
}
@@ -912,7 +858,6 @@ func (cc *ClientConn) newAddrConnLocked(addrs []resolver.Address, opts balancer.
channelz: channelz.RegisterSubChannel(cc.channelz, ""),
resetBackoff: make(chan struct{}),
}
- ac.updateTelemetryLabelsLocked()
ac.ctx, ac.cancel = context.WithCancel(cc.ctx)
// Start with our address set to the first address; this may be updated if
// we connect to different addresses.
@@ -977,24 +922,25 @@ func (cc *ClientConn) incrCallsFailed() {
// connect starts creating a transport.
// It does nothing if the ac is not IDLE.
// TODO(bar) Move this to the addrConn section.
-func (ac *addrConn) connect() {
+func (ac *addrConn) connect() error {
ac.mu.Lock()
if ac.state == connectivity.Shutdown {
if logger.V(2) {
logger.Infof("connect called on shutdown addrConn; ignoring.")
}
ac.mu.Unlock()
- return
+ return errConnClosing
}
if ac.state != connectivity.Idle {
if logger.V(2) {
logger.Infof("connect called on addrConn in non-idle state (%v); ignoring.", ac.state)
}
ac.mu.Unlock()
- return
+ return nil
}
ac.resetTransportAndUnlock()
+ return nil
}
// equalAddressIgnoringBalAttributes returns true is a and b are considered equal.
@@ -1028,7 +974,7 @@ func (ac *addrConn) updateAddrs(addrs []resolver.Address) {
}
ac.addrs = addrs
- ac.updateTelemetryLabelsLocked()
+
if ac.state == connectivity.Shutdown ||
ac.state == connectivity.TransientFailure ||
ac.state == connectivity.Idle {
@@ -1267,9 +1213,6 @@ type addrConn struct {
resetBackoff chan struct{}
channelz *channelz.SubChannel
-
- localityLabel string
- backendServiceLabel string
}
// Note: this requires a lock on ac.mu.
@@ -1277,18 +1220,6 @@ func (ac *addrConn) updateConnectivityState(s connectivity.State, lastErr error)
if ac.state == s {
return
}
-
- // If we are transitioning out of Ready, it means there is a disconnection.
- // A SubConn can also transition from CONNECTING directly to IDLE when
- // a transport is successfully created, but the connection fails
- // before the SubConn can send the notification for READY. We treat
- // this as a successful connection and transition to IDLE.
- // TODO: https://github.com/grpc/grpc-go/issues/7862 - Remove the second
- // part of the if condition below once the issue is fixed.
- if ac.state == connectivity.Ready || (ac.state == connectivity.Connecting && s == connectivity.Idle) {
- disconnectionsMetric.Record(ac.cc.metricsRecorderList, 1, ac.cc.target, ac.backendServiceLabel, ac.localityLabel, "unknown")
- openConnectionsMetric.Record(ac.cc.metricsRecorderList, -1, ac.cc.target, ac.backendServiceLabel, ac.securityLevelLocked(), ac.localityLabel)
- }
ac.state = s
ac.channelz.ChannelMetrics.State.Store(&s)
if lastErr == nil {
@@ -1296,7 +1227,7 @@ func (ac *addrConn) updateConnectivityState(s connectivity.State, lastErr error)
} else {
channelz.Infof(logger, ac.channelz, "Subchannel Connectivity change to %v, last error: %s", s, lastErr)
}
- ac.acbw.updateState(s, lastErr)
+ ac.acbw.updateState(s, ac.curAddr, lastErr)
}
// adjustParams updates parameters used to create transports upon
@@ -1346,15 +1277,6 @@ func (ac *addrConn) resetTransportAndUnlock() {
ac.mu.Unlock()
if err := ac.tryAllAddrs(acCtx, addrs, connectDeadline); err != nil {
- if !errors.Is(err, context.Canceled) {
- connectionAttemptsFailedMetric.Record(ac.cc.metricsRecorderList, 1, ac.cc.target, ac.backendServiceLabel, ac.localityLabel)
- } else {
- if logger.V(2) {
- // This records cancelled connection attempts which can be later
- // replaced by a metric.
- logger.Infof("Context cancellation detected; not recording this as a failed connection attempt.")
- }
- }
// TODO: #7534 - Move re-resolution requests into the pick_first LB policy
// to ensure one resolution request per pass instead of per subconn failure.
ac.cc.resolveNow(resolver.ResolveNowOptions{})
@@ -1394,50 +1316,10 @@ func (ac *addrConn) resetTransportAndUnlock() {
}
// Success; reset backoff.
ac.mu.Lock()
- connectionAttemptsSucceededMetric.Record(ac.cc.metricsRecorderList, 1, ac.cc.target, ac.backendServiceLabel, ac.localityLabel)
- openConnectionsMetric.Record(ac.cc.metricsRecorderList, 1, ac.cc.target, ac.backendServiceLabel, ac.securityLevelLocked(), ac.localityLabel)
ac.backoffIdx = 0
ac.mu.Unlock()
}
-// updateTelemetryLabelsLocked calculates and caches the telemetry labels based on the
-// first address in addrConn.
-func (ac *addrConn) updateTelemetryLabelsLocked() {
- labelsFunc, ok := internal.AddressToTelemetryLabels.(func(resolver.Address) map[string]string)
- if !ok || len(ac.addrs) == 0 {
- // Reset defaults
- ac.localityLabel = ""
- ac.backendServiceLabel = ""
- return
- }
- labels := labelsFunc(ac.addrs[0])
- ac.localityLabel = labels["grpc.lb.locality"]
- ac.backendServiceLabel = labels["grpc.lb.backend_service"]
-}
-
-type securityLevelKey struct{}
-
-func (ac *addrConn) securityLevelLocked() string {
- var secLevel string
- // During disconnection, ac.transport is nil. Fall back to the security level
- // stored in the current address during connection.
- if ac.transport == nil {
- secLevel, _ = ac.curAddr.Attributes.Value(securityLevelKey{}).(string)
- return secLevel
- }
- authInfo := ac.transport.Peer().AuthInfo
- if ci, ok := authInfo.(interface {
- GetCommonAuthInfo() credentials.CommonAuthInfo
- }); ok {
- secLevel = ci.GetCommonAuthInfo().SecurityLevel.String()
- // Store the security level in the current address' attributes so
- // that it remains available for disconnection metrics after the
- // transport is closed.
- ac.curAddr.Attributes = ac.curAddr.Attributes.WithValue(securityLevelKey{}, secLevel)
- }
- return secLevel
-}
-
// tryAllAddrs tries to create a connection to the addresses, and stop when at
// the first successful one. It returns an error if no address was successfully
// connected, or updates ac appropriately with the new transport.
@@ -1527,26 +1409,25 @@ func (ac *addrConn) createTransport(ctx context.Context, addr resolver.Address,
}
ac.mu.Lock()
+ defer ac.mu.Unlock()
if ctx.Err() != nil {
// This can happen if the subConn was removed while in `Connecting`
// state. tearDown() would have set the state to `Shutdown`, but
// would not have closed the transport since ac.transport would not
// have been set at that point.
-
- // We unlock ac.mu because newTr.Close() calls onClose()
+ //
+ // We run this in a goroutine because newTr.Close() calls onClose()
// inline, which requires locking ac.mu.
- ac.mu.Unlock()
-
+ //
// The error we pass to Close() is immaterial since there are no open
// streams at this point, so no trailers with error details will be sent
// out. We just need to pass a non-nil error.
//
// This can also happen when updateAddrs is called during a connection
// attempt.
- newTr.Close(transport.ErrConnClosing)
+ go newTr.Close(transport.ErrConnClosing)
return nil
}
- defer ac.mu.Unlock()
if hctx.Err() != nil {
// onClose was already called for this connection, but the connection
// was successfully established first. Consider it a success and set
diff --git a/vendor/google.golang.org/grpc/credentials/credentials.go b/vendor/google.golang.org/grpc/credentials/credentials.go
index 06f6c6c70a..c8e337cdda 100644
--- a/vendor/google.golang.org/grpc/credentials/credentials.go
+++ b/vendor/google.golang.org/grpc/credentials/credentials.go
@@ -44,7 +44,8 @@ type PerRPCCredentials interface {
// A54). uri is the URI of the entry point for the request. When supported
// by the underlying implementation, ctx can be used for timeout and
// cancellation. Additionally, RequestInfo data will be available via ctx
- // to this call.
+ // to this call. TODO(zhaoq): Define the set of the qualified keys instead
+ // of leaving it as an arbitrary string.
GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error)
// RequireTransportSecurity indicates whether the credentials requires
// transport security.
diff --git a/vendor/google.golang.org/grpc/credentials/tls.go b/vendor/google.golang.org/grpc/credentials/tls.go
index 0bcd16dbbf..8277be7d6f 100644
--- a/vendor/google.golang.org/grpc/credentials/tls.go
+++ b/vendor/google.golang.org/grpc/credentials/tls.go
@@ -56,13 +56,9 @@ func (t TLSInfo) AuthType() string {
// non-nil error if the validation fails.
func (t TLSInfo) ValidateAuthority(authority string) error {
var errs []error
- host, _, err := net.SplitHostPort(authority)
- if err != nil {
- host = authority
- }
for _, cert := range t.State.PeerCertificates {
var err error
- if err = cert.VerifyHostname(host); err == nil {
+ if err = cert.VerifyHostname(authority); err == nil {
return nil
}
errs = append(errs, err)
diff --git a/vendor/google.golang.org/grpc/encoding/encoding.go b/vendor/google.golang.org/grpc/encoding/encoding.go
index 296f38c3a8..11d0ae142c 100644
--- a/vendor/google.golang.org/grpc/encoding/encoding.go
+++ b/vendor/google.golang.org/grpc/encoding/encoding.go
@@ -27,10 +27,8 @@ package encoding
import (
"io"
- "slices"
"strings"
- "google.golang.org/grpc/encoding/internal"
"google.golang.org/grpc/internal/grpcutil"
)
@@ -38,26 +36,12 @@ import (
// It is intended for grpc internal use only.
const Identity = "identity"
-func init() {
- internal.RegisterCompressorForTesting = func(c Compressor) func() {
- name := c.Name()
- curCompressor, found := registeredCompressor[name]
- RegisterCompressor(c)
- return func() {
- if found {
- registeredCompressor[name] = curCompressor
- return
- }
- delete(registeredCompressor, name)
- grpcutil.RegisteredCompressorNames = slices.DeleteFunc(grpcutil.RegisteredCompressorNames, func(s string) bool {
- return s == name
- })
- }
- }
-}
-
// Compressor is used for compressing and decompressing when sending or
// receiving messages.
+//
+// If a Compressor implements `DecompressedSize(compressedBytes []byte) int`,
+// gRPC will invoke it to determine the size of the buffer allocated for the
+// result of decompression. A return value of -1 indicates unknown size.
type Compressor interface {
// Compress writes the data written to wc to w after compressing it. If an
// error occurs while initializing the compressor, that error is returned
diff --git a/vendor/google.golang.org/grpc/encoding/gzip/gzip.go b/vendor/google.golang.org/grpc/encoding/gzip/gzip.go
index 153e4dbfbf..6306e8bb0f 100644
--- a/vendor/google.golang.org/grpc/encoding/gzip/gzip.go
+++ b/vendor/google.golang.org/grpc/encoding/gzip/gzip.go
@@ -27,6 +27,7 @@ package gzip
import (
"compress/gzip"
+ "encoding/binary"
"fmt"
"io"
"sync"
@@ -110,6 +111,17 @@ func (z *reader) Read(p []byte) (n int, err error) {
return n, err
}
+// RFC1952 specifies that the last four bytes "contains the size of
+// the original (uncompressed) input data modulo 2^32."
+// gRPC has a max message size of 2GB so we don't need to worry about wraparound.
+func (c *compressor) DecompressedSize(buf []byte) int {
+ last := len(buf)
+ if last < 4 {
+ return -1
+ }
+ return int(binary.LittleEndian.Uint32(buf[last-4 : last]))
+}
+
func (c *compressor) Name() string {
return Name
}
diff --git a/vendor/google.golang.org/grpc/encoding/internal/internal.go b/vendor/google.golang.org/grpc/encoding/internal/internal.go
deleted file mode 100644
index ee9acb4377..0000000000
--- a/vendor/google.golang.org/grpc/encoding/internal/internal.go
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *
- * Copyright 2025 gRPC 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 internal contains code internal to the encoding package.
-package internal
-
-// RegisterCompressorForTesting registers a compressor in the global compressor
-// registry. It returns a cleanup function that should be called at the end
-// of the test to unregister the compressor.
-//
-// This prevents compressors registered in one test from appearing in the
-// encoding headers of subsequent tests.
-var RegisterCompressorForTesting any // func RegisterCompressor(c Compressor) func()
diff --git a/vendor/google.golang.org/grpc/experimental/stats/metricregistry.go b/vendor/google.golang.org/grpc/experimental/stats/metricregistry.go
index 472813f58f..ad75313a18 100644
--- a/vendor/google.golang.org/grpc/experimental/stats/metricregistry.go
+++ b/vendor/google.golang.org/grpc/experimental/stats/metricregistry.go
@@ -75,8 +75,6 @@ const (
MetricTypeIntHisto
MetricTypeFloatHisto
MetricTypeIntGauge
- MetricTypeIntUpDownCount
- MetricTypeIntAsyncGauge
)
// Int64CountHandle is a typed handle for a int count metric. This handle
@@ -95,23 +93,6 @@ func (h *Int64CountHandle) Record(recorder MetricsRecorder, incr int64, labels .
recorder.RecordInt64Count(h, incr, labels...)
}
-// Int64UpDownCountHandle is a typed handle for an int up-down counter metric.
-// This handle is passed at the recording point in order to know which metric
-// to record on.
-type Int64UpDownCountHandle MetricDescriptor
-
-// Descriptor returns the int64 up-down counter handle typecast to a pointer to a
-// MetricDescriptor.
-func (h *Int64UpDownCountHandle) Descriptor() *MetricDescriptor {
- return (*MetricDescriptor)(h)
-}
-
-// Record records the int64 up-down counter value on the metrics recorder provided.
-// The value 'v' can be positive to increment or negative to decrement.
-func (h *Int64UpDownCountHandle) Record(recorder MetricsRecorder, v int64, labels ...string) {
- recorder.RecordInt64UpDownCount(h, v, labels...)
-}
-
// Float64CountHandle is a typed handle for a float count metric. This handle is
// passed at the recording point in order to know which metric to record on.
type Float64CountHandle MetricDescriptor
@@ -173,30 +154,6 @@ func (h *Int64GaugeHandle) Record(recorder MetricsRecorder, incr int64, labels .
recorder.RecordInt64Gauge(h, incr, labels...)
}
-// AsyncMetric is a marker interface for asynchronous metric types.
-type AsyncMetric interface {
- isAsync()
- Descriptor() *MetricDescriptor
-}
-
-// Int64AsyncGaugeHandle is a typed handle for an int gauge metric. This handle is
-// passed at the recording point in order to know which metric to record on.
-type Int64AsyncGaugeHandle MetricDescriptor
-
-// isAsync implements the AsyncMetric interface.
-func (h *Int64AsyncGaugeHandle) isAsync() {}
-
-// Descriptor returns the int64 gauge handle typecast to a pointer to a
-// MetricDescriptor.
-func (h *Int64AsyncGaugeHandle) Descriptor() *MetricDescriptor {
- return (*MetricDescriptor)(h)
-}
-
-// Record records the int64 gauge value on the metrics recorder provided.
-func (h *Int64AsyncGaugeHandle) Record(recorder AsyncMetricsRecorder, value int64, labels ...string) {
- recorder.RecordInt64AsyncGauge(h, value, labels...)
-}
-
// registeredMetrics are the registered metric descriptor names.
var registeredMetrics = make(map[string]bool)
@@ -292,35 +249,6 @@ func RegisterInt64Gauge(descriptor MetricDescriptor) *Int64GaugeHandle {
return (*Int64GaugeHandle)(descPtr)
}
-// RegisterInt64UpDownCount registers the metric description onto the global registry.
-// It returns a typed handle to use for recording data.
-//
-// NOTE: this function must only be called during initialization time (i.e. in
-// an init() function), and is not thread-safe. If multiple metrics are
-// registered with the same name, this function will panic.
-func RegisterInt64UpDownCount(descriptor MetricDescriptor) *Int64UpDownCountHandle {
- registerMetric(descriptor.Name, descriptor.Default)
- // Set the specific metric type for the up-down counter
- descriptor.Type = MetricTypeIntUpDownCount
- descPtr := &descriptor
- metricsRegistry[descriptor.Name] = descPtr
- return (*Int64UpDownCountHandle)(descPtr)
-}
-
-// RegisterInt64AsyncGauge registers the metric description onto the global registry.
-// It returns a typed handle to use for recording data.
-//
-// NOTE: this function must only be called during initialization time (i.e. in
-// an init() function), and is not thread-safe. If multiple metrics are
-// registered with the same name, this function will panic.
-func RegisterInt64AsyncGauge(descriptor MetricDescriptor) *Int64AsyncGaugeHandle {
- registerMetric(descriptor.Name, descriptor.Default)
- descriptor.Type = MetricTypeIntAsyncGauge
- descPtr := &descriptor
- metricsRegistry[descriptor.Name] = descPtr
- return (*Int64AsyncGaugeHandle)(descPtr)
-}
-
// snapshotMetricsRegistryForTesting snapshots the global data of the metrics
// registry. Returns a cleanup function that sets the metrics registry to its
// original state.
diff --git a/vendor/google.golang.org/grpc/experimental/stats/metrics.go b/vendor/google.golang.org/grpc/experimental/stats/metrics.go
index 88742724a4..ee1423605a 100644
--- a/vendor/google.golang.org/grpc/experimental/stats/metrics.go
+++ b/vendor/google.golang.org/grpc/experimental/stats/metrics.go
@@ -19,13 +19,9 @@
// Package stats contains experimental metrics/stats API's.
package stats
-import (
- "google.golang.org/grpc/internal"
- "google.golang.org/grpc/stats"
-)
+import "google.golang.org/grpc/stats"
// MetricsRecorder records on metrics derived from metric registry.
-// Implementors must embed UnimplementedMetricsRecorder.
type MetricsRecorder interface {
// RecordInt64Count records the measurement alongside labels on the int
// count associated with the provided handle.
@@ -42,49 +38,6 @@ type MetricsRecorder interface {
// RecordInt64Gauge records the measurement alongside labels on the int
// gauge associated with the provided handle.
RecordInt64Gauge(handle *Int64GaugeHandle, incr int64, labels ...string)
- // RecordInt64UpDownCounter records the measurement alongside labels on the int
- // count associated with the provided handle.
- RecordInt64UpDownCount(handle *Int64UpDownCountHandle, incr int64, labels ...string)
- // RegisterAsyncReporter registers a reporter to produce metric values for
- // only the listed descriptors. The returned function must be called when
- // the metrics are no longer needed, which will remove the reporter. The
- // returned method needs to be idempotent and concurrent safe.
- RegisterAsyncReporter(reporter AsyncMetricReporter, descriptors ...AsyncMetric) func()
-
- // EnforceMetricsRecorderEmbedding is included to force implementers to embed
- // another implementation of this interface, allowing gRPC to add methods
- // without breaking users.
- internal.EnforceMetricsRecorderEmbedding
-}
-
-// AsyncMetricReporter is an interface for types that record metrics asynchronously
-// for the set of descriptors they are registered with. The AsyncMetricsRecorder
-// parameter is used to record values for these metrics.
-//
-// Implementations must make unique recordings across all registered
-// AsyncMetricReporters. Meaning, they should not report values for a metric with
-// the same attributes as another AsyncMetricReporter will report.
-//
-// Implementations must be concurrent-safe.
-type AsyncMetricReporter interface {
- // Report records metric values using the provided recorder.
- Report(AsyncMetricsRecorder) error
-}
-
-// AsyncMetricReporterFunc is an adapter to allow the use of ordinary functions as
-// AsyncMetricReporters.
-type AsyncMetricReporterFunc func(AsyncMetricsRecorder) error
-
-// Report calls f(r).
-func (f AsyncMetricReporterFunc) Report(r AsyncMetricsRecorder) error {
- return f(r)
-}
-
-// AsyncMetricsRecorder records on asynchronous metrics derived from metric registry.
-type AsyncMetricsRecorder interface {
- // RecordInt64AsyncGauge records the measurement alongside labels on the int
- // count associated with the provided handle asynchronously
- RecordInt64AsyncGauge(handle *Int64AsyncGaugeHandle, incr int64, labels ...string)
}
// Metrics is an experimental legacy alias of the now-stable stats.MetricSet.
@@ -99,33 +52,3 @@ type Metric = string
func NewMetrics(metrics ...Metric) *Metrics {
return stats.NewMetricSet(metrics...)
}
-
-// UnimplementedMetricsRecorder must be embedded to have forward compatible implementations.
-type UnimplementedMetricsRecorder struct {
- internal.EnforceMetricsRecorderEmbedding
-}
-
-// RecordInt64Count provides a no-op implementation.
-func (UnimplementedMetricsRecorder) RecordInt64Count(*Int64CountHandle, int64, ...string) {}
-
-// RecordFloat64Count provides a no-op implementation.
-func (UnimplementedMetricsRecorder) RecordFloat64Count(*Float64CountHandle, float64, ...string) {}
-
-// RecordInt64Histo provides a no-op implementation.
-func (UnimplementedMetricsRecorder) RecordInt64Histo(*Int64HistoHandle, int64, ...string) {}
-
-// RecordFloat64Histo provides a no-op implementation.
-func (UnimplementedMetricsRecorder) RecordFloat64Histo(*Float64HistoHandle, float64, ...string) {}
-
-// RecordInt64Gauge provides a no-op implementation.
-func (UnimplementedMetricsRecorder) RecordInt64Gauge(*Int64GaugeHandle, int64, ...string) {}
-
-// RecordInt64UpDownCount provides a no-op implementation.
-func (UnimplementedMetricsRecorder) RecordInt64UpDownCount(*Int64UpDownCountHandle, int64, ...string) {
-}
-
-// RegisterAsyncReporter provides a no-op implementation.
-func (UnimplementedMetricsRecorder) RegisterAsyncReporter(AsyncMetricReporter, ...AsyncMetric) func() {
- // No-op: Return an empty function to ensure caller doesn't panic on nil function call
- return func() {}
-}
diff --git a/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go b/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go
index 8f7d9f6bbe..22d263fb94 100644
--- a/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go
+++ b/vendor/google.golang.org/grpc/health/grpc_health_v1/health.pb.go
@@ -17,7 +17,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
-// protoc-gen-go v1.36.10
+// protoc-gen-go v1.36.6
// protoc v5.27.1
// source: grpc/health/v1/health.proto
diff --git a/vendor/google.golang.org/grpc/health/grpc_health_v1/health_grpc.pb.go b/vendor/google.golang.org/grpc/health/grpc_health_v1/health_grpc.pb.go
index e99cd5c838..f2c01f296a 100644
--- a/vendor/google.golang.org/grpc/health/grpc_health_v1/health_grpc.pb.go
+++ b/vendor/google.golang.org/grpc/health/grpc_health_v1/health_grpc.pb.go
@@ -17,7 +17,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
+// - protoc-gen-go-grpc v1.5.1
// - protoc v5.27.1
// source: grpc/health/v1/health.proto
diff --git a/vendor/google.golang.org/grpc/interceptor.go b/vendor/google.golang.org/grpc/interceptor.go
index 099e3d0933..877d78fc3d 100644
--- a/vendor/google.golang.org/grpc/interceptor.go
+++ b/vendor/google.golang.org/grpc/interceptor.go
@@ -97,12 +97,8 @@ type StreamServerInfo struct {
IsServerStream bool
}
-// StreamServerInterceptor provides a hook to intercept the execution of a
-// streaming RPC on the server.
-//
-// srv is the service implementation on which the RPC was invoked, and needs to
-// be passed to handler, and not used otherwise. ss is the server side of the
-// stream. info contains all the information of this RPC the interceptor can
-// operate on. And handler is the service method implementation. It is the
-// responsibility of the interceptor to invoke handler to complete the RPC.
+// StreamServerInterceptor provides a hook to intercept the execution of a streaming RPC on the server.
+// info contains all the information of this RPC the interceptor can operate on. And handler is the
+// service method implementation. It is the responsibility of the interceptor to invoke handler to
+// complete the RPC.
type StreamServerInterceptor func(srv any, ss ServerStream, info *StreamServerInfo, handler StreamHandler) error
diff --git a/vendor/google.golang.org/grpc/internal/balancer/gracefulswitch/gracefulswitch.go b/vendor/google.golang.org/grpc/internal/balancer/gracefulswitch/gracefulswitch.go
index f38de74a49..ba25b89887 100644
--- a/vendor/google.golang.org/grpc/internal/balancer/gracefulswitch/gracefulswitch.go
+++ b/vendor/google.golang.org/grpc/internal/balancer/gracefulswitch/gracefulswitch.go
@@ -67,10 +67,6 @@ type Balancer struct {
// balancerCurrent before the UpdateSubConnState is called on the
// balancerCurrent.
currentMu sync.Mutex
-
- // activeGoroutines tracks all the goroutines that this balancer has started
- // and that should be waited on when the balancer closes.
- activeGoroutines sync.WaitGroup
}
// swap swaps out the current lb with the pending lb and updates the ClientConn.
@@ -80,9 +76,7 @@ func (gsb *Balancer) swap() {
cur := gsb.balancerCurrent
gsb.balancerCurrent = gsb.balancerPending
gsb.balancerPending = nil
- gsb.activeGoroutines.Add(1)
go func() {
- defer gsb.activeGoroutines.Done()
gsb.currentMu.Lock()
defer gsb.currentMu.Unlock()
cur.Close()
@@ -280,7 +274,6 @@ func (gsb *Balancer) Close() {
currentBalancerToClose.Close()
pendingBalancerToClose.Close()
- gsb.activeGoroutines.Wait()
}
// balancerWrapper wraps a balancer.Balancer, and overrides some Balancer
@@ -331,12 +324,7 @@ func (bw *balancerWrapper) UpdateState(state balancer.State) {
defer bw.gsb.mu.Unlock()
bw.lastState = state
- // If Close() acquires the mutex before UpdateState(), the balancer
- // will already have been removed from the current or pending state when
- // reaching this point.
if !bw.gsb.balancerCurrentOrPending(bw) {
- // Returning here ensures that (*Balancer).swap() is not invoked after
- // (*Balancer).Close() and therefore prevents "use after close".
return
}
diff --git a/vendor/google.golang.org/grpc/internal/balancer/weight/weight.go b/vendor/google.golang.org/grpc/internal/balancer/weight/weight.go
deleted file mode 100644
index 11beb07d14..0000000000
--- a/vendor/google.golang.org/grpc/internal/balancer/weight/weight.go
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- *
- * Copyright 2025 gRPC 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 weight contains utilities to manage endpoint weights. Weights are
-// used by LB policies such as ringhash to distribute load across multiple
-// endpoints.
-package weight
-
-import (
- "fmt"
-
- "google.golang.org/grpc/resolver"
-)
-
-// attributeKey is the type used as the key to store EndpointInfo in the
-// Attributes field of resolver.Endpoint.
-type attributeKey struct{}
-
-// EndpointInfo will be stored in the Attributes field of Endpoints in order to
-// use the ringhash balancer.
-type EndpointInfo struct {
- Weight uint32
-}
-
-// Equal allows the values to be compared by Attributes.Equal.
-func (a EndpointInfo) Equal(o any) bool {
- oa, ok := o.(EndpointInfo)
- return ok && oa.Weight == a.Weight
-}
-
-// Set returns a copy of endpoint in which the Attributes field is updated with
-// EndpointInfo.
-func Set(endpoint resolver.Endpoint, epInfo EndpointInfo) resolver.Endpoint {
- endpoint.Attributes = endpoint.Attributes.WithValue(attributeKey{}, epInfo)
- return endpoint
-}
-
-// String returns a human-readable representation of EndpointInfo.
-// This method is intended for logging, testing, and debugging purposes only.
-// Do not rely on the output format, as it is not guaranteed to remain stable.
-func (a EndpointInfo) String() string {
- return fmt.Sprintf("Weight: %d", a.Weight)
-}
-
-// FromEndpoint returns the EndpointInfo stored in the Attributes field of an
-// endpoint. It returns an empty EndpointInfo if attribute is not found.
-func FromEndpoint(endpoint resolver.Endpoint) EndpointInfo {
- v := endpoint.Attributes.Value(attributeKey{})
- ei, _ := v.(EndpointInfo)
- return ei
-}
diff --git a/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go b/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
index 7ad6fb44ca..7e060f5ed1 100644
--- a/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
+++ b/vendor/google.golang.org/grpc/internal/envconfig/envconfig.go
@@ -52,6 +52,12 @@ var (
// or "false".
EnforceALPNEnabled = boolFromEnv("GRPC_ENFORCE_ALPN_ENABLED", true)
+ // NewPickFirstEnabled is set if the new pickfirst leaf policy is to be used
+ // instead of the exiting pickfirst implementation. This can be disabled by
+ // setting the environment variable "GRPC_EXPERIMENTAL_ENABLE_NEW_PICK_FIRST"
+ // to "false".
+ NewPickFirstEnabled = boolFromEnv("GRPC_EXPERIMENTAL_ENABLE_NEW_PICK_FIRST", true)
+
// XDSEndpointHashKeyBackwardCompat controls the parsing of the endpoint hash
// key from EDS LbEndpoint metadata. Endpoint hash keys can be disabled by
// setting "GRPC_XDS_ENDPOINT_HASH_KEY_BACKWARD_COMPAT" to "true". When the
@@ -69,41 +75,6 @@ var (
// ALTSHandshakerKeepaliveParams is set if we should add the
// KeepaliveParams when dial the ALTS handshaker service.
ALTSHandshakerKeepaliveParams = boolFromEnv("GRPC_EXPERIMENTAL_ALTS_HANDSHAKER_KEEPALIVE_PARAMS", false)
-
- // EnableDefaultPortForProxyTarget controls whether the resolver adds a default port 443
- // to a target address that lacks one. This flag only has an effect when all of
- // the following conditions are met:
- // - A connect proxy is being used.
- // - Target resolution is disabled.
- // - The DNS resolver is being used.
- EnableDefaultPortForProxyTarget = boolFromEnv("GRPC_EXPERIMENTAL_ENABLE_DEFAULT_PORT_FOR_PROXY_TARGET", true)
-
- // XDSAuthorityRewrite indicates whether xDS authority rewriting is enabled.
- // This feature is defined in gRFC A81 and is enabled by setting the
- // environment variable GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE to "true".
- XDSAuthorityRewrite = boolFromEnv("GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE", false)
-
- // PickFirstWeightedShuffling indicates whether weighted endpoint shuffling
- // is enabled in the pick_first LB policy, as defined in gRFC A113. This
- // feature can be disabled by setting the environment variable
- // GRPC_EXPERIMENTAL_PF_WEIGHTED_SHUFFLING to "false".
- PickFirstWeightedShuffling = boolFromEnv("GRPC_EXPERIMENTAL_PF_WEIGHTED_SHUFFLING", true)
-
- // DisableStrictPathChecking indicates whether strict path checking is
- // disabled. This feature can be disabled by setting the environment
- // variable GRPC_GO_EXPERIMENTAL_DISABLE_STRICT_PATH_CHECKING to "true".
- //
- // When strict path checking is enabled, gRPC will reject requests with
- // paths that do not conform to the gRPC over HTTP/2 specification found at
- // https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md.
- //
- // When disabled, gRPC will allow paths that do not contain a leading slash.
- // Enabling strict path checking is recommended for security reasons, as it
- // prevents potential path traversal vulnerabilities.
- //
- // A future release will remove this environment variable, enabling strict
- // path checking behavior unconditionally.
- DisableStrictPathChecking = boolFromEnv("GRPC_GO_EXPERIMENTAL_DISABLE_STRICT_PATH_CHECKING", false)
)
func boolFromEnv(envVar string, def bool) bool {
diff --git a/vendor/google.golang.org/grpc/internal/envconfig/xds.go b/vendor/google.golang.org/grpc/internal/envconfig/xds.go
index 7685d08b54..b1f883bcac 100644
--- a/vendor/google.golang.org/grpc/internal/envconfig/xds.go
+++ b/vendor/google.golang.org/grpc/internal/envconfig/xds.go
@@ -74,9 +74,4 @@ var (
// For more details, see:
// https://github.com/grpc/proposal/blob/master/A86-xds-http-connect.md
XDSHTTPConnectEnabled = boolFromEnv("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT", false)
-
- // XDSBootstrapCallCredsEnabled controls if call credentials can be used in
- // xDS bootstrap configuration via the `call_creds` field. For more details,
- // see: https://github.com/grpc/proposal/blob/master/A97-xds-jwt-call-creds.md
- XDSBootstrapCallCredsEnabled = boolFromEnv("GRPC_EXPERIMENTAL_XDS_BOOTSTRAP_CALL_CREDS", false)
)
diff --git a/vendor/google.golang.org/grpc/internal/experimental.go b/vendor/google.golang.org/grpc/internal/experimental.go
index 8a999917d9..7617be2158 100644
--- a/vendor/google.golang.org/grpc/internal/experimental.go
+++ b/vendor/google.golang.org/grpc/internal/experimental.go
@@ -25,11 +25,4 @@ var (
// BufferPool is implemented by the grpc package and returns a server
// option to configure a shared buffer pool for a grpc.Server.
BufferPool any // func (grpc.SharedBufferPool) grpc.ServerOption
-
- // SetDefaultBufferPool updates the default buffer pool.
- SetDefaultBufferPool any // func(mem.BufferPool)
-
- // AcceptCompressors is implemented by the grpc package and returns
- // a call option that restricts the grpc-accept-encoding header for a call.
- AcceptCompressors any // func(...string) grpc.CallOption
)
diff --git a/vendor/google.golang.org/grpc/internal/idle/idle.go b/vendor/google.golang.org/grpc/internal/idle/idle.go
index d3cd24f80b..2c13ee9dac 100644
--- a/vendor/google.golang.org/grpc/internal/idle/idle.go
+++ b/vendor/google.golang.org/grpc/internal/idle/idle.go
@@ -21,6 +21,7 @@
package idle
import (
+ "fmt"
"math"
"sync"
"sync/atomic"
@@ -32,15 +33,15 @@ var timeAfterFunc = func(d time.Duration, f func()) *time.Timer {
return time.AfterFunc(d, f)
}
-// ClientConn is the functionality provided by grpc.ClientConn to enter and exit
-// from idle mode.
-type ClientConn interface {
- ExitIdleMode()
+// Enforcer is the functionality provided by grpc.ClientConn to enter
+// and exit from idle mode.
+type Enforcer interface {
+ ExitIdleMode() error
EnterIdleMode()
}
-// Manager implements idleness detection and calls the ClientConn to enter/exit
-// idle mode when appropriate. Must be created by NewManager.
+// Manager implements idleness detection and calls the configured Enforcer to
+// enter/exit idle mode when appropriate. Must be created by NewManager.
type Manager struct {
// State accessed atomically.
lastCallEndTime int64 // Unix timestamp in nanos; time when the most recent RPC completed.
@@ -50,8 +51,8 @@ type Manager struct {
// Can be accessed without atomics or mutex since these are set at creation
// time and read-only after that.
- cc ClientConn // Functionality provided by grpc.ClientConn.
- timeout time.Duration
+ enforcer Enforcer // Functionality provided by grpc.ClientConn.
+ timeout time.Duration
// idleMu is used to guarantee mutual exclusion in two scenarios:
// - Opposing intentions:
@@ -71,9 +72,9 @@ type Manager struct {
// NewManager creates a new idleness manager implementation for the
// given idle timeout. It begins in idle mode.
-func NewManager(cc ClientConn, timeout time.Duration) *Manager {
+func NewManager(enforcer Enforcer, timeout time.Duration) *Manager {
return &Manager{
- cc: cc,
+ enforcer: enforcer,
timeout: timeout,
actuallyIdle: true,
activeCallsCount: -math.MaxInt32,
@@ -126,7 +127,7 @@ func (m *Manager) handleIdleTimeout() {
// Now that we've checked that there has been no activity, attempt to enter
// idle mode, which is very likely to succeed.
- if m.tryEnterIdleMode(true) {
+ if m.tryEnterIdleMode() {
// Successfully entered idle mode. No timer needed until we exit idle.
return
}
@@ -141,13 +142,10 @@ func (m *Manager) handleIdleTimeout() {
// that, it performs a last minute check to ensure that no new RPC has come in,
// making the channel active.
//
-// checkActivity controls if a check for RPC activity, since the last time the
-// idle_timeout fired, is made.
-
// Return value indicates whether or not the channel moved to idle mode.
//
// Holds idleMu which ensures mutual exclusion with exitIdleMode.
-func (m *Manager) tryEnterIdleMode(checkActivity bool) bool {
+func (m *Manager) tryEnterIdleMode() bool {
// Setting the activeCallsCount to -math.MaxInt32 indicates to OnCallBegin()
// that the channel is either in idle mode or is trying to get there.
if !atomic.CompareAndSwapInt32(&m.activeCallsCount, 0, -math.MaxInt32) {
@@ -168,7 +166,7 @@ func (m *Manager) tryEnterIdleMode(checkActivity bool) bool {
atomic.AddInt32(&m.activeCallsCount, math.MaxInt32)
return false
}
- if checkActivity && atomic.LoadInt32(&m.activeSinceLastTimerCheck) == 1 {
+ if atomic.LoadInt32(&m.activeSinceLastTimerCheck) == 1 {
// A very short RPC could have come in (and also finished) after we
// checked for calls count and activity in handleIdleTimeout(), but
// before the CAS operation. So, we need to check for activity again.
@@ -179,37 +177,44 @@ func (m *Manager) tryEnterIdleMode(checkActivity bool) bool {
// No new RPCs have come in since we set the active calls count value to
// -math.MaxInt32. And since we have the lock, it is safe to enter idle mode
// unconditionally now.
- m.cc.EnterIdleMode()
+ m.enforcer.EnterIdleMode()
m.actuallyIdle = true
return true
}
// EnterIdleModeForTesting instructs the channel to enter idle mode.
func (m *Manager) EnterIdleModeForTesting() {
- m.tryEnterIdleMode(false)
+ m.tryEnterIdleMode()
}
// OnCallBegin is invoked at the start of every RPC.
-func (m *Manager) OnCallBegin() {
+func (m *Manager) OnCallBegin() error {
if m.isClosed() {
- return
+ return nil
}
if atomic.AddInt32(&m.activeCallsCount, 1) > 0 {
// Channel is not idle now. Set the activity bit and allow the call.
atomic.StoreInt32(&m.activeSinceLastTimerCheck, 1)
- return
+ return nil
}
// Channel is either in idle mode or is in the process of moving to idle
// mode. Attempt to exit idle mode to allow this RPC.
- m.ExitIdleMode()
+ if err := m.ExitIdleMode(); err != nil {
+ // Undo the increment to calls count, and return an error causing the
+ // RPC to fail.
+ atomic.AddInt32(&m.activeCallsCount, -1)
+ return err
+ }
+
atomic.StoreInt32(&m.activeSinceLastTimerCheck, 1)
+ return nil
}
-// ExitIdleMode instructs m to call the ClientConn's ExitIdleMode and update its
+// ExitIdleMode instructs m to call the enforcer's ExitIdleMode and update m's
// internal state.
-func (m *Manager) ExitIdleMode() {
+func (m *Manager) ExitIdleMode() error {
// Holds idleMu which ensures mutual exclusion with tryEnterIdleMode.
m.idleMu.Lock()
defer m.idleMu.Unlock()
@@ -226,10 +231,12 @@ func (m *Manager) ExitIdleMode() {
// m.ExitIdleMode.
//
// In any case, there is nothing to do here.
- return
+ return nil
}
- m.cc.ExitIdleMode()
+ if err := m.enforcer.ExitIdleMode(); err != nil {
+ return fmt.Errorf("failed to exit idle mode: %w", err)
+ }
// Undo the idle entry process. This also respects any new RPC attempts.
atomic.AddInt32(&m.activeCallsCount, math.MaxInt32)
@@ -237,23 +244,7 @@ func (m *Manager) ExitIdleMode() {
// Start a new timer to fire after the configured idle timeout.
m.resetIdleTimerLocked(m.timeout)
-}
-
-// UnsafeSetNotIdle instructs the Manager to update its internal state to
-// reflect the reality that the channel is no longer in IDLE mode.
-//
-// N.B. This method is intended only for internal use by the gRPC client
-// when it exits IDLE mode **manually** from `Dial`. The callsite must ensure:
-// - The channel was **actually in IDLE mode** immediately prior to the call.
-// - There is **no concurrent activity** that could cause the channel to exit
-// IDLE mode *naturally* at the same time.
-func (m *Manager) UnsafeSetNotIdle() {
- m.idleMu.Lock()
- defer m.idleMu.Unlock()
-
- atomic.AddInt32(&m.activeCallsCount, math.MaxInt32)
- m.actuallyIdle = false
- m.resetIdleTimerLocked(m.timeout)
+ return nil
}
// OnCallEnd is invoked at the end of every RPC.
diff --git a/vendor/google.golang.org/grpc/internal/internal.go b/vendor/google.golang.org/grpc/internal/internal.go
index 4b3d563f8d..2699223a27 100644
--- a/vendor/google.golang.org/grpc/internal/internal.go
+++ b/vendor/google.golang.org/grpc/internal/internal.go
@@ -211,11 +211,22 @@ var (
// default resolver scheme.
UserSetDefaultScheme = false
+ // ConnectedAddress returns the connected address for a SubConnState. The
+ // address is only valid if the state is READY.
+ ConnectedAddress any // func (scs SubConnState) resolver.Address
+
+ // SetConnectedAddress sets the connected address for a SubConnState.
+ SetConnectedAddress any // func(scs *SubConnState, addr resolver.Address)
+
// SnapshotMetricRegistryForTesting snapshots the global data of the metric
// registry. Returns a cleanup function that sets the metric registry to its
// original state. Only called in testing functions.
SnapshotMetricRegistryForTesting func() func()
+ // SetDefaultBufferPoolForTesting updates the default buffer pool, for
+ // testing purposes.
+ SetDefaultBufferPoolForTesting any // func(mem.BufferPool)
+
// SetBufferPoolingThresholdForTesting updates the buffer pooling threshold, for
// testing purposes.
SetBufferPoolingThresholdForTesting any // func(int)
@@ -233,18 +244,6 @@ var (
// When set, the function will be called before the stream enters
// the blocking state.
NewStreamWaitingForResolver = func() {}
-
- // AddressToTelemetryLabels is an xDS-provided function to extract telemetry
- // labels from a resolver.Address. Callers must assert its type before calling.
- AddressToTelemetryLabels any // func(addr resolver.Address) map[string]string
-
- // AsyncReporterCleanupDelegate is initialized to a pass-through function by
- // default (production behavior), allowing tests to swap it with an
- // implementation which tracks registration of async reporter and its
- // corresponding cleanup.
- AsyncReporterCleanupDelegate = func(cleanup func()) func() {
- return cleanup
- }
)
// HealthChecker defines the signature of the client-side LB channel health
@@ -292,9 +291,3 @@ type EnforceClientConnEmbedding interface {
type Timer interface {
Stop() bool
}
-
-// EnforceMetricsRecorderEmbedding is used to enforce proper MetricsRecorder
-// implementation embedding.
-type EnforceMetricsRecorderEmbedding interface {
- enforceMetricsRecorderEmbedding()
-}
diff --git a/vendor/google.golang.org/grpc/internal/resolver/delegatingresolver/delegatingresolver.go b/vendor/google.golang.org/grpc/internal/resolver/delegatingresolver/delegatingresolver.go
index 5bfa67b726..20b8fb098a 100644
--- a/vendor/google.golang.org/grpc/internal/resolver/delegatingresolver/delegatingresolver.go
+++ b/vendor/google.golang.org/grpc/internal/resolver/delegatingresolver/delegatingresolver.go
@@ -22,13 +22,11 @@ package delegatingresolver
import (
"fmt"
- "net"
"net/http"
"net/url"
"sync"
"google.golang.org/grpc/grpclog"
- "google.golang.org/grpc/internal/envconfig"
"google.golang.org/grpc/internal/proxyattributes"
"google.golang.org/grpc/internal/transport"
"google.golang.org/grpc/internal/transport/networktype"
@@ -42,8 +40,6 @@ var (
HTTPSProxyFromEnvironment = http.ProxyFromEnvironment
)
-const defaultPort = "443"
-
// delegatingResolver manages both target URI and proxy address resolution by
// delegating these tasks to separate child resolvers. Essentially, it acts as
// an intermediary between the gRPC ClientConn and the child resolvers.
@@ -111,18 +107,10 @@ func New(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOpti
targetResolver: nopResolver{},
}
- addr := target.Endpoint()
var err error
- if target.URL.Scheme == "dns" && !targetResolutionEnabled && envconfig.EnableDefaultPortForProxyTarget {
- addr, err = parseTarget(addr)
- if err != nil {
- return nil, fmt.Errorf("delegating_resolver: invalid target address %q: %v", target.Endpoint(), err)
- }
- }
-
- r.proxyURL, err = proxyURLForTarget(addr)
+ r.proxyURL, err = proxyURLForTarget(target.Endpoint())
if err != nil {
- return nil, fmt.Errorf("delegating_resolver: failed to determine proxy URL for target %q: %v", target, err)
+ return nil, fmt.Errorf("delegating_resolver: failed to determine proxy URL for target %s: %v", target, err)
}
// proxy is not configured or proxy address excluded using `NO_PROXY` env
@@ -144,8 +132,8 @@ func New(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOpti
// bypass the target resolver and store the unresolved target address.
if target.URL.Scheme == "dns" && !targetResolutionEnabled {
r.targetResolverState = &resolver.State{
- Addresses: []resolver.Address{{Addr: addr}},
- Endpoints: []resolver.Endpoint{{Addresses: []resolver.Address{{Addr: addr}}}},
+ Addresses: []resolver.Address{{Addr: target.Endpoint()}},
+ Endpoints: []resolver.Endpoint{{Addresses: []resolver.Address{{Addr: target.Endpoint()}}}},
}
r.updateTargetResolverState(*r.targetResolverState)
return r, nil
@@ -214,44 +202,6 @@ func needsProxyResolver(state *resolver.State) bool {
return false
}
-// parseTarget takes a target string and ensures it is a valid "host:port" target.
-//
-// It does the following:
-// 1. If the target already has a port (e.g., "host:port", "[ipv6]:port"),
-// it is returned as is.
-// 2. If the host part is empty (e.g., ":80"), it defaults to "localhost",
-// returning "localhost:80".
-// 3. If the target is missing a port (e.g., "host", "ipv6"), the defaultPort
-// is added.
-//
-// An error is returned for empty targets or targets with a trailing colon
-// but no port (e.g., "host:").
-func parseTarget(target string) (string, error) {
- if target == "" {
- return "", fmt.Errorf("missing address")
- }
-
- host, port, err := net.SplitHostPort(target)
- if err != nil {
- // If SplitHostPort fails, it's likely because the port is missing.
- // We append the default port and return the result.
- return net.JoinHostPort(target, defaultPort), nil
- }
-
- // If SplitHostPort succeeds, we check for edge cases.
- if port == "" {
- // A success with an empty port means the target had a trailing colon,
- // e.g., "host:", which is an error.
- return "", fmt.Errorf("missing port after port-separator colon")
- }
- if host == "" {
- // A success with an empty host means the target was like ":80".
- // We default the host to "localhost".
- host = "localhost"
- }
- return net.JoinHostPort(host, port), nil
-}
-
func skipProxy(address resolver.Address) bool {
// Avoid proxy when network is not tcp.
networkType, ok := networktype.Get(address)
diff --git a/vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go b/vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
index 70b89e4d7f..ada5251cff 100644
--- a/vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
+++ b/vendor/google.golang.org/grpc/internal/resolver/dns/dns_resolver.go
@@ -125,10 +125,7 @@ func (b *dnsBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts
// IP address.
if ipAddr, err := formatIP(host); err == nil {
addr := []resolver.Address{{Addr: ipAddr + ":" + port}}
- cc.UpdateState(resolver.State{
- Addresses: addr,
- Endpoints: []resolver.Endpoint{{Addresses: addr}},
- })
+ cc.UpdateState(resolver.State{Addresses: addr})
return deadResolver{}, nil
}
@@ -345,15 +342,7 @@ func (d *dnsResolver) lookup() (*resolver.State, error) {
return nil, hostErr
}
- eps := make([]resolver.Endpoint, 0, len(addrs))
- for _, addr := range addrs {
- eps = append(eps, resolver.Endpoint{Addresses: []resolver.Address{addr}})
- }
-
- state := resolver.State{
- Addresses: addrs,
- Endpoints: eps,
- }
+ state := resolver.State{Addresses: addrs}
if len(srv) > 0 {
state = grpclbstate.Set(state, &grpclbstate.State{BalancerAddresses: srv})
}
diff --git a/vendor/google.golang.org/grpc/internal/stats/metrics_recorder_list.go b/vendor/google.golang.org/grpc/internal/stats/metrics_recorder_list.go
index 1c8c2ab303..79044657be 100644
--- a/vendor/google.golang.org/grpc/internal/stats/metrics_recorder_list.go
+++ b/vendor/google.golang.org/grpc/internal/stats/metrics_recorder_list.go
@@ -20,7 +20,6 @@ import (
"fmt"
estats "google.golang.org/grpc/experimental/stats"
- "google.golang.org/grpc/internal"
"google.golang.org/grpc/stats"
)
@@ -29,7 +28,6 @@ import (
// It eats any record calls where the label values provided do not match the
// number of label keys.
type MetricsRecorderList struct {
- internal.EnforceMetricsRecorderEmbedding
// metricsRecorders are the metrics recorders this list will forward to.
metricsRecorders []estats.MetricsRecorder
}
@@ -66,16 +64,6 @@ func (l *MetricsRecorderList) RecordInt64Count(handle *estats.Int64CountHandle,
}
}
-// RecordInt64UpDownCount records the measurement alongside labels on the int
-// count associated with the provided handle.
-func (l *MetricsRecorderList) RecordInt64UpDownCount(handle *estats.Int64UpDownCountHandle, incr int64, labels ...string) {
- verifyLabels(handle.Descriptor(), labels...)
-
- for _, metricRecorder := range l.metricsRecorders {
- metricRecorder.RecordInt64UpDownCount(handle, incr, labels...)
- }
-}
-
// RecordFloat64Count records the measurement alongside labels on the float
// count associated with the provided handle.
func (l *MetricsRecorderList) RecordFloat64Count(handle *estats.Float64CountHandle, incr float64, labels ...string) {
@@ -115,61 +103,3 @@ func (l *MetricsRecorderList) RecordInt64Gauge(handle *estats.Int64GaugeHandle,
metricRecorder.RecordInt64Gauge(handle, incr, labels...)
}
}
-
-// RegisterAsyncReporter forwards the registration to all underlying metrics
-// recorders.
-//
-// It returns a cleanup function that, when called, invokes the cleanup function
-// returned by each underlying recorder, ensuring the reporter is unregistered
-// from all of them.
-func (l *MetricsRecorderList) RegisterAsyncReporter(reporter estats.AsyncMetricReporter, metrics ...estats.AsyncMetric) func() {
- descriptorsMap := make(map[*estats.MetricDescriptor]bool, len(metrics))
- for _, m := range metrics {
- descriptorsMap[m.Descriptor()] = true
- }
- unregisterFns := make([]func(), 0, len(l.metricsRecorders))
- for _, mr := range l.metricsRecorders {
- // Wrap the AsyncMetricsRecorder to intercept calls to RecordInt64Gauge
- // and validate the labels.
- wrappedCallback := func(recorder estats.AsyncMetricsRecorder) error {
- wrappedRecorder := &asyncRecorderWrapper{
- delegate: recorder,
- descriptors: descriptorsMap,
- }
- return reporter.Report(wrappedRecorder)
- }
- unregisterFns = append(unregisterFns, mr.RegisterAsyncReporter(estats.AsyncMetricReporterFunc(wrappedCallback), metrics...))
- }
-
- // Wrap the cleanup function using the internal delegate.
- // In production, this returns realCleanup as-is.
- // In tests, the leak checker can swap this to track the registration lifetime.
- return internal.AsyncReporterCleanupDelegate(defaultCleanUp(unregisterFns))
-}
-
-func defaultCleanUp(unregisterFns []func()) func() {
- return func() {
- for _, unregister := range unregisterFns {
- unregister()
- }
- }
-}
-
-type asyncRecorderWrapper struct {
- delegate estats.AsyncMetricsRecorder
- descriptors map[*estats.MetricDescriptor]bool
-}
-
-// RecordIntAsync64Gauge records the measurement alongside labels on the int
-// gauge associated with the provided handle.
-func (w *asyncRecorderWrapper) RecordInt64AsyncGauge(handle *estats.Int64AsyncGaugeHandle, value int64, labels ...string) {
- // Ensure only metrics for descriptors passed during callback registration
- // are emitted.
- d := handle.Descriptor()
- if _, ok := w.descriptors[d]; !ok {
- return
- }
- // Validate labels and delegate.
- verifyLabels(d, labels...)
- w.delegate.RecordInt64AsyncGauge(handle, value, labels...)
-}
diff --git a/vendor/google.golang.org/grpc/internal/stats/stats.go b/vendor/google.golang.org/grpc/internal/stats/stats.go
deleted file mode 100644
index 49019b80d1..0000000000
--- a/vendor/google.golang.org/grpc/internal/stats/stats.go
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- *
- * Copyright 2025 gRPC 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 stats
-
-import (
- "context"
-
- "google.golang.org/grpc/stats"
-)
-
-type combinedHandler struct {
- handlers []stats.Handler
-}
-
-// NewCombinedHandler combines multiple stats.Handlers into a single handler.
-//
-// It returns nil if no handlers are provided. If only one handler is
-// provided, it is returned directly without wrapping.
-func NewCombinedHandler(handlers ...stats.Handler) stats.Handler {
- switch len(handlers) {
- case 0:
- return nil
- case 1:
- return handlers[0]
- default:
- return &combinedHandler{handlers: handlers}
- }
-}
-
-func (ch *combinedHandler) TagRPC(ctx context.Context, info *stats.RPCTagInfo) context.Context {
- for _, h := range ch.handlers {
- ctx = h.TagRPC(ctx, info)
- }
- return ctx
-}
-
-func (ch *combinedHandler) HandleRPC(ctx context.Context, stats stats.RPCStats) {
- for _, h := range ch.handlers {
- h.HandleRPC(ctx, stats)
- }
-}
-
-func (ch *combinedHandler) TagConn(ctx context.Context, info *stats.ConnTagInfo) context.Context {
- for _, h := range ch.handlers {
- ctx = h.TagConn(ctx, info)
- }
- return ctx
-}
-
-func (ch *combinedHandler) HandleConn(ctx context.Context, stats stats.ConnStats) {
- for _, h := range ch.handlers {
- h.HandleConn(ctx, stats)
- }
-}
diff --git a/vendor/google.golang.org/grpc/internal/transport/client_stream.go b/vendor/google.golang.org/grpc/internal/transport/client_stream.go
index cd8152ef13..ccc0e017e5 100644
--- a/vendor/google.golang.org/grpc/internal/transport/client_stream.go
+++ b/vendor/google.golang.org/grpc/internal/transport/client_stream.go
@@ -24,34 +24,30 @@ import (
"golang.org/x/net/http2"
"google.golang.org/grpc/mem"
"google.golang.org/grpc/metadata"
- "google.golang.org/grpc/stats"
"google.golang.org/grpc/status"
)
// ClientStream implements streaming functionality for a gRPC client.
type ClientStream struct {
- Stream // Embed for common stream functionality.
+ *Stream // Embed for common stream functionality.
ct *http2Client
done chan struct{} // closed at the end of stream to unblock writers.
doneFunc func() // invoked at the end of stream.
- headerChan chan struct{} // closed to indicate the end of header metadata.
- header metadata.MD // the received header metadata
-
- status *status.Status // the status error received from the server
-
- // Non-pointer fields are at the end to optimize GC allocations.
-
+ headerChan chan struct{} // closed to indicate the end of header metadata.
+ headerChanClosed uint32 // set when headerChan is closed. Used to avoid closing headerChan multiple times.
// headerValid indicates whether a valid header was received. Only
// meaningful after headerChan is closed (always call waitOnHeader() before
// reading its value).
- headerValid bool
- noHeaders bool // set if the client never received headers (set only after the stream is done).
- headerChanClosed uint32 // set when headerChan is closed. Used to avoid closing headerChan multiple times.
- bytesReceived atomic.Bool // indicates whether any bytes have been received on this stream
- unprocessed atomic.Bool // set if the server sends a refused stream or GOAWAY including this stream
- statsHandler stats.Handler // nil for internal streams (e.g., health check, ORCA) where telemetry is not supported.
+ headerValid bool
+ header metadata.MD // the received header metadata
+ noHeaders bool // set if the client never received headers (set only after the stream is done).
+
+ bytesReceived atomic.Bool // indicates whether any bytes have been received on this stream
+ unprocessed atomic.Bool // set if the server sends a refused stream or GOAWAY including this stream
+
+ status *status.Status // the status error received from the server
}
// Read reads an n byte message from the input stream.
@@ -146,11 +142,3 @@ func (s *ClientStream) TrailersOnly() bool {
func (s *ClientStream) Status() *status.Status {
return s.status
}
-
-func (s *ClientStream) requestRead(n int) {
- s.ct.adjustWindow(s, uint32(n))
-}
-
-func (s *ClientStream) updateWindow(n int) {
- s.ct.updateWindow(s, uint32(n))
-}
diff --git a/vendor/google.golang.org/grpc/internal/transport/controlbuf.go b/vendor/google.golang.org/grpc/internal/transport/controlbuf.go
index 7efa524785..a2831e5d01 100644
--- a/vendor/google.golang.org/grpc/internal/transport/controlbuf.go
+++ b/vendor/google.golang.org/grpc/internal/transport/controlbuf.go
@@ -24,13 +24,16 @@ import (
"fmt"
"net"
"runtime"
+ "strconv"
"sync"
"sync/atomic"
"golang.org/x/net/http2"
"golang.org/x/net/http2/hpack"
"google.golang.org/grpc/internal/grpclog"
+ "google.golang.org/grpc/internal/grpcutil"
"google.golang.org/grpc/mem"
+ "google.golang.org/grpc/status"
)
var updateHeaderTblSize = func(e *hpack.Encoder, v uint32) {
@@ -144,9 +147,11 @@ type cleanupStream struct {
func (c *cleanupStream) isTransportResponseFrame() bool { return c.rst } // Results in a RST_STREAM
type earlyAbortStream struct {
- streamID uint32
- rst bool
- hf []hpack.HeaderField // Pre-built header fields
+ httpStatus uint32
+ streamID uint32
+ contentSubtype string
+ status *status.Status
+ rst bool
}
func (*earlyAbortStream) isTransportResponseFrame() bool { return false }
@@ -491,16 +496,6 @@ const (
serverSide
)
-// maxWriteBufSize is the maximum length (number of elements) the cached
-// writeBuf can grow to. The length depends on the number of buffers
-// contained within the BufferSlice produced by the codec, which is
-// generally small.
-//
-// If a writeBuf larger than this limit is required, it will be allocated
-// and freed after use, rather than being cached. This avoids holding
-// on to large amounts of memory.
-const maxWriteBufSize = 64
-
// Loopy receives frames from the control buffer.
// Each frame is handled individually; most of the work done by loopy goes
// into handling data frames. Loopy maintains a queue of active streams, and each
@@ -535,8 +530,6 @@ type loopyWriter struct {
// Side-specific handlers
ssGoAwayHandler func(*goAway) (bool, error)
-
- writeBuf [][]byte // cached slice to avoid heap allocations for calls to mem.Reader.Peek.
}
func newLoopyWriter(s side, fr *framer, cbuf *controlBuffer, bdpEst *bdpEstimator, conn net.Conn, logger *grpclog.PrefixLogger, goAwayHandler func(*goAway) (bool, error), bufferPool mem.BufferPool) *loopyWriter {
@@ -672,10 +665,11 @@ func (l *loopyWriter) incomingSettingsHandler(s *incomingSettings) error {
func (l *loopyWriter) registerStreamHandler(h *registerStream) {
str := &outStream{
- id: h.streamID,
- state: empty,
- itl: &itemList{},
- wq: h.wq,
+ id: h.streamID,
+ state: empty,
+ itl: &itemList{},
+ wq: h.wq,
+ reader: mem.BufferSlice{}.Reader(),
}
l.estdStreams[h.streamID] = str
}
@@ -707,10 +701,11 @@ func (l *loopyWriter) headerHandler(h *headerFrame) error {
}
// Case 2: Client wants to originate stream.
str := &outStream{
- id: h.streamID,
- state: empty,
- itl: &itemList{},
- wq: h.wq,
+ id: h.streamID,
+ state: empty,
+ itl: &itemList{},
+ wq: h.wq,
+ reader: mem.BufferSlice{}.Reader(),
}
return l.originateStream(str, h)
}
@@ -838,7 +833,18 @@ func (l *loopyWriter) earlyAbortStreamHandler(eas *earlyAbortStream) error {
if l.side == clientSide {
return errors.New("earlyAbortStream not handled on client")
}
- if err := l.writeHeader(eas.streamID, true, eas.hf, nil); err != nil {
+ // In case the caller forgets to set the http status, default to 200.
+ if eas.httpStatus == 0 {
+ eas.httpStatus = 200
+ }
+ headerFields := []hpack.HeaderField{
+ {Name: ":status", Value: strconv.Itoa(int(eas.httpStatus))},
+ {Name: "content-type", Value: grpcutil.ContentType(eas.contentSubtype)},
+ {Name: "grpc-status", Value: strconv.Itoa(int(eas.status.Code()))},
+ {Name: "grpc-message", Value: encodeGrpcMessage(eas.status.Message())},
+ }
+
+ if err := l.writeHeader(eas.streamID, true, headerFields, nil); err != nil {
return err
}
if eas.rst {
@@ -942,11 +948,11 @@ func (l *loopyWriter) processData() (bool, error) {
if str == nil {
return true, nil
}
- reader := &str.reader
+ reader := str.reader
dataItem := str.itl.peek().(*dataFrame) // Peek at the first data item this stream.
if !dataItem.processing {
dataItem.processing = true
- reader.Reset(dataItem.data)
+ str.reader.Reset(dataItem.data)
dataItem.data.Free()
}
// A data item is represented by a dataFrame, since it later translates into
@@ -958,11 +964,11 @@ func (l *loopyWriter) processData() (bool, error) {
if len(dataItem.h) == 0 && reader.Remaining() == 0 { // Empty data frame
// Client sends out empty data frame with endStream = true
- if err := l.framer.writeData(dataItem.streamID, dataItem.endStream, nil); err != nil {
+ if err := l.framer.fr.WriteData(dataItem.streamID, dataItem.endStream, nil); err != nil {
return false, err
}
str.itl.dequeue() // remove the empty data item from stream
- reader.Close()
+ _ = reader.Close()
if str.itl.isEmpty() {
str.state = empty
} else if trailer, ok := str.itl.peek().(*headerFrame); ok { // the next item is trailers.
@@ -995,20 +1001,25 @@ func (l *loopyWriter) processData() (bool, error) {
remainingBytes := len(dataItem.h) + reader.Remaining() - hSize - dSize
size := hSize + dSize
- l.writeBuf = l.writeBuf[:0]
- if hSize > 0 {
- l.writeBuf = append(l.writeBuf, dataItem.h[:hSize])
- }
- if dSize > 0 {
- var err error
- l.writeBuf, err = reader.Peek(dSize, l.writeBuf)
- if err != nil {
- // This must never happen since the reader must have at least dSize
- // bytes.
- // Log an error to fail tests.
- l.logger.Errorf("unexpected error while reading Data frame payload: %v", err)
- return false, err
+ var buf *[]byte
+
+ if hSize != 0 && dSize == 0 {
+ buf = &dataItem.h
+ } else {
+ // Note: this is only necessary because the http2.Framer does not support
+ // partially writing a frame, so the sequence must be materialized into a buffer.
+ // TODO: Revisit once https://github.com/golang/go/issues/66655 is addressed.
+ pool := l.bufferPool
+ if pool == nil {
+ // Note that this is only supposed to be nil in tests. Otherwise, stream is
+ // always initialized with a BufferPool.
+ pool = mem.DefaultBufferPool()
}
+ buf = pool.Get(size)
+ defer pool.Put(buf)
+
+ copy((*buf)[:hSize], dataItem.h)
+ _, _ = reader.Read((*buf)[hSize:])
}
// Now that outgoing flow controls are checked we can replenish str's write quota
@@ -1021,14 +1032,7 @@ func (l *loopyWriter) processData() (bool, error) {
if dataItem.onEachWrite != nil {
dataItem.onEachWrite()
}
- err := l.framer.writeData(dataItem.streamID, endStream, l.writeBuf)
- reader.Discard(dSize)
- if cap(l.writeBuf) > maxWriteBufSize {
- l.writeBuf = nil
- } else {
- clear(l.writeBuf)
- }
- if err != nil {
+ if err := l.framer.fr.WriteData(dataItem.streamID, endStream, (*buf)[:size]); err != nil {
return false, err
}
str.bytesOutStanding += size
@@ -1036,7 +1040,7 @@ func (l *loopyWriter) processData() (bool, error) {
dataItem.h = dataItem.h[hSize:]
if remainingBytes == 0 { // All the data from that message was written out.
- reader.Close()
+ _ = reader.Close()
str.itl.dequeue()
}
if str.itl.isEmpty() {
diff --git a/vendor/google.golang.org/grpc/internal/transport/flowcontrol.go b/vendor/google.golang.org/grpc/internal/transport/flowcontrol.go
index 7cfbc9637b..dfc0f224ec 100644
--- a/vendor/google.golang.org/grpc/internal/transport/flowcontrol.go
+++ b/vendor/google.golang.org/grpc/internal/transport/flowcontrol.go
@@ -28,7 +28,7 @@ import (
// writeQuota is a soft limit on the amount of data a stream can
// schedule before some of it is written out.
type writeQuota struct {
- _ noCopy
+ quota int32
// get waits on read from when quota goes less than or equal to zero.
// replenish writes on it when quota goes positive again.
ch chan struct{}
@@ -38,17 +38,16 @@ type writeQuota struct {
// It is implemented as a field so that it can be updated
// by tests.
replenish func(n int)
- quota int32
}
-// init allows a writeQuota to be initialized in-place, which is useful for
-// resetting a buffer or for avoiding a heap allocation when the buffer is
-// embedded in another struct.
-func (w *writeQuota) init(sz int32, done <-chan struct{}) {
- w.quota = sz
- w.ch = make(chan struct{}, 1)
- w.done = done
+func newWriteQuota(sz int32, done <-chan struct{}) *writeQuota {
+ w := &writeQuota{
+ quota: sz,
+ ch: make(chan struct{}, 1),
+ done: done,
+ }
w.replenish = w.realReplenish
+ return w
}
func (w *writeQuota) get(sz int32) error {
@@ -68,9 +67,9 @@ func (w *writeQuota) get(sz int32) error {
func (w *writeQuota) realReplenish(n int) {
sz := int32(n)
- newQuota := atomic.AddInt32(&w.quota, sz)
- previousQuota := newQuota - sz
- if previousQuota <= 0 && newQuota > 0 {
+ a := atomic.AddInt32(&w.quota, sz)
+ b := a - sz
+ if b <= 0 && a > 0 {
select {
case w.ch <- struct{}{}:
default:
diff --git a/vendor/google.golang.org/grpc/internal/transport/handler_server.go b/vendor/google.golang.org/grpc/internal/transport/handler_server.go
index 7ab3422b8a..d954a64c38 100644
--- a/vendor/google.golang.org/grpc/internal/transport/handler_server.go
+++ b/vendor/google.golang.org/grpc/internal/transport/handler_server.go
@@ -50,7 +50,7 @@ import (
// NewServerHandlerTransport returns a ServerTransport handling gRPC from
// inside an http.Handler, or writes an HTTP error to w and returns an error.
// It requires that the http Server supports HTTP/2.
-func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request, stats stats.Handler, bufferPool mem.BufferPool) (ServerTransport, error) {
+func NewServerHandlerTransport(w http.ResponseWriter, r *http.Request, stats []stats.Handler, bufferPool mem.BufferPool) (ServerTransport, error) {
if r.Method != http.MethodPost {
w.Header().Set("Allow", http.MethodPost)
msg := fmt.Sprintf("invalid gRPC request method %q", r.Method)
@@ -170,7 +170,7 @@ type serverHandlerTransport struct {
// TODO make sure this is consistent across handler_server and http2_server
contentSubtype string
- stats stats.Handler
+ stats []stats.Handler
logger *grpclog.PrefixLogger
bufferPool mem.BufferPool
@@ -274,13 +274,15 @@ func (ht *serverHandlerTransport) writeStatus(s *ServerStream, st *status.Status
}
})
- if err == nil && ht.stats != nil { // transport has not been closed
+ if err == nil { // transport has not been closed
// Note: The trailer fields are compressed with hpack after this call returns.
// No WireLength field is set here.
s.hdrMu.Lock()
- ht.stats.HandleRPC(s.Context(), &stats.OutTrailer{
- Trailer: s.trailer.Copy(),
- })
+ for _, sh := range ht.stats {
+ sh.HandleRPC(s.Context(), &stats.OutTrailer{
+ Trailer: s.trailer.Copy(),
+ })
+ }
s.hdrMu.Unlock()
}
ht.Close(errors.New("finished writing status"))
@@ -372,23 +374,19 @@ func (ht *serverHandlerTransport) writeHeader(s *ServerStream, md metadata.MD) e
ht.rw.(http.Flusher).Flush()
})
- if err == nil && ht.stats != nil {
- // Note: The header fields are compressed with hpack after this call returns.
- // No WireLength field is set here.
- ht.stats.HandleRPC(s.Context(), &stats.OutHeader{
- Header: md.Copy(),
- Compression: s.sendCompress,
- })
+ if err == nil {
+ for _, sh := range ht.stats {
+ // Note: The header fields are compressed with hpack after this call returns.
+ // No WireLength field is set here.
+ sh.HandleRPC(s.Context(), &stats.OutHeader{
+ Header: md.Copy(),
+ Compression: s.sendCompress,
+ })
+ }
}
return err
}
-func (ht *serverHandlerTransport) adjustWindow(*ServerStream, uint32) {
-}
-
-func (ht *serverHandlerTransport) updateWindow(*ServerStream, uint32) {
-}
-
func (ht *serverHandlerTransport) HandleStreams(ctx context.Context, startStream func(*ServerStream)) {
// With this transport type there will be exactly 1 stream: this HTTP request.
var cancel context.CancelFunc
@@ -413,9 +411,11 @@ func (ht *serverHandlerTransport) HandleStreams(ctx context.Context, startStream
ctx = metadata.NewIncomingContext(ctx, ht.headerMD)
req := ht.req
s := &ServerStream{
- Stream: Stream{
+ Stream: &Stream{
id: 0, // irrelevant
ctx: ctx,
+ requestRead: func(int) {},
+ buf: newRecvBuffer(),
method: req.URL.Path,
recvCompress: req.Header.Get("grpc-encoding"),
contentSubtype: ht.contentSubtype,
@@ -424,11 +424,9 @@ func (ht *serverHandlerTransport) HandleStreams(ctx context.Context, startStream
st: ht,
headerWireLength: 0, // won't have access to header wire length until golang/go#18997.
}
- s.Stream.buf.init()
- s.readRequester = s
- s.trReader = transportReader{
- reader: recvBufferReader{ctx: s.ctx, ctxDone: s.ctx.Done(), recv: &s.buf},
- windowHandler: s,
+ s.trReader = &transportReader{
+ reader: &recvBufferReader{ctx: s.ctx, ctxDone: s.ctx.Done(), recv: s.buf},
+ windowHandler: func(int) {},
}
// readerDone is closed when the Body.Read-ing goroutine exits.
diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_client.go b/vendor/google.golang.org/grpc/internal/transport/http2_client.go
index 37b1acc340..7cb238794f 100644
--- a/vendor/google.golang.org/grpc/internal/transport/http2_client.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http2_client.go
@@ -44,7 +44,6 @@ import (
"google.golang.org/grpc/internal/grpcutil"
imetadata "google.golang.org/grpc/internal/metadata"
"google.golang.org/grpc/internal/proxyattributes"
- istats "google.golang.org/grpc/internal/stats"
istatus "google.golang.org/grpc/internal/status"
isyscall "google.golang.org/grpc/internal/syscall"
"google.golang.org/grpc/internal/transport/networktype"
@@ -106,7 +105,7 @@ type http2Client struct {
kp keepalive.ClientParameters
keepaliveEnabled bool
- statsHandler stats.Handler
+ statsHandlers []stats.Handler
initialWindowSize int32
@@ -336,14 +335,14 @@ func NewHTTP2Client(connectCtx, ctx context.Context, addr resolver.Address, opts
writerDone: make(chan struct{}),
goAway: make(chan struct{}),
keepaliveDone: make(chan struct{}),
- framer: newFramer(conn, writeBufSize, readBufSize, opts.SharedWriteBuffer, maxHeaderListSize, opts.BufferPool),
+ framer: newFramer(conn, writeBufSize, readBufSize, opts.SharedWriteBuffer, maxHeaderListSize),
fc: &trInFlow{limit: uint32(icwz)},
scheme: scheme,
activeStreams: make(map[uint32]*ClientStream),
isSecure: isSecure,
perRPCCreds: perRPCCreds,
kp: kp,
- statsHandler: istats.NewCombinedHandler(opts.StatsHandlers...),
+ statsHandlers: opts.StatsHandlers,
initialWindowSize: initialWindowSize,
nextID: 1,
maxConcurrentStreams: defaultMaxStreamsClient,
@@ -370,7 +369,7 @@ func NewHTTP2Client(connectCtx, ctx context.Context, addr resolver.Address, opts
})
t.logger = prefixLoggerForClientTransport(t)
// Add peer information to the http2client context.
- t.ctx = peer.NewContext(t.ctx, t.Peer())
+ t.ctx = peer.NewContext(t.ctx, t.getPeer())
if md, ok := addr.Metadata.(*metadata.MD); ok {
t.md = *md
@@ -387,14 +386,15 @@ func NewHTTP2Client(connectCtx, ctx context.Context, addr resolver.Address, opts
updateFlowControl: t.updateFlowControl,
}
}
- if t.statsHandler != nil {
- t.ctx = t.statsHandler.TagConn(t.ctx, &stats.ConnTagInfo{
+ for _, sh := range t.statsHandlers {
+ t.ctx = sh.TagConn(t.ctx, &stats.ConnTagInfo{
RemoteAddr: t.remoteAddr,
LocalAddr: t.localAddr,
})
- t.statsHandler.HandleConn(t.ctx, &stats.ConnBegin{
+ connBegin := &stats.ConnBegin{
Client: true,
- })
+ }
+ sh.HandleConn(t.ctx, connBegin)
}
if t.keepaliveEnabled {
t.kpDormancyCond = sync.NewCond(&t.mu)
@@ -478,40 +478,45 @@ func NewHTTP2Client(connectCtx, ctx context.Context, addr resolver.Address, opts
return t, nil
}
-func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr, handler stats.Handler) *ClientStream {
+func (t *http2Client) newStream(ctx context.Context, callHdr *CallHdr) *ClientStream {
// TODO(zhaoq): Handle uint32 overflow of Stream.id.
s := &ClientStream{
- Stream: Stream{
+ Stream: &Stream{
method: callHdr.Method,
sendCompress: callHdr.SendCompress,
+ buf: newRecvBuffer(),
contentSubtype: callHdr.ContentSubtype,
},
- ct: t,
- done: make(chan struct{}),
- headerChan: make(chan struct{}),
- doneFunc: callHdr.DoneFunc,
- statsHandler: handler,
- }
- s.Stream.buf.init()
- s.Stream.wq.init(defaultWriteQuota, s.done)
- s.readRequester = s
+ ct: t,
+ done: make(chan struct{}),
+ headerChan: make(chan struct{}),
+ doneFunc: callHdr.DoneFunc,
+ }
+ s.wq = newWriteQuota(defaultWriteQuota, s.done)
+ s.requestRead = func(n int) {
+ t.adjustWindow(s, uint32(n))
+ }
// The client side stream context should have exactly the same life cycle with the user provided context.
// That means, s.ctx should be read-only. And s.ctx is done iff ctx is done.
// So we use the original context here instead of creating a copy.
s.ctx = ctx
- s.trReader = transportReader{
- reader: recvBufferReader{
- ctx: s.ctx,
- ctxDone: s.ctx.Done(),
- recv: &s.buf,
- clientStream: s,
+ s.trReader = &transportReader{
+ reader: &recvBufferReader{
+ ctx: s.ctx,
+ ctxDone: s.ctx.Done(),
+ recv: s.buf,
+ closeStream: func(err error) {
+ s.Close(err)
+ },
+ },
+ windowHandler: func(n int) {
+ t.updateWindow(s, uint32(n))
},
- windowHandler: s,
}
return s
}
-func (t *http2Client) Peer() *peer.Peer {
+func (t *http2Client) getPeer() *peer.Peer {
return &peer.Peer{
Addr: t.remoteAddr,
AuthInfo: t.authInfo, // Can be nil
@@ -552,9 +557,6 @@ func (t *http2Client) createHeaderFields(ctx context.Context, callHdr *CallHdr)
hfLen := 7 // :method, :scheme, :path, :authority, content-type, user-agent, te
hfLen += len(authData) + len(callAuthData)
registeredCompressors := t.registeredCompressors
- if callHdr.AcceptedCompressors != nil {
- registeredCompressors = *callHdr.AcceptedCompressors
- }
if callHdr.PreviousAttempts > 0 {
hfLen++
}
@@ -745,8 +747,8 @@ func (e NewStreamError) Error() string {
// NewStream creates a stream and registers it into the transport as "active"
// streams. All non-nil errors returned will be *NewStreamError.
-func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr, handler stats.Handler) (*ClientStream, error) {
- ctx = peer.NewContext(ctx, t.Peer())
+func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr) (*ClientStream, error) {
+ ctx = peer.NewContext(ctx, t.getPeer())
// ServerName field of the resolver returned address takes precedence over
// Host field of CallHdr to determine the :authority header. This is because,
@@ -782,7 +784,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr, handler s
if err != nil {
return nil, &NewStreamError{Err: err, AllowTransparentRetry: false}
}
- s := t.newStream(ctx, callHdr, handler)
+ s := t.newStream(ctx, callHdr)
cleanup := func(err error) {
if s.swapState(streamDone) == streamDone {
// If it was already done, return.
@@ -821,7 +823,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr, handler s
return nil
},
onOrphaned: cleanup,
- wq: &s.wq,
+ wq: s.wq,
}
firstTry := true
var ch chan struct{}
@@ -852,7 +854,7 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr, handler s
transportDrainRequired = t.nextID > MaxStreamID
s.id = hdr.streamID
- s.fc = inFlow{limit: uint32(t.initialWindowSize)}
+ s.fc = &inFlow{limit: uint32(t.initialWindowSize)}
t.activeStreams[s.id] = s
t.mu.Unlock()
@@ -903,23 +905,27 @@ func (t *http2Client) NewStream(ctx context.Context, callHdr *CallHdr, handler s
return nil, &NewStreamError{Err: ErrConnClosing, AllowTransparentRetry: true}
}
}
- if s.statsHandler != nil {
+ if len(t.statsHandlers) != 0 {
header, ok := metadata.FromOutgoingContext(ctx)
if ok {
header.Set("user-agent", t.userAgent)
} else {
header = metadata.Pairs("user-agent", t.userAgent)
}
- // Note: The header fields are compressed with hpack after this call returns.
- // No WireLength field is set here.
- s.statsHandler.HandleRPC(s.ctx, &stats.OutHeader{
- Client: true,
- FullMethod: callHdr.Method,
- RemoteAddr: t.remoteAddr,
- LocalAddr: t.localAddr,
- Compression: callHdr.SendCompress,
- Header: header,
- })
+ for _, sh := range t.statsHandlers {
+ // Note: The header fields are compressed with hpack after this call returns.
+ // No WireLength field is set here.
+ // Note: Creating a new stats object to prevent pollution.
+ outHeader := &stats.OutHeader{
+ Client: true,
+ FullMethod: callHdr.Method,
+ RemoteAddr: t.remoteAddr,
+ LocalAddr: t.localAddr,
+ Compression: callHdr.SendCompress,
+ Header: header,
+ }
+ sh.HandleRPC(s.ctx, outHeader)
+ }
}
if transportDrainRequired {
if t.logger.V(logLevel) {
@@ -996,9 +1002,6 @@ func (t *http2Client) closeStream(s *ClientStream, err error, rst bool, rstCode
// accessed anymore.
func (t *http2Client) Close(err error) {
t.conn.SetWriteDeadline(time.Now().Add(time.Second * 10))
- // For background on the deadline value chosen here, see
- // https://github.com/grpc/grpc-go/issues/8425#issuecomment-3057938248 .
- t.conn.SetReadDeadline(time.Now().Add(time.Second))
t.mu.Lock()
// Make sure we only close once.
if t.state == closing {
@@ -1060,10 +1063,11 @@ func (t *http2Client) Close(err error) {
for _, s := range streams {
t.closeStream(s, err, false, http2.ErrCodeNo, st, nil, false)
}
- if t.statsHandler != nil {
- t.statsHandler.HandleConn(t.ctx, &stats.ConnEnd{
+ for _, sh := range t.statsHandlers {
+ connEnd := &stats.ConnEnd{
Client: true,
- })
+ }
+ sh.HandleConn(t.ctx, connEnd)
}
}
@@ -1174,7 +1178,7 @@ func (t *http2Client) updateFlowControl(n uint32) {
})
}
-func (t *http2Client) handleData(f *parsedDataFrame) {
+func (t *http2Client) handleData(f *http2.DataFrame) {
size := f.Header().Length
var sendBDPPing bool
if t.bdpEst != nil {
@@ -1218,15 +1222,22 @@ func (t *http2Client) handleData(f *parsedDataFrame) {
t.closeStream(s, io.EOF, true, http2.ErrCodeFlowControl, status.New(codes.Internal, err.Error()), nil, false)
return
}
- dataLen := f.data.Len()
if f.Header().Flags.Has(http2.FlagDataPadded) {
- if w := s.fc.onRead(size - uint32(dataLen)); w > 0 {
+ if w := s.fc.onRead(size - uint32(len(f.Data()))); w > 0 {
t.controlBuf.put(&outgoingWindowUpdate{s.id, w})
}
}
- if dataLen > 0 {
- f.data.Ref()
- s.write(recvMsg{buffer: f.data})
+ // TODO(bradfitz, zhaoq): A copy is required here because there is no
+ // guarantee f.Data() is consumed before the arrival of next frame.
+ // Can this copy be eliminated?
+ if len(f.Data()) > 0 {
+ pool := t.bufferPool
+ if pool == nil {
+ // Note that this is only supposed to be nil in tests. Otherwise, stream is
+ // always initialized with a BufferPool.
+ pool = mem.DefaultBufferPool()
+ }
+ s.write(recvMsg{buffer: mem.Copy(f.Data(), pool)})
}
}
// The server has closed the stream without sending trailers. Record that
@@ -1466,14 +1477,17 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
contentTypeErr = "malformed header: missing HTTP content-type"
grpcMessage string
recvCompress string
+ httpStatusCode *int
httpStatusErr string
- // the code from the grpc-status header, if present
- grpcStatusCode = codes.Unknown
+ rawStatusCode = codes.Unknown
// headerError is set if an error is encountered while parsing the headers
headerError string
- httpStatus string
)
+ if initialHeader {
+ httpStatusErr = "malformed header: missing HTTP status"
+ }
+
for _, hf := range frame.Fields {
switch hf.Name {
case "content-type":
@@ -1489,75 +1503,73 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
case "grpc-status":
code, err := strconv.ParseInt(hf.Value, 10, 32)
if err != nil {
- se := status.New(codes.Unknown, fmt.Sprintf("transport: malformed grpc-status: %v", err))
+ se := status.New(codes.Internal, fmt.Sprintf("transport: malformed grpc-status: %v", err))
t.closeStream(s, se.Err(), true, http2.ErrCodeProtocol, se, nil, endStream)
return
}
- grpcStatusCode = codes.Code(uint32(code))
+ rawStatusCode = codes.Code(uint32(code))
case "grpc-message":
grpcMessage = decodeGrpcMessage(hf.Value)
case ":status":
- httpStatus = hf.Value
- default:
- if isReservedHeader(hf.Name) && !isWhitelistedHeader(hf.Name) {
- break
- }
- v, err := decodeMetadataHeader(hf.Name, hf.Value)
- if err != nil {
- headerError = fmt.Sprintf("transport: malformed %s: %v", hf.Name, err)
- logger.Warningf("Failed to decode metadata header (%q, %q): %v", hf.Name, hf.Value, err)
- break
- }
- mdata[hf.Name] = append(mdata[hf.Name], v)
- }
- }
-
- // If a non-gRPC response is received, then evaluate the HTTP status to
- // process the response and close the stream.
- // In case http status doesn't provide any error information (status : 200),
- // then evalute response code to be Unknown.
- if !isGRPC {
- var grpcErrorCode = codes.Internal
- if httpStatus == "" {
- httpStatusErr = "malformed header: missing HTTP status"
- } else {
- // Parse the status codes (e.g. "200", 404").
- statusCode, err := strconv.Atoi(httpStatus)
+ c, err := strconv.ParseInt(hf.Value, 10, 32)
if err != nil {
- se := status.New(grpcErrorCode, fmt.Sprintf("transport: malformed http-status: %v", err))
+ se := status.New(codes.Internal, fmt.Sprintf("transport: malformed http-status: %v", err))
t.closeStream(s, se.Err(), true, http2.ErrCodeProtocol, se, nil, endStream)
return
}
+ statusCode := int(c)
if statusCode >= 100 && statusCode < 200 {
if endStream {
se := status.New(codes.Internal, fmt.Sprintf(
"protocol error: informational header with status code %d must not have END_STREAM set", statusCode))
t.closeStream(s, se.Err(), true, http2.ErrCodeProtocol, se, nil, endStream)
}
- // In case of informational headers, return.
return
}
+ httpStatusCode = &statusCode
+ if statusCode == 200 {
+ httpStatusErr = ""
+ break
+ }
+
httpStatusErr = fmt.Sprintf(
"unexpected HTTP status code received from server: %d (%s)",
statusCode,
http.StatusText(statusCode),
)
+ default:
+ if isReservedHeader(hf.Name) && !isWhitelistedHeader(hf.Name) {
+ break
+ }
+ v, err := decodeMetadataHeader(hf.Name, hf.Value)
+ if err != nil {
+ headerError = fmt.Sprintf("transport: malformed %s: %v", hf.Name, err)
+ logger.Warningf("Failed to decode metadata header (%q, %q): %v", hf.Name, hf.Value, err)
+ break
+ }
+ mdata[hf.Name] = append(mdata[hf.Name], v)
+ }
+ }
+
+ if !isGRPC || httpStatusErr != "" {
+ var code = codes.Internal // when header does not include HTTP status, return INTERNAL
+
+ if httpStatusCode != nil {
var ok bool
- grpcErrorCode, ok = HTTPStatusConvTab[statusCode]
+ code, ok = HTTPStatusConvTab[*httpStatusCode]
if !ok {
- grpcErrorCode = codes.Unknown
+ code = codes.Unknown
}
}
var errs []string
if httpStatusErr != "" {
errs = append(errs, httpStatusErr)
}
-
if contentTypeErr != "" {
errs = append(errs, contentTypeErr)
}
-
- se := status.New(grpcErrorCode, strings.Join(errs, "; "))
+ // Verify the HTTP response is a 200.
+ se := status.New(code, strings.Join(errs, "; "))
t.closeStream(s, se.Err(), true, http2.ErrCodeProtocol, se, nil, endStream)
return
}
@@ -1588,20 +1600,22 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
}
}
- if s.statsHandler != nil {
+ for _, sh := range t.statsHandlers {
if !endStream {
- s.statsHandler.HandleRPC(s.ctx, &stats.InHeader{
+ inHeader := &stats.InHeader{
Client: true,
WireLength: int(frame.Header().Length),
Header: metadata.MD(mdata).Copy(),
Compression: s.recvCompress,
- })
+ }
+ sh.HandleRPC(s.ctx, inHeader)
} else {
- s.statsHandler.HandleRPC(s.ctx, &stats.InTrailer{
+ inTrailer := &stats.InTrailer{
Client: true,
WireLength: int(frame.Header().Length),
Trailer: metadata.MD(mdata).Copy(),
- })
+ }
+ sh.HandleRPC(s.ctx, inTrailer)
}
}
@@ -1609,7 +1623,7 @@ func (t *http2Client) operateHeaders(frame *http2.MetaHeadersFrame) {
return
}
- status := istatus.NewWithProto(grpcStatusCode, grpcMessage, mdata[grpcStatusDetailsBinHeader])
+ status := istatus.NewWithProto(rawStatusCode, grpcMessage, mdata[grpcStatusDetailsBinHeader])
// If client received END_STREAM from server while stream was still active,
// send RST_STREAM.
@@ -1656,7 +1670,7 @@ func (t *http2Client) reader(errCh chan<- error) {
// loop to keep reading incoming messages on this transport.
for {
t.controlBuf.throttle()
- frame, err := t.framer.readFrame()
+ frame, err := t.framer.fr.ReadFrame()
if t.keepaliveEnabled {
atomic.StoreInt64(&t.lastRead, time.Now().UnixNano())
}
@@ -1671,7 +1685,7 @@ func (t *http2Client) reader(errCh chan<- error) {
if s != nil {
// use error detail to provide better err message
code := http2ErrConvTab[se.Code]
- errorDetail := t.framer.errorDetail()
+ errorDetail := t.framer.fr.ErrorDetail()
var msg string
if errorDetail != nil {
msg = errorDetail.Error()
@@ -1689,9 +1703,8 @@ func (t *http2Client) reader(errCh chan<- error) {
switch frame := frame.(type) {
case *http2.MetaHeadersFrame:
t.operateHeaders(frame)
- case *parsedDataFrame:
+ case *http2.DataFrame:
t.handleData(frame)
- frame.data.Free()
case *http2.RSTStreamFrame:
t.handleRSTStream(frame)
case *http2.SettingsFrame:
@@ -1811,6 +1824,8 @@ func (t *http2Client) socketMetrics() *channelz.EphemeralSocketMetrics {
}
}
+func (t *http2Client) RemoteAddr() net.Addr { return t.remoteAddr }
+
func (t *http2Client) incrMsgSent() {
if channelz.IsOn() {
t.channelz.SocketMetrics.MessagesSent.Add(1)
diff --git a/vendor/google.golang.org/grpc/internal/transport/http2_server.go b/vendor/google.golang.org/grpc/internal/transport/http2_server.go
index a1a14e14fc..83cee314c8 100644
--- a/vendor/google.golang.org/grpc/internal/transport/http2_server.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http2_server.go
@@ -35,8 +35,6 @@ import (
"golang.org/x/net/http2"
"golang.org/x/net/http2/hpack"
- "google.golang.org/protobuf/proto"
-
"google.golang.org/grpc/internal"
"google.golang.org/grpc/internal/grpclog"
"google.golang.org/grpc/internal/grpcutil"
@@ -44,6 +42,7 @@ import (
istatus "google.golang.org/grpc/internal/status"
"google.golang.org/grpc/internal/syscall"
"google.golang.org/grpc/mem"
+ "google.golang.org/protobuf/proto"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
@@ -87,7 +86,7 @@ type http2Server struct {
// updates, reset streams, and various settings) to the controller.
controlBuf *controlBuffer
fc *trInFlow
- stats stats.Handler
+ stats []stats.Handler
// Keepalive and max-age parameters for the server.
kp keepalive.ServerParameters
// Keepalive enforcement policy.
@@ -169,7 +168,7 @@ func NewServerTransport(conn net.Conn, config *ServerConfig) (_ ServerTransport,
if config.MaxHeaderListSize != nil {
maxHeaderListSize = *config.MaxHeaderListSize
}
- framer := newFramer(conn, writeBufSize, readBufSize, config.SharedWriteBuffer, maxHeaderListSize, config.BufferPool)
+ framer := newFramer(conn, writeBufSize, readBufSize, config.SharedWriteBuffer, maxHeaderListSize)
// Send initial settings as connection preface to client.
isettings := []http2.Setting{{
ID: http2.SettingMaxFrameSize,
@@ -261,7 +260,7 @@ func NewServerTransport(conn net.Conn, config *ServerConfig) (_ ServerTransport,
fc: &trInFlow{limit: uint32(icwz)},
state: reachable,
activeStreams: make(map[uint32]*ServerStream),
- stats: config.StatsHandler,
+ stats: config.StatsHandlers,
kp: kp,
idle: time.Now(),
kep: kep,
@@ -391,15 +390,16 @@ func (t *http2Server) operateHeaders(ctx context.Context, frame *http2.MetaHeade
}
t.maxStreamID = streamID
+ buf := newRecvBuffer()
s := &ServerStream{
- Stream: Stream{
- id: streamID,
- fc: inFlow{limit: uint32(t.initialWindowSize)},
+ Stream: &Stream{
+ id: streamID,
+ buf: buf,
+ fc: &inFlow{limit: uint32(t.initialWindowSize)},
},
st: t,
headerWireLength: int(frame.Header().Length),
}
- s.Stream.buf.init()
var (
// if false, content-type was missing or invalid
isGRPC = false
@@ -479,7 +479,13 @@ func (t *http2Server) operateHeaders(ctx context.Context, frame *http2.MetaHeade
if t.logger.V(logLevel) {
t.logger.Infof("Aborting the stream early: %v", errMsg)
}
- t.writeEarlyAbort(streamID, s.contentSubtype, status.New(codes.Internal, errMsg), http.StatusBadRequest, !frame.StreamEnded())
+ t.controlBuf.put(&earlyAbortStream{
+ httpStatus: http.StatusBadRequest,
+ streamID: streamID,
+ contentSubtype: s.contentSubtype,
+ status: status.New(codes.Internal, errMsg),
+ rst: !frame.StreamEnded(),
+ })
return nil
}
@@ -493,11 +499,23 @@ func (t *http2Server) operateHeaders(ctx context.Context, frame *http2.MetaHeade
return nil
}
if !isGRPC {
- t.writeEarlyAbort(streamID, s.contentSubtype, status.Newf(codes.InvalidArgument, "invalid gRPC request content-type %q", contentType), http.StatusUnsupportedMediaType, !frame.StreamEnded())
+ t.controlBuf.put(&earlyAbortStream{
+ httpStatus: http.StatusUnsupportedMediaType,
+ streamID: streamID,
+ contentSubtype: s.contentSubtype,
+ status: status.Newf(codes.InvalidArgument, "invalid gRPC request content-type %q", contentType),
+ rst: !frame.StreamEnded(),
+ })
return nil
}
if headerError != nil {
- t.writeEarlyAbort(streamID, s.contentSubtype, headerError, http.StatusBadRequest, !frame.StreamEnded())
+ t.controlBuf.put(&earlyAbortStream{
+ httpStatus: http.StatusBadRequest,
+ streamID: streamID,
+ contentSubtype: s.contentSubtype,
+ status: headerError,
+ rst: !frame.StreamEnded(),
+ })
return nil
}
@@ -551,7 +569,13 @@ func (t *http2Server) operateHeaders(ctx context.Context, frame *http2.MetaHeade
if t.logger.V(logLevel) {
t.logger.Infof("Aborting the stream early: %v", errMsg)
}
- t.writeEarlyAbort(streamID, s.contentSubtype, status.New(codes.Internal, errMsg), http.StatusMethodNotAllowed, !frame.StreamEnded())
+ t.controlBuf.put(&earlyAbortStream{
+ httpStatus: http.StatusMethodNotAllowed,
+ streamID: streamID,
+ contentSubtype: s.contentSubtype,
+ status: status.New(codes.Internal, errMsg),
+ rst: !frame.StreamEnded(),
+ })
s.cancel()
return nil
}
@@ -566,16 +590,27 @@ func (t *http2Server) operateHeaders(ctx context.Context, frame *http2.MetaHeade
if !ok {
stat = status.New(codes.PermissionDenied, err.Error())
}
- t.writeEarlyAbort(s.id, s.contentSubtype, stat, http.StatusOK, !frame.StreamEnded())
+ t.controlBuf.put(&earlyAbortStream{
+ httpStatus: http.StatusOK,
+ streamID: s.id,
+ contentSubtype: s.contentSubtype,
+ status: stat,
+ rst: !frame.StreamEnded(),
+ })
return nil
}
}
if s.ctx.Err() != nil {
t.mu.Unlock()
- st := status.New(codes.DeadlineExceeded, context.DeadlineExceeded.Error())
// Early abort in case the timeout was zero or so low it already fired.
- t.writeEarlyAbort(s.id, s.contentSubtype, st, http.StatusOK, !frame.StreamEnded())
+ t.controlBuf.put(&earlyAbortStream{
+ httpStatus: http.StatusOK,
+ streamID: s.id,
+ contentSubtype: s.contentSubtype,
+ status: status.New(codes.DeadlineExceeded, context.DeadlineExceeded.Error()),
+ rst: !frame.StreamEnded(),
+ })
return nil
}
@@ -605,21 +640,25 @@ func (t *http2Server) operateHeaders(ctx context.Context, frame *http2.MetaHeade
t.channelz.SocketMetrics.StreamsStarted.Add(1)
t.channelz.SocketMetrics.LastRemoteStreamCreatedTimestamp.Store(time.Now().UnixNano())
}
- s.readRequester = s
+ s.requestRead = func(n int) {
+ t.adjustWindow(s, uint32(n))
+ }
s.ctxDone = s.ctx.Done()
- s.Stream.wq.init(defaultWriteQuota, s.ctxDone)
- s.trReader = transportReader{
- reader: recvBufferReader{
+ s.wq = newWriteQuota(defaultWriteQuota, s.ctxDone)
+ s.trReader = &transportReader{
+ reader: &recvBufferReader{
ctx: s.ctx,
ctxDone: s.ctxDone,
- recv: &s.buf,
+ recv: s.buf,
+ },
+ windowHandler: func(n int) {
+ t.updateWindow(s, uint32(n))
},
- windowHandler: s,
}
// Register the stream with loopy.
t.controlBuf.put(®isterStream{
streamID: s.id,
- wq: &s.wq,
+ wq: s.wq,
})
handle(s)
return nil
@@ -635,7 +674,7 @@ func (t *http2Server) HandleStreams(ctx context.Context, handle func(*ServerStre
}()
for {
t.controlBuf.throttle()
- frame, err := t.framer.readFrame()
+ frame, err := t.framer.fr.ReadFrame()
atomic.StoreInt64(&t.lastRead, time.Now().UnixNano())
if err != nil {
if se, ok := err.(http2.StreamError); ok {
@@ -672,9 +711,8 @@ func (t *http2Server) HandleStreams(ctx context.Context, handle func(*ServerStre
})
continue
}
- case *parsedDataFrame:
+ case *http2.DataFrame:
t.handleData(frame)
- frame.data.Free()
case *http2.RSTStreamFrame:
t.handleRSTStream(frame)
case *http2.SettingsFrame:
@@ -754,7 +792,7 @@ func (t *http2Server) updateFlowControl(n uint32) {
}
-func (t *http2Server) handleData(f *parsedDataFrame) {
+func (t *http2Server) handleData(f *http2.DataFrame) {
size := f.Header().Length
var sendBDPPing bool
if t.bdpEst != nil {
@@ -799,15 +837,22 @@ func (t *http2Server) handleData(f *parsedDataFrame) {
t.closeStream(s, true, http2.ErrCodeFlowControl, false)
return
}
- dataLen := f.data.Len()
if f.Header().Flags.Has(http2.FlagDataPadded) {
- if w := s.fc.onRead(size - uint32(dataLen)); w > 0 {
+ if w := s.fc.onRead(size - uint32(len(f.Data()))); w > 0 {
t.controlBuf.put(&outgoingWindowUpdate{s.id, w})
}
}
- if dataLen > 0 {
- f.data.Ref()
- s.write(recvMsg{buffer: f.data})
+ // TODO(bradfitz, zhaoq): A copy is required here because there is no
+ // guarantee f.Data() is consumed before the arrival of next frame.
+ // Can this copy be eliminated?
+ if len(f.Data()) > 0 {
+ pool := t.bufferPool
+ if pool == nil {
+ // Note that this is only supposed to be nil in tests. Otherwise, stream is
+ // always initialized with a BufferPool.
+ pool = mem.DefaultBufferPool()
+ }
+ s.write(recvMsg{buffer: mem.Copy(f.Data(), pool)})
}
}
if f.StreamEnded() {
@@ -934,12 +979,13 @@ func appendHeaderFieldsFromMD(headerFields []hpack.HeaderField, md metadata.MD)
return headerFields
}
-func (t *http2Server) checkForHeaderListSize(hf []hpack.HeaderField) bool {
+func (t *http2Server) checkForHeaderListSize(it any) bool {
if t.maxSendHeaderListSize == nil {
return true
}
+ hdrFrame := it.(*headerFrame)
var sz int64
- for _, f := range hf {
+ for _, f := range hdrFrame.hf {
if sz += int64(f.Size()); sz > int64(*t.maxSendHeaderListSize) {
if t.logger.V(logLevel) {
t.logger.Infof("Header list size to send violates the maximum size (%d bytes) set by client", *t.maxSendHeaderListSize)
@@ -950,42 +996,6 @@ func (t *http2Server) checkForHeaderListSize(hf []hpack.HeaderField) bool {
return true
}
-// writeEarlyAbort sends an early abort response with the given HTTP status and
-// gRPC status. If the header list size exceeds the peer's limit, it sends a
-// RST_STREAM instead.
-func (t *http2Server) writeEarlyAbort(streamID uint32, contentSubtype string, stat *status.Status, httpStatus uint32, rst bool) {
- hf := []hpack.HeaderField{
- {Name: ":status", Value: strconv.Itoa(int(httpStatus))},
- {Name: "content-type", Value: grpcutil.ContentType(contentSubtype)},
- {Name: "grpc-status", Value: strconv.Itoa(int(stat.Code()))},
- {Name: "grpc-message", Value: encodeGrpcMessage(stat.Message())},
- }
- if p := istatus.RawStatusProto(stat); len(p.GetDetails()) > 0 {
- stBytes, err := proto.Marshal(p)
- if err != nil {
- t.logger.Errorf("Failed to marshal rpc status: %s, error: %v", pretty.ToJSON(p), err)
- }
- if err == nil {
- hf = append(hf, hpack.HeaderField{Name: grpcStatusDetailsBinHeader, Value: encodeBinHeader(stBytes)})
- }
- }
- success, _ := t.controlBuf.executeAndPut(func() bool {
- return t.checkForHeaderListSize(hf)
- }, &earlyAbortStream{
- streamID: streamID,
- rst: rst,
- hf: hf,
- })
- if !success {
- t.controlBuf.put(&cleanupStream{
- streamID: streamID,
- rst: true,
- rstCode: http2.ErrCodeInternal,
- onWrite: func() {},
- })
- }
-}
-
func (t *http2Server) streamContextErr(s *ServerStream) error {
select {
case <-t.done:
@@ -1041,7 +1051,7 @@ func (t *http2Server) writeHeaderLocked(s *ServerStream) error {
endStream: false,
onWrite: t.setResetPingStrikes,
}
- success, err := t.controlBuf.executeAndPut(func() bool { return t.checkForHeaderListSize(hf.hf) }, hf)
+ success, err := t.controlBuf.executeAndPut(func() bool { return t.checkForHeaderListSize(hf) }, hf)
if !success {
if err != nil {
return err
@@ -1049,13 +1059,14 @@ func (t *http2Server) writeHeaderLocked(s *ServerStream) error {
t.closeStream(s, true, http2.ErrCodeInternal, false)
return ErrHeaderListSizeLimitViolation
}
- if t.stats != nil {
+ for _, sh := range t.stats {
// Note: Headers are compressed with hpack after this call returns.
// No WireLength field is set here.
- t.stats.HandleRPC(s.Context(), &stats.OutHeader{
+ outHeader := &stats.OutHeader{
Header: s.header.Copy(),
Compression: s.sendCompress,
- })
+ }
+ sh.HandleRPC(s.Context(), outHeader)
}
return nil
}
@@ -1111,7 +1122,7 @@ func (t *http2Server) writeStatus(s *ServerStream, st *status.Status) error {
}
success, err := t.controlBuf.executeAndPut(func() bool {
- return t.checkForHeaderListSize(trailingHeader.hf)
+ return t.checkForHeaderListSize(trailingHeader)
}, nil)
if !success {
if err != nil {
@@ -1123,10 +1134,10 @@ func (t *http2Server) writeStatus(s *ServerStream, st *status.Status) error {
// Send a RST_STREAM after the trailers if the client has not already half-closed.
rst := s.getState() == streamActive
t.finishStream(s, rst, http2.ErrCodeNo, trailingHeader, true)
- if t.stats != nil {
+ for _, sh := range t.stats {
// Note: The trailer fields are compressed with hpack after this call returns.
// No WireLength field is set here.
- t.stats.HandleRPC(s.Context(), &stats.OutTrailer{
+ sh.HandleRPC(s.Context(), &stats.OutTrailer{
Trailer: s.trailer.Copy(),
})
}
@@ -1294,8 +1305,7 @@ func (t *http2Server) Close(err error) {
// deleteStream deletes the stream s from transport's active streams.
func (t *http2Server) deleteStream(s *ServerStream, eosReceived bool) {
t.mu.Lock()
- _, isActive := t.activeStreams[s.id]
- if isActive {
+ if _, ok := t.activeStreams[s.id]; ok {
delete(t.activeStreams, s.id)
if len(t.activeStreams) == 0 {
t.idle = time.Now()
@@ -1303,7 +1313,7 @@ func (t *http2Server) deleteStream(s *ServerStream, eosReceived bool) {
}
t.mu.Unlock()
- if isActive && channelz.IsOn() {
+ if channelz.IsOn() {
if eosReceived {
t.channelz.SocketMetrics.StreamsSucceeded.Add(1)
} else {
diff --git a/vendor/google.golang.org/grpc/internal/transport/http_util.go b/vendor/google.golang.org/grpc/internal/transport/http_util.go
index 5bbb641ad9..e3663f87f3 100644
--- a/vendor/google.golang.org/grpc/internal/transport/http_util.go
+++ b/vendor/google.golang.org/grpc/internal/transport/http_util.go
@@ -25,6 +25,7 @@ import (
"fmt"
"io"
"math"
+ "net"
"net/http"
"net/url"
"strconv"
@@ -36,7 +37,6 @@ import (
"golang.org/x/net/http2"
"golang.org/x/net/http2/hpack"
"google.golang.org/grpc/codes"
- "google.golang.org/grpc/mem"
)
const (
@@ -300,11 +300,11 @@ type bufWriter struct {
buf []byte
offset int
batchSize int
- conn io.Writer
+ conn net.Conn
err error
}
-func newBufWriter(conn io.Writer, batchSize int, pool *sync.Pool) *bufWriter {
+func newBufWriter(conn net.Conn, batchSize int, pool *sync.Pool) *bufWriter {
w := &bufWriter{
batchSize: batchSize,
conn: conn,
@@ -388,29 +388,15 @@ func toIOError(err error) error {
return ioError{error: err}
}
-type parsedDataFrame struct {
- http2.FrameHeader
- data mem.Buffer
-}
-
-func (df *parsedDataFrame) StreamEnded() bool {
- return df.FrameHeader.Flags.Has(http2.FlagDataEndStream)
-}
-
type framer struct {
- writer *bufWriter
- fr *http2.Framer
- headerBuf []byte // cached slice for framer headers to reduce heap allocs.
- reader io.Reader
- dataFrame parsedDataFrame // Cached data frame to avoid heap allocations.
- pool mem.BufferPool
- errDetail error
+ writer *bufWriter
+ fr *http2.Framer
}
var writeBufferPoolMap = make(map[int]*sync.Pool)
var writeBufferMutex sync.Mutex
-func newFramer(conn io.ReadWriter, writeBufferSize, readBufferSize int, sharedWriteBuffer bool, maxHeaderListSize uint32, memPool mem.BufferPool) *framer {
+func newFramer(conn net.Conn, writeBufferSize, readBufferSize int, sharedWriteBuffer bool, maxHeaderListSize uint32) *framer {
if writeBufferSize < 0 {
writeBufferSize = 0
}
@@ -426,8 +412,6 @@ func newFramer(conn io.ReadWriter, writeBufferSize, readBufferSize int, sharedWr
f := &framer{
writer: w,
fr: http2.NewFramer(w, r),
- reader: r,
- pool: memPool,
}
f.fr.SetMaxReadFrameSize(http2MaxFrameLen)
// Opt-in to Frame reuse API on framer to reduce garbage.
@@ -438,146 +422,6 @@ func newFramer(conn io.ReadWriter, writeBufferSize, readBufferSize int, sharedWr
return f
}
-// writeData writes a DATA frame.
-//
-// It is the caller's responsibility not to violate the maximum frame size.
-func (f *framer) writeData(streamID uint32, endStream bool, data [][]byte) error {
- var flags http2.Flags
- if endStream {
- flags = http2.FlagDataEndStream
- }
- length := uint32(0)
- for _, d := range data {
- length += uint32(len(d))
- }
- // TODO: Replace the header write with the framer API being added in
- // https://github.com/golang/go/issues/66655.
- f.headerBuf = append(f.headerBuf[:0],
- byte(length>>16),
- byte(length>>8),
- byte(length),
- byte(http2.FrameData),
- byte(flags),
- byte(streamID>>24),
- byte(streamID>>16),
- byte(streamID>>8),
- byte(streamID))
- if _, err := f.writer.Write(f.headerBuf); err != nil {
- return err
- }
- for _, d := range data {
- if _, err := f.writer.Write(d); err != nil {
- return err
- }
- }
- return nil
-}
-
-// readFrame reads a single frame. The returned Frame is only valid
-// until the next call to readFrame.
-func (f *framer) readFrame() (any, error) {
- f.errDetail = nil
- fh, err := f.fr.ReadFrameHeader()
- if err != nil {
- f.errDetail = f.fr.ErrorDetail()
- return nil, err
- }
- // Read the data frame directly from the underlying io.Reader to avoid
- // copies.
- if fh.Type == http2.FrameData {
- err = f.readDataFrame(fh)
- return &f.dataFrame, err
- }
- fr, err := f.fr.ReadFrameForHeader(fh)
- if err != nil {
- f.errDetail = f.fr.ErrorDetail()
- return nil, err
- }
- return fr, err
-}
-
-// errorDetail returns a more detailed error of the last error
-// returned by framer.readFrame. For instance, if readFrame
-// returns a StreamError with code PROTOCOL_ERROR, errorDetail
-// will say exactly what was invalid. errorDetail is not guaranteed
-// to return a non-nil value.
-// errorDetail is reset after the next call to readFrame.
-func (f *framer) errorDetail() error {
- return f.errDetail
-}
-
-func (f *framer) readDataFrame(fh http2.FrameHeader) (err error) {
- if fh.StreamID == 0 {
- // DATA frames MUST be associated with a stream. If a
- // DATA frame is received whose stream identifier
- // field is 0x0, the recipient MUST respond with a
- // connection error (Section 5.4.1) of type
- // PROTOCOL_ERROR.
- f.errDetail = errors.New("DATA frame with stream ID 0")
- return http2.ConnectionError(http2.ErrCodeProtocol)
- }
- // Converting a *[]byte to a mem.SliceBuffer incurs a heap allocation. This
- // conversion is performed by mem.NewBuffer. To avoid the extra allocation
- // a []byte is allocated directly if required and cast to a mem.SliceBuffer.
- var buf []byte
- // poolHandle is the pointer returned by the buffer pool (if it's used.).
- var poolHandle *[]byte
- useBufferPool := !mem.IsBelowBufferPoolingThreshold(int(fh.Length))
- if useBufferPool {
- poolHandle = f.pool.Get(int(fh.Length))
- buf = *poolHandle
- defer func() {
- if err != nil {
- f.pool.Put(poolHandle)
- }
- }()
- } else {
- buf = make([]byte, int(fh.Length))
- }
- if fh.Flags.Has(http2.FlagDataPadded) {
- if fh.Length == 0 {
- return io.ErrUnexpectedEOF
- }
- // This initial 1-byte read can be inefficient for unbuffered readers,
- // but it allows the rest of the payload to be read directly to the
- // start of the destination slice. This makes it easy to return the
- // original slice back to the buffer pool.
- if _, err := io.ReadFull(f.reader, buf[:1]); err != nil {
- return err
- }
- padSize := buf[0]
- buf = buf[:len(buf)-1]
- if int(padSize) > len(buf) {
- // If the length of the padding is greater than the
- // length of the frame payload, the recipient MUST
- // treat this as a connection error.
- // Filed: https://github.com/http2/http2-spec/issues/610
- f.errDetail = errors.New("pad size larger than data payload")
- return http2.ConnectionError(http2.ErrCodeProtocol)
- }
- if _, err := io.ReadFull(f.reader, buf); err != nil {
- return err
- }
- buf = buf[:len(buf)-int(padSize)]
- } else if _, err := io.ReadFull(f.reader, buf); err != nil {
- return err
- }
-
- f.dataFrame.FrameHeader = fh
- if useBufferPool {
- // Update the handle to point to the (potentially re-sliced) buf.
- *poolHandle = buf
- f.dataFrame.data = mem.NewBuffer(poolHandle, f.pool)
- } else {
- f.dataFrame.data = mem.SliceBuffer(buf)
- }
- return nil
-}
-
-func (df *parsedDataFrame) Header() http2.FrameHeader {
- return df.FrameHeader
-}
-
func getWriteBufferPool(size int) *sync.Pool {
writeBufferMutex.Lock()
defer writeBufferMutex.Unlock()
diff --git a/vendor/google.golang.org/grpc/internal/transport/server_stream.go b/vendor/google.golang.org/grpc/internal/transport/server_stream.go
index ed6a13b750..cf8da0b52d 100644
--- a/vendor/google.golang.org/grpc/internal/transport/server_stream.go
+++ b/vendor/google.golang.org/grpc/internal/transport/server_stream.go
@@ -32,7 +32,7 @@ import (
// ServerStream implements streaming functionality for a gRPC server.
type ServerStream struct {
- Stream // Embed for common stream functionality.
+ *Stream // Embed for common stream functionality.
st internalServerTransport
ctxDone <-chan struct{} // closed at the end of stream. Cache of ctx.Done() (for performance)
@@ -43,13 +43,12 @@ type ServerStream struct {
// Holds compressor names passed in grpc-accept-encoding metadata from the
// client.
clientAdvertisedCompressors string
+ headerWireLength int
// hdrMu protects outgoing header and trailer metadata.
hdrMu sync.Mutex
header metadata.MD // the outgoing header metadata. Updated by WriteHeader.
headerSent atomic.Bool // atomically set when the headers are sent out.
-
- headerWireLength int
}
// Read reads an n byte message from the input stream.
@@ -179,11 +178,3 @@ func (s *ServerStream) SetTrailer(md metadata.MD) error {
s.hdrMu.Unlock()
return nil
}
-
-func (s *ServerStream) requestRead(n int) {
- s.st.adjustWindow(s, uint32(n))
-}
-
-func (s *ServerStream) updateWindow(n int) {
- s.st.updateWindow(s, uint32(n))
-}
diff --git a/vendor/google.golang.org/grpc/internal/transport/transport.go b/vendor/google.golang.org/grpc/internal/transport/transport.go
index b86094da94..7dd53e80a7 100644
--- a/vendor/google.golang.org/grpc/internal/transport/transport.go
+++ b/vendor/google.golang.org/grpc/internal/transport/transport.go
@@ -68,11 +68,11 @@ type recvBuffer struct {
err error
}
-// init allows a recvBuffer to be initialized in-place, which is useful
-// for resetting a buffer or for avoiding a heap allocation when the buffer
-// is embedded in another struct.
-func (b *recvBuffer) init() {
- b.c = make(chan recvMsg, 1)
+func newRecvBuffer() *recvBuffer {
+ b := &recvBuffer{
+ c: make(chan recvMsg, 1),
+ }
+ return b
}
func (b *recvBuffer) put(r recvMsg) {
@@ -123,13 +123,12 @@ func (b *recvBuffer) get() <-chan recvMsg {
// recvBufferReader implements io.Reader interface to read the data from
// recvBuffer.
type recvBufferReader struct {
- _ noCopy
- clientStream *ClientStream // The client transport stream is closed with a status representing ctx.Err() and nil trailer metadata.
- ctx context.Context
- ctxDone <-chan struct{} // cache of ctx.Done() (for performance).
- recv *recvBuffer
- last mem.Buffer // Stores the remaining data in the previous calls.
- err error
+ closeStream func(error) // Closes the client transport stream with the given error and nil trailer metadata.
+ ctx context.Context
+ ctxDone <-chan struct{} // cache of ctx.Done() (for performance).
+ recv *recvBuffer
+ last mem.Buffer // Stores the remaining data in the previous calls.
+ err error
}
func (r *recvBufferReader) ReadMessageHeader(header []byte) (n int, err error) {
@@ -140,7 +139,7 @@ func (r *recvBufferReader) ReadMessageHeader(header []byte) (n int, err error) {
n, r.last = mem.ReadUnsafe(header, r.last)
return n, nil
}
- if r.clientStream != nil {
+ if r.closeStream != nil {
n, r.err = r.readMessageHeaderClient(header)
} else {
n, r.err = r.readMessageHeader(header)
@@ -165,7 +164,7 @@ func (r *recvBufferReader) Read(n int) (buf mem.Buffer, err error) {
}
return buf, nil
}
- if r.clientStream != nil {
+ if r.closeStream != nil {
buf, r.err = r.readClient(n)
} else {
buf, r.err = r.read(n)
@@ -210,7 +209,7 @@ func (r *recvBufferReader) readMessageHeaderClient(header []byte) (n int, err er
// TODO: delaying ctx error seems like a unnecessary side effect. What
// we really want is to mark the stream as done, and return ctx error
// faster.
- r.clientStream.Close(ContextErr(r.ctx.Err()))
+ r.closeStream(ContextErr(r.ctx.Err()))
m := <-r.recv.get()
return r.readMessageHeaderAdditional(m, header)
case m := <-r.recv.get():
@@ -237,7 +236,7 @@ func (r *recvBufferReader) readClient(n int) (buf mem.Buffer, err error) {
// TODO: delaying ctx error seems like a unnecessary side effect. What
// we really want is to mark the stream as done, and return ctx error
// faster.
- r.clientStream.Close(ContextErr(r.ctx.Err()))
+ r.closeStream(ContextErr(r.ctx.Err()))
m := <-r.recv.get()
return r.readAdditional(m, n)
case m := <-r.recv.get():
@@ -286,32 +285,27 @@ const (
// Stream represents an RPC in the transport layer.
type Stream struct {
+ id uint32
ctx context.Context // the associated context of the stream
method string // the associated RPC method of the stream
recvCompress string
sendCompress string
+ buf *recvBuffer
+ trReader *transportReader
+ fc *inFlow
+ wq *writeQuota
+
+ // Callback to state application's intentions to read data. This
+ // is used to adjust flow control, if needed.
+ requestRead func(int)
- readRequester readRequester
+ state streamState
// contentSubtype is the content-subtype for requests.
// this must be lowercase or the behavior is undefined.
contentSubtype string
trailer metadata.MD // the key-value map of trailer metadata.
-
- // Non-pointer fields are at the end to optimize GC performance.
- state streamState
- id uint32
- buf recvBuffer
- trReader transportReader
- fc inFlow
- wq writeQuota
-}
-
-// readRequester is used to state application's intentions to read data. This
-// is used to adjust flow control, if needed.
-type readRequester interface {
- requestRead(int)
}
func (s *Stream) swapState(st streamState) streamState {
@@ -361,7 +355,7 @@ func (s *Stream) ReadMessageHeader(header []byte) (err error) {
if er := s.trReader.er; er != nil {
return er
}
- s.readRequester.requestRead(len(header))
+ s.requestRead(len(header))
for len(header) != 0 {
n, err := s.trReader.ReadMessageHeader(header)
header = header[n:]
@@ -378,29 +372,13 @@ func (s *Stream) ReadMessageHeader(header []byte) (err error) {
return nil
}
-// ceil returns the ceil after dividing the numerator and denominator while
-// avoiding integer overflows.
-func ceil(numerator, denominator int) int {
- if numerator == 0 {
- return 0
- }
- return (numerator-1)/denominator + 1
-}
-
// Read reads n bytes from the wire for this stream.
func (s *Stream) read(n int) (data mem.BufferSlice, err error) {
// Don't request a read if there was an error earlier
if er := s.trReader.er; er != nil {
return nil, er
}
- // gRPC Go accepts data frames with a maximum length of 16KB. Larger
- // messages must be split into multiple frames. We pre-allocate the
- // buffer to avoid resizing during the read loop, but cap the initial
- // capacity to 128 frames (2MB) to prevent over-allocation or panics
- // when reading extremely large streams.
- allocCap := min(ceil(n, http2MaxFrameLen), 128)
- data = make(mem.BufferSlice, 0, allocCap)
- s.readRequester.requestRead(n)
+ s.requestRead(n)
for n != 0 {
buf, err := s.trReader.Read(n)
var bufLen int
@@ -423,34 +401,16 @@ func (s *Stream) read(n int) (data mem.BufferSlice, err error) {
return data, nil
}
-// noCopy may be embedded into structs which must not be copied
-// after the first use.
-//
-// See https://golang.org/issues/8005#issuecomment-190753527
-// for details.
-type noCopy struct {
-}
-
-func (*noCopy) Lock() {}
-func (*noCopy) Unlock() {}
-
// transportReader reads all the data available for this Stream from the transport and
// passes them into the decoder, which converts them into a gRPC message stream.
// The error is io.EOF when the stream is done or another non-nil error if
// the stream broke.
type transportReader struct {
- _ noCopy
+ reader *recvBufferReader
// The handler to control the window update procedure for both this
// particular stream and the associated transport.
- windowHandler windowHandler
+ windowHandler func(int)
er error
- reader recvBufferReader
-}
-
-// The handler to control the window update procedure for both this
-// particular stream and the associated transport.
-type windowHandler interface {
- updateWindow(int)
}
func (t *transportReader) ReadMessageHeader(header []byte) (int, error) {
@@ -459,7 +419,7 @@ func (t *transportReader) ReadMessageHeader(header []byte) (int, error) {
t.er = err
return 0, err
}
- t.windowHandler.updateWindow(n)
+ t.windowHandler(n)
return n, nil
}
@@ -469,7 +429,7 @@ func (t *transportReader) Read(n int) (mem.Buffer, error) {
t.er = err
return buf, err
}
- t.windowHandler.updateWindow(buf.Len())
+ t.windowHandler(buf.Len())
return buf, nil
}
@@ -494,7 +454,7 @@ type ServerConfig struct {
ConnectionTimeout time.Duration
Credentials credentials.TransportCredentials
InTapHandle tap.ServerInHandle
- StatsHandler stats.Handler
+ StatsHandlers []stats.Handler
KeepaliveParams keepalive.ServerParameters
KeepalivePolicy keepalive.EnforcementPolicy
InitialWindowSize int32
@@ -569,12 +529,6 @@ type CallHdr struct {
// outbound message.
SendCompress string
- // AcceptedCompressors overrides the grpc-accept-encoding header for this
- // call. When nil, the transport advertises the default set of registered
- // compressors. A non-nil pointer overrides that value (including the empty
- // string to advertise none).
- AcceptedCompressors *string
-
// Creds specifies credentials.PerRPCCredentials for a call.
Creds credentials.PerRPCCredentials
@@ -590,14 +544,9 @@ type CallHdr struct {
DoneFunc func() // called when the stream is finished
- // Authority is used to explicitly override the `:authority` header.
- //
- // This value comes from one of two sources:
- // 1. The `CallAuthority` call option, if specified by the user.
- // 2. An override provided by the LB picker (e.g. xDS authority rewriting).
- //
- // The `CallAuthority` call option always takes precedence over the LB
- // picker override.
+ // Authority is used to explicitly override the `:authority` header. If set,
+ // this value takes precedence over the Host field and will be used as the
+ // value for the `:authority` header.
Authority string
}
@@ -617,7 +566,7 @@ type ClientTransport interface {
GracefulClose()
// NewStream creates a Stream for an RPC.
- NewStream(ctx context.Context, callHdr *CallHdr, handler stats.Handler) (*ClientStream, error)
+ NewStream(ctx context.Context, callHdr *CallHdr) (*ClientStream, error)
// Error returns a channel that is closed when some I/O error
// happens. Typically the caller should have a goroutine to monitor
@@ -635,9 +584,8 @@ type ClientTransport interface {
// with a human readable string with debug info.
GetGoAwayReason() (GoAwayReason, string)
- // Peer returns information about the peer associated with the Transport.
- // The returned information includes authentication and network address details.
- Peer() *peer.Peer
+ // RemoteAddr returns the remote network address.
+ RemoteAddr() net.Addr
}
// ServerTransport is the common interface for all gRPC server-side transport
@@ -667,8 +615,6 @@ type internalServerTransport interface {
write(s *ServerStream, hdr []byte, data mem.BufferSlice, opts *WriteOptions) error
writeStatus(s *ServerStream, st *status.Status) error
incrMsgRecv()
- adjustWindow(s *ServerStream, n uint32)
- updateWindow(s *ServerStream, n uint32)
}
// connectionErrorf creates an ConnectionError with the specified error description.
diff --git a/vendor/google.golang.org/grpc/mem/buffer_pool.go b/vendor/google.golang.org/grpc/mem/buffer_pool.go
index 2ea763a49a..c37c58c023 100644
--- a/vendor/google.golang.org/grpc/mem/buffer_pool.go
+++ b/vendor/google.golang.org/grpc/mem/buffer_pool.go
@@ -32,17 +32,12 @@ type BufferPool interface {
Get(length int) *[]byte
// Put returns a buffer to the pool.
- //
- // The provided pointer must hold a prefix of the buffer obtained via
- // BufferPool.Get to ensure the buffer's entire capacity can be re-used.
Put(*[]byte)
}
-const goPageSize = 4 << 10 // 4KiB. N.B. this must be a power of 2.
-
var defaultBufferPoolSizes = []int{
256,
- goPageSize,
+ 4 << 10, // 4KB (go page size)
16 << 10, // 16KB (max HTTP/2 frame size used by gRPC)
32 << 10, // 32KB (default buffer size for io.Copy)
1 << 20, // 1MB
@@ -53,7 +48,7 @@ var defaultBufferPool BufferPool
func init() {
defaultBufferPool = NewTieredBufferPool(defaultBufferPoolSizes...)
- internal.SetDefaultBufferPool = func(pool BufferPool) {
+ internal.SetDefaultBufferPoolForTesting = func(pool BufferPool) {
defaultBufferPool = pool
}
@@ -123,11 +118,7 @@ type sizedBufferPool struct {
}
func (p *sizedBufferPool) Get(size int) *[]byte {
- buf, ok := p.pool.Get().(*[]byte)
- if !ok {
- buf := make([]byte, size, p.defaultSize)
- return &buf
- }
+ buf := p.pool.Get().(*[]byte)
b := *buf
clear(b[:cap(b)])
*buf = b[:size]
@@ -146,6 +137,12 @@ func (p *sizedBufferPool) Put(buf *[]byte) {
func newSizedBufferPool(size int) *sizedBufferPool {
return &sizedBufferPool{
+ pool: sync.Pool{
+ New: func() any {
+ buf := make([]byte, size)
+ return &buf
+ },
+ },
defaultSize: size,
}
}
@@ -163,7 +160,6 @@ type simpleBufferPool struct {
func (p *simpleBufferPool) Get(size int) *[]byte {
bs, ok := p.pool.Get().(*[]byte)
if ok && cap(*bs) >= size {
- clear((*bs)[:cap(*bs)])
*bs = (*bs)[:size]
return bs
}
@@ -174,14 +170,7 @@ func (p *simpleBufferPool) Get(size int) *[]byte {
p.pool.Put(bs)
}
- // If we're going to allocate, round up to the nearest page. This way if
- // requests frequently arrive with small variation we don't allocate
- // repeatedly if we get unlucky and they increase over time. By default we
- // only allocate here if size > 1MiB. Because goPageSize is a power of 2, we
- // can round up efficiently.
- allocSize := (size + goPageSize - 1) & ^(goPageSize - 1)
-
- b := make([]byte, size, allocSize)
+ b := make([]byte, size)
return &b
}
diff --git a/vendor/google.golang.org/grpc/mem/buffer_slice.go b/vendor/google.golang.org/grpc/mem/buffer_slice.go
index 084fb19c6d..af510d20c5 100644
--- a/vendor/google.golang.org/grpc/mem/buffer_slice.go
+++ b/vendor/google.golang.org/grpc/mem/buffer_slice.go
@@ -19,7 +19,6 @@
package mem
import (
- "fmt"
"io"
)
@@ -118,36 +117,43 @@ func (s BufferSlice) MaterializeToBuffer(pool BufferPool) Buffer {
// Reader returns a new Reader for the input slice after taking references to
// each underlying buffer.
-func (s BufferSlice) Reader() *Reader {
+func (s BufferSlice) Reader() Reader {
s.Ref()
- return &Reader{
+ return &sliceReader{
data: s,
len: s.Len(),
}
}
// Reader exposes a BufferSlice's data as an io.Reader, allowing it to interface
-// with other systems.
-//
+// with other parts systems. It also provides an additional convenience method
+// Remaining(), which returns the number of unread bytes remaining in the slice.
// Buffers will be freed as they are read.
-//
-// A Reader can be constructed from a BufferSlice; alternatively the zero value
-// of a Reader may be used after calling Reset on it.
-type Reader struct {
+type Reader interface {
+ io.Reader
+ io.ByteReader
+ // Close frees the underlying BufferSlice and never returns an error. Subsequent
+ // calls to Read will return (0, io.EOF).
+ Close() error
+ // Remaining returns the number of unread bytes remaining in the slice.
+ Remaining() int
+ // Reset frees the currently held buffer slice and starts reading from the
+ // provided slice. This allows reusing the reader object.
+ Reset(s BufferSlice)
+}
+
+type sliceReader struct {
data BufferSlice
len int
// The index into data[0].ReadOnlyData().
bufferIdx int
}
-// Remaining returns the number of unread bytes remaining in the slice.
-func (r *Reader) Remaining() int {
+func (r *sliceReader) Remaining() int {
return r.len
}
-// Reset frees the currently held buffer slice and starts reading from the
-// provided slice. This allows reusing the reader object.
-func (r *Reader) Reset(s BufferSlice) {
+func (r *sliceReader) Reset(s BufferSlice) {
r.data.Free()
s.Ref()
r.data = s
@@ -155,16 +161,14 @@ func (r *Reader) Reset(s BufferSlice) {
r.bufferIdx = 0
}
-// Close frees the underlying BufferSlice and never returns an error. Subsequent
-// calls to Read will return (0, io.EOF).
-func (r *Reader) Close() error {
+func (r *sliceReader) Close() error {
r.data.Free()
r.data = nil
r.len = 0
return nil
}
-func (r *Reader) freeFirstBufferIfEmpty() bool {
+func (r *sliceReader) freeFirstBufferIfEmpty() bool {
if len(r.data) == 0 || r.bufferIdx != len(r.data[0].ReadOnlyData()) {
return false
}
@@ -175,7 +179,7 @@ func (r *Reader) freeFirstBufferIfEmpty() bool {
return true
}
-func (r *Reader) Read(buf []byte) (n int, _ error) {
+func (r *sliceReader) Read(buf []byte) (n int, _ error) {
if r.len == 0 {
return 0, io.EOF
}
@@ -198,8 +202,7 @@ func (r *Reader) Read(buf []byte) (n int, _ error) {
return n, nil
}
-// ReadByte reads a single byte.
-func (r *Reader) ReadByte() (byte, error) {
+func (r *sliceReader) ReadByte() (byte, error) {
if r.len == 0 {
return 0, io.EOF
}
@@ -287,59 +290,3 @@ nextBuffer:
}
}
}
-
-// Discard skips the next n bytes, returning the number of bytes discarded.
-//
-// It frees buffers as they are fully consumed.
-//
-// If Discard skips fewer than n bytes, it also returns an error.
-func (r *Reader) Discard(n int) (discarded int, err error) {
- total := n
- for n > 0 && r.len > 0 {
- curData := r.data[0].ReadOnlyData()
- curSize := min(n, len(curData)-r.bufferIdx)
- n -= curSize
- r.len -= curSize
- r.bufferIdx += curSize
- if r.bufferIdx >= len(curData) {
- r.data[0].Free()
- r.data = r.data[1:]
- r.bufferIdx = 0
- }
- }
- discarded = total - n
- if n > 0 {
- return discarded, fmt.Errorf("insufficient bytes in reader")
- }
- return discarded, nil
-}
-
-// Peek returns the next n bytes without advancing the reader.
-//
-// Peek appends results to the provided res slice and returns the updated slice.
-// This pattern allows re-using the storage of res if it has sufficient
-// capacity.
-//
-// The returned subslices are views into the underlying buffers and are only
-// valid until the reader is advanced past the corresponding buffer.
-//
-// If Peek returns fewer than n bytes, it also returns an error.
-func (r *Reader) Peek(n int, res [][]byte) ([][]byte, error) {
- for i := 0; n > 0 && i < len(r.data); i++ {
- curData := r.data[i].ReadOnlyData()
- start := 0
- if i == 0 {
- start = r.bufferIdx
- }
- curSize := min(n, len(curData)-start)
- if curSize == 0 {
- continue
- }
- res = append(res, curData[start:start+curSize])
- n -= curSize
- }
- if n > 0 {
- return nil, fmt.Errorf("insufficient bytes in reader")
- }
- return res, nil
-}
diff --git a/vendor/google.golang.org/grpc/mem/buffers.go b/vendor/google.golang.org/grpc/mem/buffers.go
index db1620e6ac..ecbf0b9a73 100644
--- a/vendor/google.golang.org/grpc/mem/buffers.go
+++ b/vendor/google.golang.org/grpc/mem/buffers.go
@@ -62,6 +62,7 @@ var (
bufferPoolingThreshold = 1 << 10
bufferObjectPool = sync.Pool{New: func() any { return new(buffer) }}
+ refObjectPool = sync.Pool{New: func() any { return new(atomic.Int32) }}
)
// IsBelowBufferPoolingThreshold returns true if the given size is less than or
@@ -72,19 +73,9 @@ func IsBelowBufferPoolingThreshold(size int) bool {
}
type buffer struct {
- refs atomic.Int32
- data []byte
-
- // rootBuf is the buffer responsible for returning origData to the pool
- // once the reference count drops to 0.
- //
- // When a buffer is split, the new buffer inherits the rootBuf of the
- // original and increments the root's reference count. For the
- // initial buffer (the root), this field points to itself.
- rootBuf *buffer
-
- // The following fields are only set for root buffers.
origData *[]byte
+ data []byte
+ refs *atomic.Int32
pool BufferPool
}
@@ -112,8 +103,8 @@ func NewBuffer(data *[]byte, pool BufferPool) Buffer {
b.origData = data
b.data = *data
b.pool = pool
- b.rootBuf = b
- b.refs.Store(1)
+ b.refs = refObjectPool.Get().(*atomic.Int32)
+ b.refs.Add(1)
return b
}
@@ -136,44 +127,42 @@ func Copy(data []byte, pool BufferPool) Buffer {
}
func (b *buffer) ReadOnlyData() []byte {
- if b.rootBuf == nil {
+ if b.refs == nil {
panic("Cannot read freed buffer")
}
return b.data
}
func (b *buffer) Ref() {
- if b.refs.Add(1) <= 1 {
+ if b.refs == nil {
panic("Cannot ref freed buffer")
}
+ b.refs.Add(1)
}
func (b *buffer) Free() {
- refs := b.refs.Add(-1)
- if refs < 0 {
+ if b.refs == nil {
panic("Cannot free freed buffer")
}
- if refs > 0 {
- return
- }
- b.data = nil
- if b.rootBuf == b {
- // This buffer is the owner of the data slice and its ref count reached
- // 0, free the slice.
+ refs := b.refs.Add(-1)
+ switch {
+ case refs > 0:
+ return
+ case refs == 0:
if b.pool != nil {
b.pool.Put(b.origData)
- b.pool = nil
}
+
+ refObjectPool.Put(b.refs)
b.origData = nil
- } else {
- // This buffer doesn't own the data slice, decrement a ref on the root
- // buffer.
- b.rootBuf.Free()
+ b.data = nil
+ b.refs = nil
+ b.pool = nil
+ bufferObjectPool.Put(b)
+ default:
+ panic("Cannot free freed buffer")
}
-
- b.rootBuf = nil
- bufferObjectPool.Put(b)
}
func (b *buffer) Len() int {
@@ -181,14 +170,16 @@ func (b *buffer) Len() int {
}
func (b *buffer) split(n int) (Buffer, Buffer) {
- if b.rootBuf == nil || b.rootBuf.refs.Add(1) <= 1 {
+ if b.refs == nil {
panic("Cannot split freed buffer")
}
+ b.refs.Add(1)
split := newBuffer()
+ split.origData = b.origData
split.data = b.data[n:]
- split.rootBuf = b.rootBuf
- split.refs.Store(1)
+ split.refs = b.refs
+ split.pool = b.pool
b.data = b.data[:n]
@@ -196,7 +187,7 @@ func (b *buffer) split(n int) (Buffer, Buffer) {
}
func (b *buffer) read(buf []byte) (int, Buffer) {
- if b.rootBuf == nil {
+ if b.refs == nil {
panic("Cannot read freed buffer")
}
diff --git a/vendor/google.golang.org/grpc/preloader.go b/vendor/google.golang.org/grpc/preloader.go
index 1e783febf9..ee0ff969af 100644
--- a/vendor/google.golang.org/grpc/preloader.go
+++ b/vendor/google.golang.org/grpc/preloader.go
@@ -47,6 +47,9 @@ func (p *PreparedMsg) Encode(s Stream, msg any) error {
}
// check if the context has the relevant information to prepareMsg
+ if rpcInfo.preloaderInfo == nil {
+ return status.Errorf(codes.Internal, "grpc: rpcInfo.preloaderInfo is nil")
+ }
if rpcInfo.preloaderInfo.codec == nil {
return status.Errorf(codes.Internal, "grpc: rpcInfo.preloaderInfo.codec is nil")
}
diff --git a/vendor/google.golang.org/grpc/resolver/resolver.go b/vendor/google.golang.org/grpc/resolver/resolver.go
index 598ed21a29..8e6af9514b 100644
--- a/vendor/google.golang.org/grpc/resolver/resolver.go
+++ b/vendor/google.golang.org/grpc/resolver/resolver.go
@@ -182,7 +182,6 @@ type BuildOptions struct {
// An Endpoint is one network endpoint, or server, which may have multiple
// addresses with which it can be accessed.
-// TODO(i/8773) : make resolver.Endpoint and resolver.Address immutable
type Endpoint struct {
// Addresses contains a list of addresses used to access this endpoint.
Addresses []Address
diff --git a/vendor/google.golang.org/grpc/resolver_wrapper.go b/vendor/google.golang.org/grpc/resolver_wrapper.go
index 6e61376437..80e16a327c 100644
--- a/vendor/google.golang.org/grpc/resolver_wrapper.go
+++ b/vendor/google.golang.org/grpc/resolver_wrapper.go
@@ -69,7 +69,6 @@ func (ccr *ccResolverWrapper) start() error {
errCh := make(chan error)
ccr.serializer.TrySchedule(func(ctx context.Context) {
if ctx.Err() != nil {
- errCh <- ctx.Err()
return
}
opts := resolver.BuildOptions{
diff --git a/vendor/google.golang.org/grpc/rpc_util.go b/vendor/google.golang.org/grpc/rpc_util.go
index 8160f94304..47ea09f5c9 100644
--- a/vendor/google.golang.org/grpc/rpc_util.go
+++ b/vendor/google.golang.org/grpc/rpc_util.go
@@ -33,8 +33,6 @@ import (
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/encoding"
"google.golang.org/grpc/encoding/proto"
- "google.golang.org/grpc/internal"
- "google.golang.org/grpc/internal/grpcutil"
"google.golang.org/grpc/internal/transport"
"google.golang.org/grpc/mem"
"google.golang.org/grpc/metadata"
@@ -43,10 +41,6 @@ import (
"google.golang.org/grpc/status"
)
-func init() {
- internal.AcceptCompressors = acceptCompressors
-}
-
// Compressor defines the interface gRPC uses to compress a message.
//
// Deprecated: use package encoding.
@@ -157,32 +151,16 @@ func (d *gzipDecompressor) Type() string {
// callInfo contains all related configuration and information about an RPC.
type callInfo struct {
- compressorName string
- failFast bool
- maxReceiveMessageSize *int
- maxSendMessageSize *int
- creds credentials.PerRPCCredentials
- contentSubtype string
- codec baseCodec
- maxRetryRPCBufferSize int
- onFinish []func(err error)
- authority string
- acceptedResponseCompressors []string
-}
-
-func acceptedCompressorAllows(allowed []string, name string) bool {
- if allowed == nil {
- return true
- }
- if name == "" || name == encoding.Identity {
- return true
- }
- for _, a := range allowed {
- if a == name {
- return true
- }
- }
- return false
+ compressorName string
+ failFast bool
+ maxReceiveMessageSize *int
+ maxSendMessageSize *int
+ creds credentials.PerRPCCredentials
+ contentSubtype string
+ codec baseCodec
+ maxRetryRPCBufferSize int
+ onFinish []func(err error)
+ authority string
}
func defaultCallInfo() *callInfo {
@@ -192,29 +170,6 @@ func defaultCallInfo() *callInfo {
}
}
-func newAcceptedCompressionConfig(names []string) ([]string, error) {
- if len(names) == 0 {
- return nil, nil
- }
- var allowed []string
- seen := make(map[string]struct{}, len(names))
- for _, name := range names {
- name = strings.TrimSpace(name)
- if name == "" || name == encoding.Identity {
- continue
- }
- if !grpcutil.IsCompressorNameRegistered(name) {
- return nil, status.Errorf(codes.InvalidArgument, "grpc: compressor %q is not registered", name)
- }
- if _, dup := seen[name]; dup {
- continue
- }
- seen[name] = struct{}{}
- allowed = append(allowed, name)
- }
- return allowed, nil
-}
-
// CallOption configures a Call before it starts or extracts information from
// a Call after it completes.
type CallOption interface {
@@ -516,31 +471,6 @@ func (o CompressorCallOption) before(c *callInfo) error {
}
func (o CompressorCallOption) after(*callInfo, *csAttempt) {}
-// acceptCompressors returns a CallOption that limits the compression algorithms
-// advertised in the grpc-accept-encoding header for response messages.
-// Compression algorithms not in the provided list will not be advertised, and
-// responses compressed with non-listed algorithms will be rejected.
-func acceptCompressors(names ...string) CallOption {
- cp := append([]string(nil), names...)
- return acceptCompressorsCallOption{names: cp}
-}
-
-// acceptCompressorsCallOption is a CallOption that limits response compression.
-type acceptCompressorsCallOption struct {
- names []string
-}
-
-func (o acceptCompressorsCallOption) before(c *callInfo) error {
- allowed, err := newAcceptedCompressionConfig(o.names)
- if err != nil {
- return err
- }
- c.acceptedResponseCompressors = allowed
- return nil
-}
-
-func (acceptCompressorsCallOption) after(*callInfo, *csAttempt) {}
-
// CallContentSubtype returns a CallOption that will set the content-subtype
// for a call. For example, if content-subtype is "json", the Content-Type over
// the wire will be "application/grpc+json". The content-subtype is converted
@@ -727,20 +657,8 @@ type streamReader interface {
Read(n int) (mem.BufferSlice, error)
}
-// noCopy may be embedded into structs which must not be copied
-// after the first use.
-//
-// See https://golang.org/issues/8005#issuecomment-190753527
-// for details.
-type noCopy struct {
-}
-
-func (*noCopy) Lock() {}
-func (*noCopy) Unlock() {}
-
// parser reads complete gRPC messages from the underlying reader.
type parser struct {
- _ noCopy
// r is the underlying reader.
// See the comment on recvMsg for the permissible
// error types.
@@ -927,7 +845,8 @@ func (p *payloadInfo) free() {
// the buffer is no longer needed.
// TODO: Refactor this function to reduce the number of arguments.
// See: https://google.github.io/styleguide/go/best-practices.html#function-argument-lists
-func recvAndDecompress(p *parser, s recvCompressor, dc Decompressor, maxReceiveMessageSize int, payInfo *payloadInfo, compressor encoding.Compressor, isServer bool) (out mem.BufferSlice, err error) {
+func recvAndDecompress(p *parser, s recvCompressor, dc Decompressor, maxReceiveMessageSize int, payInfo *payloadInfo, compressor encoding.Compressor, isServer bool,
+) (out mem.BufferSlice, err error) {
pf, compressed, err := p.recvMsg(maxReceiveMessageSize)
if err != nil {
return nil, err
@@ -1030,7 +949,7 @@ func recv(p *parser, c baseCodec, s recvCompressor, dc Decompressor, m any, maxR
// Information about RPC
type rpcInfo struct {
failfast bool
- preloaderInfo compressorInfo
+ preloaderInfo *compressorInfo
}
// Information about Preloader
@@ -1049,7 +968,7 @@ type rpcInfoContextKey struct{}
func newContextWithRPCInfo(ctx context.Context, failfast bool, codec baseCodec, cp Compressor, comp encoding.Compressor) context.Context {
return context.WithValue(ctx, rpcInfoContextKey{}, &rpcInfo{
failfast: failfast,
- preloaderInfo: compressorInfo{
+ preloaderInfo: &compressorInfo{
codec: codec,
cp: cp,
comp: comp,
diff --git a/vendor/google.golang.org/grpc/server.go b/vendor/google.golang.org/grpc/server.go
index 8efb29a7b9..1da2a542ac 100644
--- a/vendor/google.golang.org/grpc/server.go
+++ b/vendor/google.golang.org/grpc/server.go
@@ -42,7 +42,6 @@ import (
"google.golang.org/grpc/internal"
"google.golang.org/grpc/internal/binarylog"
"google.golang.org/grpc/internal/channelz"
- "google.golang.org/grpc/internal/envconfig"
"google.golang.org/grpc/internal/grpcsync"
"google.golang.org/grpc/internal/grpcutil"
istats "google.golang.org/grpc/internal/stats"
@@ -125,8 +124,7 @@ type serviceInfo struct {
// Server is a gRPC server to serve RPC requests.
type Server struct {
- opts serverOptions
- statsHandler stats.Handler
+ opts serverOptions
mu sync.Mutex // guards following
lis map[net.Listener]bool
@@ -150,8 +148,6 @@ type Server struct {
serverWorkerChannel chan func()
serverWorkerChannelClose func()
-
- strictPathCheckingLogEmitted atomic.Bool
}
type serverOptions struct {
@@ -696,14 +692,13 @@ func NewServer(opt ...ServerOption) *Server {
o.apply(&opts)
}
s := &Server{
- lis: make(map[net.Listener]bool),
- opts: opts,
- statsHandler: istats.NewCombinedHandler(opts.statsHandlers...),
- conns: make(map[string]map[transport.ServerTransport]bool),
- services: make(map[string]*serviceInfo),
- quit: grpcsync.NewEvent(),
- done: grpcsync.NewEvent(),
- channelz: channelz.RegisterServer(""),
+ lis: make(map[net.Listener]bool),
+ opts: opts,
+ conns: make(map[string]map[transport.ServerTransport]bool),
+ services: make(map[string]*serviceInfo),
+ quit: grpcsync.NewEvent(),
+ done: grpcsync.NewEvent(),
+ channelz: channelz.RegisterServer(""),
}
chainUnaryServerInterceptors(s)
chainStreamServerInterceptors(s)
@@ -926,7 +921,9 @@ func (s *Server) Serve(lis net.Listener) error {
tempDelay = 5 * time.Millisecond
} else {
tempDelay *= 2
- tempDelay = min(tempDelay, 1*time.Second)
+ }
+ if max := 1 * time.Second; tempDelay > max {
+ tempDelay = max
}
s.mu.Lock()
s.printf("Accept error: %v; retrying in %v", err, tempDelay)
@@ -1002,7 +999,7 @@ func (s *Server) newHTTP2Transport(c net.Conn) transport.ServerTransport {
ConnectionTimeout: s.opts.connectionTimeout,
Credentials: s.opts.creds,
InTapHandle: s.opts.inTapHandle,
- StatsHandler: s.statsHandler,
+ StatsHandlers: s.opts.statsHandlers,
KeepaliveParams: s.opts.keepaliveParams,
KeepalivePolicy: s.opts.keepalivePolicy,
InitialWindowSize: s.opts.initialWindowSize,
@@ -1039,18 +1036,18 @@ func (s *Server) newHTTP2Transport(c net.Conn) transport.ServerTransport {
func (s *Server) serveStreams(ctx context.Context, st transport.ServerTransport, rawConn net.Conn) {
ctx = transport.SetConnection(ctx, rawConn)
ctx = peer.NewContext(ctx, st.Peer())
- if s.statsHandler != nil {
- ctx = s.statsHandler.TagConn(ctx, &stats.ConnTagInfo{
+ for _, sh := range s.opts.statsHandlers {
+ ctx = sh.TagConn(ctx, &stats.ConnTagInfo{
RemoteAddr: st.Peer().Addr,
LocalAddr: st.Peer().LocalAddr,
})
- s.statsHandler.HandleConn(ctx, &stats.ConnBegin{})
+ sh.HandleConn(ctx, &stats.ConnBegin{})
}
defer func() {
st.Close(errors.New("finished serving streams for the server transport"))
- if s.statsHandler != nil {
- s.statsHandler.HandleConn(ctx, &stats.ConnEnd{})
+ for _, sh := range s.opts.statsHandlers {
+ sh.HandleConn(ctx, &stats.ConnEnd{})
}
}()
@@ -1107,7 +1104,7 @@ var _ http.Handler = (*Server)(nil)
// Notice: This API is EXPERIMENTAL and may be changed or removed in a
// later release.
func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
- st, err := transport.NewServerHandlerTransport(w, r, s.statsHandler, s.opts.bufferPool)
+ st, err := transport.NewServerHandlerTransport(w, r, s.opts.statsHandlers, s.opts.bufferPool)
if err != nil {
// Errors returned from transport.NewServerHandlerTransport have
// already been written to w.
@@ -1201,8 +1198,12 @@ func (s *Server) sendResponse(ctx context.Context, stream *transport.ServerStrea
return status.Errorf(codes.ResourceExhausted, "grpc: trying to send message larger than max (%d vs. %d)", payloadLen, s.opts.maxSendMessageSize)
}
err = stream.Write(hdr, payload, opts)
- if err == nil && s.statsHandler != nil {
- s.statsHandler.HandleRPC(ctx, outPayload(false, msg, dataLen, payloadLen, time.Now()))
+ if err == nil {
+ if len(s.opts.statsHandlers) != 0 {
+ for _, sh := range s.opts.statsHandlers {
+ sh.HandleRPC(ctx, outPayload(false, msg, dataLen, payloadLen, time.Now()))
+ }
+ }
}
return err
}
@@ -1244,15 +1245,16 @@ func getChainUnaryHandler(interceptors []UnaryServerInterceptor, curr int, info
}
func (s *Server) processUnaryRPC(ctx context.Context, stream *transport.ServerStream, info *serviceInfo, md *MethodDesc, trInfo *traceInfo) (err error) {
- sh := s.statsHandler
- if sh != nil || trInfo != nil || channelz.IsOn() {
+ shs := s.opts.statsHandlers
+ if len(shs) != 0 || trInfo != nil || channelz.IsOn() {
if channelz.IsOn() {
s.incrCallsStarted()
}
var statsBegin *stats.Begin
- if sh != nil {
+ for _, sh := range shs {
+ beginTime := time.Now()
statsBegin = &stats.Begin{
- BeginTime: time.Now(),
+ BeginTime: beginTime,
IsClientStream: false,
IsServerStream: false,
}
@@ -1280,7 +1282,7 @@ func (s *Server) processUnaryRPC(ctx context.Context, stream *transport.ServerSt
trInfo.tr.Finish()
}
- if sh != nil {
+ for _, sh := range shs {
end := &stats.End{
BeginTime: statsBegin.BeginTime,
EndTime: time.Now(),
@@ -1377,7 +1379,7 @@ func (s *Server) processUnaryRPC(ctx context.Context, stream *transport.ServerSt
}
var payInfo *payloadInfo
- if sh != nil || len(binlogs) != 0 {
+ if len(shs) != 0 || len(binlogs) != 0 {
payInfo = &payloadInfo{}
defer payInfo.free()
}
@@ -1403,7 +1405,7 @@ func (s *Server) processUnaryRPC(ctx context.Context, stream *transport.ServerSt
return status.Errorf(codes.Internal, "grpc: error unmarshalling request: %v", err)
}
- if sh != nil {
+ for _, sh := range shs {
sh.HandleRPC(ctx, &stats.InPayload{
RecvTime: time.Now(),
Payload: v,
@@ -1577,30 +1579,33 @@ func (s *Server) processStreamingRPC(ctx context.Context, stream *transport.Serv
if channelz.IsOn() {
s.incrCallsStarted()
}
- sh := s.statsHandler
+ shs := s.opts.statsHandlers
var statsBegin *stats.Begin
- if sh != nil {
+ if len(shs) != 0 {
+ beginTime := time.Now()
statsBegin = &stats.Begin{
- BeginTime: time.Now(),
+ BeginTime: beginTime,
IsClientStream: sd.ClientStreams,
IsServerStream: sd.ServerStreams,
}
- sh.HandleRPC(ctx, statsBegin)
+ for _, sh := range shs {
+ sh.HandleRPC(ctx, statsBegin)
+ }
}
ctx = NewContextWithServerTransportStream(ctx, stream)
ss := &serverStream{
ctx: ctx,
s: stream,
- p: parser{r: stream, bufferPool: s.opts.bufferPool},
+ p: &parser{r: stream, bufferPool: s.opts.bufferPool},
codec: s.getCodec(stream.ContentSubtype()),
desc: sd,
maxReceiveMessageSize: s.opts.maxReceiveMessageSize,
maxSendMessageSize: s.opts.maxSendMessageSize,
trInfo: trInfo,
- statsHandler: sh,
+ statsHandler: shs,
}
- if sh != nil || trInfo != nil || channelz.IsOn() {
+ if len(shs) != 0 || trInfo != nil || channelz.IsOn() {
// See comment in processUnaryRPC on defers.
defer func() {
if trInfo != nil {
@@ -1614,7 +1619,7 @@ func (s *Server) processStreamingRPC(ctx context.Context, stream *transport.Serv
ss.mu.Unlock()
}
- if sh != nil {
+ if len(shs) != 0 {
end := &stats.End{
BeginTime: statsBegin.BeginTime,
EndTime: time.Now(),
@@ -1622,7 +1627,9 @@ func (s *Server) processStreamingRPC(ctx context.Context, stream *transport.Serv
if err != nil && err != io.EOF {
end.Error = toRPCErr(err)
}
- sh.HandleRPC(ctx, end)
+ for _, sh := range shs {
+ sh.HandleRPC(ctx, end)
+ }
}
if channelz.IsOn() {
@@ -1765,24 +1772,6 @@ func (s *Server) processStreamingRPC(ctx context.Context, stream *transport.Serv
return ss.s.WriteStatus(statusOK)
}
-func (s *Server) handleMalformedMethodName(stream *transport.ServerStream, ti *traceInfo) {
- if ti != nil {
- ti.tr.LazyLog(&fmtStringer{"Malformed method name %q", []any{stream.Method()}}, true)
- ti.tr.SetError()
- }
- errDesc := fmt.Sprintf("malformed method name: %q", stream.Method())
- if err := stream.WriteStatus(status.New(codes.Unimplemented, errDesc)); err != nil {
- if ti != nil {
- ti.tr.LazyLog(&fmtStringer{"%v", []any{err}}, true)
- ti.tr.SetError()
- }
- channelz.Warningf(logger, s.channelz, "grpc: Server.handleStream failed to write status: %v", err)
- }
- if ti != nil {
- ti.tr.Finish()
- }
-}
-
func (s *Server) handleStream(t transport.ServerTransport, stream *transport.ServerStream) {
ctx := stream.Context()
ctx = contextWithServer(ctx, s)
@@ -1803,47 +1792,45 @@ func (s *Server) handleStream(t transport.ServerTransport, stream *transport.Ser
}
sm := stream.Method()
- if sm == "" {
- s.handleMalformedMethodName(stream, ti)
- return
- }
- if sm[0] != '/' {
- // TODO(easwars): Add a link to the CVE in the below log messages once
- // published.
- if envconfig.DisableStrictPathChecking {
- if old := s.strictPathCheckingLogEmitted.Swap(true); !old {
- channelz.Warningf(logger, s.channelz, "grpc: Server.handleStream received malformed method name %q. Allowing it because the environment variable GRPC_GO_EXPERIMENTAL_DISABLE_STRICT_PATH_CHECKING is set to true, but this option will be removed in a future release.", sm)
- }
- } else {
- if old := s.strictPathCheckingLogEmitted.Swap(true); !old {
- channelz.Warningf(logger, s.channelz, "grpc: Server.handleStream rejected malformed method name %q. To temporarily allow such requests, set the environment variable GRPC_GO_EXPERIMENTAL_DISABLE_STRICT_PATH_CHECKING to true. Note that this is not recommended as it may allow requests to bypass security policies.", sm)
- }
- s.handleMalformedMethodName(stream, ti)
- return
- }
- } else {
+ if sm != "" && sm[0] == '/' {
sm = sm[1:]
}
pos := strings.LastIndex(sm, "/")
if pos == -1 {
- s.handleMalformedMethodName(stream, ti)
+ if ti != nil {
+ ti.tr.LazyLog(&fmtStringer{"Malformed method name %q", []any{sm}}, true)
+ ti.tr.SetError()
+ }
+ errDesc := fmt.Sprintf("malformed method name: %q", stream.Method())
+ if err := stream.WriteStatus(status.New(codes.Unimplemented, errDesc)); err != nil {
+ if ti != nil {
+ ti.tr.LazyLog(&fmtStringer{"%v", []any{err}}, true)
+ ti.tr.SetError()
+ }
+ channelz.Warningf(logger, s.channelz, "grpc: Server.handleStream failed to write status: %v", err)
+ }
+ if ti != nil {
+ ti.tr.Finish()
+ }
return
}
service := sm[:pos]
method := sm[pos+1:]
// FromIncomingContext is expensive: skip if there are no statsHandlers
- if s.statsHandler != nil {
+ if len(s.opts.statsHandlers) > 0 {
md, _ := metadata.FromIncomingContext(ctx)
- ctx = s.statsHandler.TagRPC(ctx, &stats.RPCTagInfo{FullMethodName: stream.Method()})
- s.statsHandler.HandleRPC(ctx, &stats.InHeader{
- FullMethod: stream.Method(),
- RemoteAddr: t.Peer().Addr,
- LocalAddr: t.Peer().LocalAddr,
- Compression: stream.RecvCompress(),
- WireLength: stream.HeaderWireLength(),
- Header: md,
- })
+ for _, sh := range s.opts.statsHandlers {
+ ctx = sh.TagRPC(ctx, &stats.RPCTagInfo{FullMethodName: stream.Method()})
+ sh.HandleRPC(ctx, &stats.InHeader{
+ FullMethod: stream.Method(),
+ RemoteAddr: t.Peer().Addr,
+ LocalAddr: t.Peer().LocalAddr,
+ Compression: stream.RecvCompress(),
+ WireLength: stream.HeaderWireLength(),
+ Header: md,
+ })
+ }
}
// To have calls in stream callouts work. Will delete once all stats handler
// calls come from the gRPC layer.
diff --git a/vendor/google.golang.org/grpc/stream.go b/vendor/google.golang.org/grpc/stream.go
index eedb5f9b99..0a0af8961f 100644
--- a/vendor/google.golang.org/grpc/stream.go
+++ b/vendor/google.golang.org/grpc/stream.go
@@ -25,7 +25,6 @@ import (
"math"
rand "math/rand/v2"
"strconv"
- "strings"
"sync"
"time"
@@ -52,8 +51,7 @@ import (
var metadataFromOutgoingContextRaw = internal.FromOutgoingContextRaw.(func(context.Context) (metadata.MD, [][]string, bool))
// StreamHandler defines the handler called by gRPC server to complete the
-// execution of a streaming RPC. srv is the service implementation on which the
-// RPC was invoked.
+// execution of a streaming RPC.
//
// If a StreamHandler returns an error, it should either be produced by the
// status package, or be one of the context errors. Otherwise, gRPC will use
@@ -179,43 +177,13 @@ func NewClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
return cc.NewStream(ctx, desc, method, opts...)
}
-var emptyMethodConfig = serviceconfig.MethodConfig{}
-
-// endOfClientStream performs cleanup actions required for both successful and
-// failed streams. This includes incrementing channelz stats and invoking all
-// registered OnFinish call options.
-func endOfClientStream(cc *ClientConn, err error, opts ...CallOption) {
- if channelz.IsOn() {
- if err != nil {
- cc.incrCallsFailed()
- } else {
- cc.incrCallsSucceeded()
- }
- }
-
- for _, o := range opts {
- if o, ok := o.(OnFinishCallOption); ok {
- o.OnFinish(err)
- }
- }
-}
-
func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, opts ...CallOption) (_ ClientStream, err error) {
- if channelz.IsOn() {
- cc.incrCallsStarted()
- }
- defer func() {
- if err != nil {
- // Ensure cleanup when stream creation fails.
- endOfClientStream(cc, err, opts...)
- }
- }()
-
// Start tracking the RPC for idleness purposes. This is where a stream is
// created for both streaming and unary RPCs, and hence is a good place to
// track active RPC count.
- cc.idlenessMgr.OnCallBegin()
-
+ if err := cc.idlenessMgr.OnCallBegin(); err != nil {
+ return nil, err
+ }
// Add a calloption, to decrement the active call count, that gets executed
// when the RPC completes.
opts = append([]CallOption{OnFinish(func(error) { cc.idlenessMgr.OnCallEnd() })}, opts...)
@@ -234,6 +202,14 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
}
}
}
+ if channelz.IsOn() {
+ cc.incrCallsStarted()
+ defer func() {
+ if err != nil {
+ cc.incrCallsFailed()
+ }
+ }()
+ }
// Provide an opportunity for the first RPC to see the first service config
// provided by the resolver.
nameResolutionDelayed, err := cc.waitForResolvedAddrs(ctx)
@@ -241,7 +217,7 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
return nil, err
}
- mc := &emptyMethodConfig
+ var mc serviceconfig.MethodConfig
var onCommit func()
newStream := func(ctx context.Context, done func()) (iresolver.ClientStream, error) {
return newClientStreamWithParams(ctx, desc, cc, method, mc, onCommit, done, nameResolutionDelayed, opts...)
@@ -264,7 +240,7 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
if rpcConfig.Context != nil {
ctx = rpcConfig.Context
}
- mc = &rpcConfig.MethodConfig
+ mc = rpcConfig.MethodConfig
onCommit = rpcConfig.OnCommitted
if rpcConfig.Interceptor != nil {
rpcInfo.Context = nil
@@ -282,7 +258,7 @@ func newClientStream(ctx context.Context, desc *StreamDesc, cc *ClientConn, meth
return newStream(ctx, func() {})
}
-func newClientStreamWithParams(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, mc *serviceconfig.MethodConfig, onCommit, doneFunc func(), nameResolutionDelayed bool, opts ...CallOption) (_ iresolver.ClientStream, err error) {
+func newClientStreamWithParams(ctx context.Context, desc *StreamDesc, cc *ClientConn, method string, mc serviceconfig.MethodConfig, onCommit, doneFunc func(), nameResolutionDelayed bool, opts ...CallOption) (_ iresolver.ClientStream, err error) {
callInfo := defaultCallInfo()
if mc.WaitForReady != nil {
callInfo.failFast = !*mc.WaitForReady
@@ -323,10 +299,6 @@ func newClientStreamWithParams(ctx context.Context, desc *StreamDesc, cc *Client
DoneFunc: doneFunc,
Authority: callInfo.authority,
}
- if allowed := callInfo.acceptedResponseCompressors; len(allowed) > 0 {
- headerValue := strings.Join(allowed, ",")
- callHdr.AcceptedCompressors = &headerValue
- }
// Set our outgoing compression according to the UseCompressor CallOption, if
// set. In that case, also find the compressor from the encoding package.
@@ -353,7 +325,7 @@ func newClientStreamWithParams(ctx context.Context, desc *StreamDesc, cc *Client
cs := &clientStream{
callHdr: callHdr,
ctx: ctx,
- methodConfig: mc,
+ methodConfig: &mc,
opts: opts,
callInfo: callInfo,
cc: cc,
@@ -446,21 +418,19 @@ func (cs *clientStream) newAttemptLocked(isTransparent bool) (*csAttempt, error)
ctx := newContextWithRPCInfo(cs.ctx, cs.callInfo.failFast, cs.callInfo.codec, cs.compressorV0, cs.compressorV1)
method := cs.callHdr.Method
var beginTime time.Time
- sh := cs.cc.statsHandler
- if sh != nil {
+ shs := cs.cc.dopts.copts.StatsHandlers
+ for _, sh := range shs {
+ ctx = sh.TagRPC(ctx, &stats.RPCTagInfo{FullMethodName: method, FailFast: cs.callInfo.failFast, NameResolutionDelay: cs.nameResolutionDelay})
beginTime = time.Now()
- ctx = sh.TagRPC(ctx, &stats.RPCTagInfo{
- FullMethodName: method, FailFast: cs.callInfo.failFast,
- NameResolutionDelay: cs.nameResolutionDelay,
- })
- sh.HandleRPC(ctx, &stats.Begin{
+ begin := &stats.Begin{
Client: true,
BeginTime: beginTime,
FailFast: cs.callInfo.failFast,
IsClientStream: cs.desc.ClientStreams,
IsServerStream: cs.desc.ServerStreams,
IsTransparentRetryAttempt: isTransparent,
- })
+ }
+ sh.HandleRPC(ctx, begin)
}
var trInfo *traceInfo
@@ -491,7 +461,7 @@ func (cs *clientStream) newAttemptLocked(isTransparent bool) (*csAttempt, error)
beginTime: beginTime,
cs: cs,
decompressorV0: cs.cc.dopts.dc,
- statsHandler: sh,
+ statsHandlers: shs,
trInfo: trInfo,
}, nil
}
@@ -510,10 +480,12 @@ func (a *csAttempt) getTransport() error {
return err
}
if a.trInfo != nil {
- a.trInfo.firstLine.SetRemoteAddr(a.transport.Peer().Addr)
+ a.trInfo.firstLine.SetRemoteAddr(a.transport.RemoteAddr())
}
- if pick.blocked && a.statsHandler != nil {
- a.statsHandler.HandleRPC(a.ctx, &stats.DelayedPickComplete{})
+ if pick.blocked {
+ for _, sh := range a.statsHandlers {
+ sh.HandleRPC(a.ctx, &stats.DelayedPickComplete{})
+ }
}
return nil
}
@@ -538,17 +510,9 @@ func (a *csAttempt) newStream() error {
md, _ := metadata.FromOutgoingContext(a.ctx)
md = metadata.Join(md, a.pickResult.Metadata)
a.ctx = metadata.NewOutgoingContext(a.ctx, md)
-
- // If the `CallAuthority` CallOption is not set, check if the LB picker
- // has provided an authority override in the PickResult metadata and
- // apply it, as specified in gRFC A81.
- if cs.callInfo.authority == "" {
- if authMD := a.pickResult.Metadata.Get(":authority"); len(authMD) > 0 {
- cs.callHdr.Authority = authMD[0]
- }
- }
}
- s, err := a.transport.NewStream(a.ctx, cs.callHdr, a.statsHandler)
+
+ s, err := a.transport.NewStream(a.ctx, cs.callHdr)
if err != nil {
nse, ok := err.(*transport.NewStreamError)
if !ok {
@@ -565,7 +529,7 @@ func (a *csAttempt) newStream() error {
}
a.transportStream = s
a.ctx = s.Context()
- a.parser = parser{r: s, bufferPool: a.cs.cc.dopts.copts.BufferPool}
+ a.parser = &parser{r: s, bufferPool: a.cs.cc.dopts.copts.BufferPool}
return nil
}
@@ -637,7 +601,7 @@ type csAttempt struct {
cs *clientStream
transport transport.ClientTransport
transportStream *transport.ClientStream
- parser parser
+ parser *parser
pickResult balancer.PickResult
finished bool
@@ -651,8 +615,8 @@ type csAttempt struct {
// and cleared when the finish method is called.
trInfo *traceInfo
- statsHandler stats.Handler
- beginTime time.Time
+ statsHandlers []stats.Handler
+ beginTime time.Time
// set for newStream errors that may be transparently retried
allowTransparentRetry bool
@@ -1076,6 +1040,9 @@ func (cs *clientStream) finish(err error) {
return
}
cs.finished = true
+ for _, onFinish := range cs.callInfo.onFinish {
+ onFinish(err)
+ }
cs.commitAttemptLocked()
if cs.attempt != nil {
cs.attempt.finish(err)
@@ -1115,7 +1082,13 @@ func (cs *clientStream) finish(err error) {
if err == nil {
cs.retryThrottler.successfulRPC()
}
- endOfClientStream(cs.cc, err, cs.opts...)
+ if channelz.IsOn() {
+ if err != nil {
+ cs.cc.incrCallsFailed()
+ } else {
+ cs.cc.incrCallsSucceeded()
+ }
+ }
cs.cancel()
}
@@ -1137,15 +1110,17 @@ func (a *csAttempt) sendMsg(m any, hdr []byte, payld mem.BufferSlice, dataLength
}
return io.EOF
}
- if a.statsHandler != nil {
- a.statsHandler.HandleRPC(a.ctx, outPayload(true, m, dataLength, payloadLength, time.Now()))
+ if len(a.statsHandlers) != 0 {
+ for _, sh := range a.statsHandlers {
+ sh.HandleRPC(a.ctx, outPayload(true, m, dataLength, payloadLength, time.Now()))
+ }
}
return nil
}
func (a *csAttempt) recvMsg(m any, payInfo *payloadInfo) (err error) {
cs := a.cs
- if a.statsHandler != nil && payInfo == nil {
+ if len(a.statsHandlers) != 0 && payInfo == nil {
payInfo = &payloadInfo{}
defer payInfo.free()
}
@@ -1159,10 +1134,6 @@ func (a *csAttempt) recvMsg(m any, payInfo *payloadInfo) (err error) {
a.decompressorV0 = nil
a.decompressorV1 = encoding.GetCompressor(ct)
}
- // Validate that the compression method is acceptable for this call.
- if !acceptedCompressorAllows(cs.callInfo.acceptedResponseCompressors, ct) {
- return status.Errorf(codes.Internal, "grpc: peer compressed the response with %q which is not allowed by AcceptCompressors", ct)
- }
} else {
// No compression is used; disable our decompressor.
a.decompressorV0 = nil
@@ -1170,7 +1141,7 @@ func (a *csAttempt) recvMsg(m any, payInfo *payloadInfo) (err error) {
// Only initialize this state once per stream.
a.decompressorSet = true
}
- if err := recv(&a.parser, cs.codec, a.transportStream, a.decompressorV0, m, *cs.callInfo.maxReceiveMessageSize, payInfo, a.decompressorV1, false); err != nil {
+ if err := recv(a.parser, cs.codec, a.transportStream, a.decompressorV0, m, *cs.callInfo.maxReceiveMessageSize, payInfo, a.decompressorV1, false); err != nil {
if err == io.EOF {
if statusErr := a.transportStream.Status().Err(); statusErr != nil {
return statusErr
@@ -1192,8 +1163,8 @@ func (a *csAttempt) recvMsg(m any, payInfo *payloadInfo) (err error) {
}
a.mu.Unlock()
}
- if a.statsHandler != nil {
- a.statsHandler.HandleRPC(a.ctx, &stats.InPayload{
+ for _, sh := range a.statsHandlers {
+ sh.HandleRPC(a.ctx, &stats.InPayload{
Client: true,
RecvTime: time.Now(),
Payload: m,
@@ -1208,7 +1179,7 @@ func (a *csAttempt) recvMsg(m any, payInfo *payloadInfo) (err error) {
}
// Special handling for non-server-stream rpcs.
// This recv expects EOF or errors, so we don't collect inPayload.
- if err := recv(&a.parser, cs.codec, a.transportStream, a.decompressorV0, m, *cs.callInfo.maxReceiveMessageSize, nil, a.decompressorV1, false); err == io.EOF {
+ if err := recv(a.parser, cs.codec, a.transportStream, a.decompressorV0, m, *cs.callInfo.maxReceiveMessageSize, nil, a.decompressorV1, false); err == io.EOF {
return a.transportStream.Status().Err() // non-server streaming Recv returns nil on success
} else if err != nil {
return toRPCErr(err)
@@ -1246,14 +1217,15 @@ func (a *csAttempt) finish(err error) {
ServerLoad: balancerload.Parse(tr),
})
}
- if a.statsHandler != nil {
- a.statsHandler.HandleRPC(a.ctx, &stats.End{
+ for _, sh := range a.statsHandlers {
+ end := &stats.End{
Client: true,
BeginTime: a.beginTime,
EndTime: time.Now(),
Trailer: tr,
Error: err,
- })
+ }
+ sh.HandleRPC(a.ctx, end)
}
if a.trInfo != nil && a.trInfo.tr != nil {
if err == nil {
@@ -1350,18 +1322,16 @@ func newNonRetryClientStream(ctx context.Context, desc *StreamDesc, method strin
codec: c.codec,
sendCompressorV0: cp,
sendCompressorV1: comp,
- decompressorV0: ac.cc.dopts.dc,
transport: t,
}
- // nil stats handler: internal streams like health and ORCA do not support telemetry.
- s, err := as.transport.NewStream(as.ctx, as.callHdr, nil)
+ s, err := as.transport.NewStream(as.ctx, as.callHdr)
if err != nil {
err = toRPCErr(err)
return nil, err
}
as.transportStream = s
- as.parser = parser{r: s, bufferPool: ac.dopts.copts.BufferPool}
+ as.parser = &parser{r: s, bufferPool: ac.dopts.copts.BufferPool}
ac.incrCallsStarted()
if desc != unaryStreamDesc {
// Listen on stream context to cleanup when the stream context is
@@ -1404,7 +1374,7 @@ type addrConnStream struct {
decompressorSet bool
decompressorV0 Decompressor
decompressorV1 encoding.Compressor
- parser parser
+ parser *parser
// mu guards finished and is held for the entire finish method.
mu sync.Mutex
@@ -1510,10 +1480,6 @@ func (as *addrConnStream) RecvMsg(m any) (err error) {
as.decompressorV0 = nil
as.decompressorV1 = encoding.GetCompressor(ct)
}
- // Validate that the compression method is acceptable for this call.
- if !acceptedCompressorAllows(as.callInfo.acceptedResponseCompressors, ct) {
- return status.Errorf(codes.Internal, "grpc: peer compressed the response with %q which is not allowed by AcceptCompressors", ct)
- }
} else {
// No compression is used; disable our decompressor.
as.decompressorV0 = nil
@@ -1521,7 +1487,7 @@ func (as *addrConnStream) RecvMsg(m any) (err error) {
// Only initialize this state once per stream.
as.decompressorSet = true
}
- if err := recv(&as.parser, as.codec, as.transportStream, as.decompressorV0, m, *as.callInfo.maxReceiveMessageSize, nil, as.decompressorV1, false); err != nil {
+ if err := recv(as.parser, as.codec, as.transportStream, as.decompressorV0, m, *as.callInfo.maxReceiveMessageSize, nil, as.decompressorV1, false); err != nil {
if err == io.EOF {
if statusErr := as.transportStream.Status().Err(); statusErr != nil {
return statusErr
@@ -1543,7 +1509,7 @@ func (as *addrConnStream) RecvMsg(m any) (err error) {
// Special handling for non-server-stream rpcs.
// This recv expects EOF or errors, so we don't collect inPayload.
- if err := recv(&as.parser, as.codec, as.transportStream, as.decompressorV0, m, *as.callInfo.maxReceiveMessageSize, nil, as.decompressorV1, false); err == io.EOF {
+ if err := recv(as.parser, as.codec, as.transportStream, as.decompressorV0, m, *as.callInfo.maxReceiveMessageSize, nil, as.decompressorV1, false); err == io.EOF {
return as.transportStream.Status().Err() // non-server streaming Recv returns nil on success
} else if err != nil {
return toRPCErr(err)
@@ -1631,7 +1597,7 @@ type ServerStream interface {
type serverStream struct {
ctx context.Context
s *transport.ServerStream
- p parser
+ p *parser
codec baseCodec
desc *StreamDesc
@@ -1648,7 +1614,7 @@ type serverStream struct {
maxSendMessageSize int
trInfo *traceInfo
- statsHandler stats.Handler
+ statsHandler []stats.Handler
binlogs []binarylog.MethodLogger
// serverHeaderBinlogged indicates whether server header has been logged. It
@@ -1784,8 +1750,10 @@ func (ss *serverStream) SendMsg(m any) (err error) {
binlog.Log(ss.ctx, sm)
}
}
- if ss.statsHandler != nil {
- ss.statsHandler.HandleRPC(ss.s.Context(), outPayload(false, m, dataLen, payloadLen, time.Now()))
+ if len(ss.statsHandler) != 0 {
+ for _, sh := range ss.statsHandler {
+ sh.HandleRPC(ss.s.Context(), outPayload(false, m, dataLen, payloadLen, time.Now()))
+ }
}
return nil
}
@@ -1816,11 +1784,11 @@ func (ss *serverStream) RecvMsg(m any) (err error) {
}
}()
var payInfo *payloadInfo
- if ss.statsHandler != nil || len(ss.binlogs) != 0 {
+ if len(ss.statsHandler) != 0 || len(ss.binlogs) != 0 {
payInfo = &payloadInfo{}
defer payInfo.free()
}
- if err := recv(&ss.p, ss.codec, ss.s, ss.decompressorV0, m, ss.maxReceiveMessageSize, payInfo, ss.decompressorV1, true); err != nil {
+ if err := recv(ss.p, ss.codec, ss.s, ss.decompressorV0, m, ss.maxReceiveMessageSize, payInfo, ss.decompressorV1, true); err != nil {
if err == io.EOF {
if len(ss.binlogs) != 0 {
chc := &binarylog.ClientHalfClose{}
@@ -1840,14 +1808,16 @@ func (ss *serverStream) RecvMsg(m any) (err error) {
return toRPCErr(err)
}
ss.recvFirstMsg = true
- if ss.statsHandler != nil {
- ss.statsHandler.HandleRPC(ss.s.Context(), &stats.InPayload{
- RecvTime: time.Now(),
- Payload: m,
- Length: payInfo.uncompressedBytes.Len(),
- WireLength: payInfo.compressedLength + headerLen,
- CompressedLength: payInfo.compressedLength,
- })
+ if len(ss.statsHandler) != 0 {
+ for _, sh := range ss.statsHandler {
+ sh.HandleRPC(ss.s.Context(), &stats.InPayload{
+ RecvTime: time.Now(),
+ Payload: m,
+ Length: payInfo.uncompressedBytes.Len(),
+ WireLength: payInfo.compressedLength + headerLen,
+ CompressedLength: payInfo.compressedLength,
+ })
+ }
}
if len(ss.binlogs) != 0 {
cm := &binarylog.ClientMessage{
@@ -1864,7 +1834,7 @@ func (ss *serverStream) RecvMsg(m any) (err error) {
}
// Special handling for non-client-stream rpcs.
// This recv expects EOF or errors, so we don't collect inPayload.
- if err := recv(&ss.p, ss.codec, ss.s, ss.decompressorV0, m, ss.maxReceiveMessageSize, nil, ss.decompressorV1, true); err == io.EOF {
+ if err := recv(ss.p, ss.codec, ss.s, ss.decompressorV0, m, ss.maxReceiveMessageSize, nil, ss.decompressorV1, true); err == io.EOF {
return nil
} else if err != nil {
return err
diff --git a/vendor/google.golang.org/grpc/version.go b/vendor/google.golang.org/grpc/version.go
index 76c2eed773..76f2e0d060 100644
--- a/vendor/google.golang.org/grpc/version.go
+++ b/vendor/google.golang.org/grpc/version.go
@@ -19,4 +19,4 @@
package grpc
// Version is the current grpc version.
-const Version = "1.79.3"
+const Version = "1.76.0"
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 6a7cb6a693..7ff92ac31a 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1,5 +1,5 @@
-# cel.dev/expr v0.25.1
-## explicit; go 1.23.0
+# cel.dev/expr v0.24.0
+## explicit; go 1.22.0
cel.dev/expr
# github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c
## explicit; go 1.16
@@ -179,6 +179,15 @@ github.com/google/pprof/profile
# github.com/google/uuid v1.6.0
## explicit
github.com/google/uuid
+# github.com/gophercloud/gophercloud v1.14.1
+## explicit; go 1.14
+github.com/gophercloud/gophercloud
+github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/l7policies
+github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners
+github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/loadbalancers
+github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/monitors
+github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools
+github.com/gophercloud/gophercloud/pagination
# github.com/gophercloud/gophercloud/v2 v2.8.0
## explicit; go 1.22
github.com/gophercloud/gophercloud/v2
@@ -473,12 +482,11 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/inte
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/request
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv
-# go.opentelemetry.io/otel v1.39.0
-## explicit; go 1.24.0
+# go.opentelemetry.io/otel v1.38.0
+## explicit; go 1.23.0
go.opentelemetry.io/otel
go.opentelemetry.io/otel/attribute
go.opentelemetry.io/otel/attribute/internal
-go.opentelemetry.io/otel/attribute/internal/xxhash
go.opentelemetry.io/otel/baggage
go.opentelemetry.io/otel/codes
go.opentelemetry.io/otel/internal/baggage
@@ -502,22 +510,22 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/envconfig
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc/internal/retry
-# go.opentelemetry.io/otel/metric v1.39.0
-## explicit; go 1.24.0
+# go.opentelemetry.io/otel/metric v1.38.0
+## explicit; go 1.23.0
go.opentelemetry.io/otel/metric
go.opentelemetry.io/otel/metric/embedded
go.opentelemetry.io/otel/metric/noop
-# go.opentelemetry.io/otel/sdk v1.39.0
-## explicit; go 1.24.0
+# go.opentelemetry.io/otel/sdk v1.38.0
+## explicit; go 1.23.0
go.opentelemetry.io/otel/sdk
go.opentelemetry.io/otel/sdk/instrumentation
+go.opentelemetry.io/otel/sdk/internal/env
go.opentelemetry.io/otel/sdk/internal/x
go.opentelemetry.io/otel/sdk/resource
go.opentelemetry.io/otel/sdk/trace
-go.opentelemetry.io/otel/sdk/trace/internal/env
-go.opentelemetry.io/otel/sdk/trace/internal/observ
-# go.opentelemetry.io/otel/trace v1.39.0
-## explicit; go 1.24.0
+go.opentelemetry.io/otel/sdk/trace/internal/x
+# go.opentelemetry.io/otel/trace v1.38.0
+## explicit; go 1.23.0
go.opentelemetry.io/otel/trace
go.opentelemetry.io/otel/trace/embedded
go.opentelemetry.io/otel/trace/internal/telemetry
@@ -559,7 +567,7 @@ go.yaml.in/yaml/v2
# go.yaml.in/yaml/v3 v3.0.4
## explicit; go 1.16
go.yaml.in/yaml/v3
-# golang.org/x/crypto v0.46.0
+# golang.org/x/crypto v0.42.0
## explicit; go 1.24.0
golang.org/x/crypto/blowfish
golang.org/x/crypto/chacha20
@@ -578,10 +586,10 @@ golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
## explicit; go 1.24.0
golang.org/x/exp/maps
golang.org/x/exp/slices
-# golang.org/x/mod v0.30.0
+# golang.org/x/mod v0.28.0
## explicit; go 1.24.0
golang.org/x/mod/semver
-# golang.org/x/net v0.48.0
+# golang.org/x/net v0.45.0
## explicit; go 1.24.0
golang.org/x/net/context
golang.org/x/net/html
@@ -597,25 +605,25 @@ golang.org/x/net/internal/timeseries
golang.org/x/net/proxy
golang.org/x/net/trace
golang.org/x/net/websocket
-# golang.org/x/oauth2 v0.34.0
+# golang.org/x/oauth2 v0.31.0
## explicit; go 1.24.0
golang.org/x/oauth2
golang.org/x/oauth2/internal
-# golang.org/x/sync v0.19.0
+# golang.org/x/sync v0.17.0
## explicit; go 1.24.0
golang.org/x/sync/errgroup
golang.org/x/sync/singleflight
-# golang.org/x/sys v0.39.0
+# golang.org/x/sys v0.36.0
## explicit; go 1.24.0
golang.org/x/sys/cpu
golang.org/x/sys/plan9
golang.org/x/sys/unix
golang.org/x/sys/windows
golang.org/x/sys/windows/registry
-# golang.org/x/term v0.38.0
+# golang.org/x/term v0.35.0
## explicit; go 1.24.0
golang.org/x/term
-# golang.org/x/text v0.32.0
+# golang.org/x/text v0.29.0
## explicit; go 1.24.0
golang.org/x/text/encoding
golang.org/x/text/encoding/charmap
@@ -648,7 +656,7 @@ golang.org/x/text/unicode/norm
# golang.org/x/time v0.13.0
## explicit; go 1.24.0
golang.org/x/time/rate
-# golang.org/x/tools v0.39.0
+# golang.org/x/tools v0.37.0
## explicit; go 1.24.0
golang.org/x/tools/cover
golang.org/x/tools/go/ast/edge
@@ -670,17 +678,17 @@ golang.org/x/tools/internal/stdlib
golang.org/x/tools/internal/typeparams
golang.org/x/tools/internal/typesinternal
golang.org/x/tools/internal/versions
-# google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217
+# google.golang.org/genproto/googleapis/api v0.0.0-20251007200510-49b9836ed3ff
## explicit; go 1.24.0
google.golang.org/genproto/googleapis/api
google.golang.org/genproto/googleapis/api/annotations
google.golang.org/genproto/googleapis/api/expr/v1alpha1
google.golang.org/genproto/googleapis/api/httpbody
-# google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217
+# google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff
## explicit; go 1.24.0
google.golang.org/genproto/googleapis/rpc/errdetails
google.golang.org/genproto/googleapis/rpc/status
-# google.golang.org/grpc v1.79.3
+# google.golang.org/grpc v1.76.0
## explicit; go 1.24.0
google.golang.org/grpc
google.golang.org/grpc/attributes
@@ -691,6 +699,7 @@ google.golang.org/grpc/balancer/endpointsharding
google.golang.org/grpc/balancer/grpclb/state
google.golang.org/grpc/balancer/pickfirst
google.golang.org/grpc/balancer/pickfirst/internal
+google.golang.org/grpc/balancer/pickfirst/pickfirstleaf
google.golang.org/grpc/balancer/roundrobin
google.golang.org/grpc/binarylog/grpc_binarylog_v1
google.golang.org/grpc/channelz
@@ -700,7 +709,6 @@ google.golang.org/grpc/credentials
google.golang.org/grpc/credentials/insecure
google.golang.org/grpc/encoding
google.golang.org/grpc/encoding/gzip
-google.golang.org/grpc/encoding/internal
google.golang.org/grpc/encoding/proto
google.golang.org/grpc/experimental/stats
google.golang.org/grpc/grpclog
@@ -709,7 +717,6 @@ google.golang.org/grpc/health/grpc_health_v1
google.golang.org/grpc/internal
google.golang.org/grpc/internal/backoff
google.golang.org/grpc/internal/balancer/gracefulswitch
-google.golang.org/grpc/internal/balancer/weight
google.golang.org/grpc/internal/balancerload
google.golang.org/grpc/internal/binarylog
google.golang.org/grpc/internal/buffer