diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index 0cb9a2d6be7..29fe33df865 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -13,7 +13,7 @@ jobs:
id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**
# build-tools is built from ../../tools/build-tools.Dockerfile
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
steps:
- name: Check out code
uses: actions/checkout@v3
diff --git a/.github/workflows/pr-e2e.yml b/.github/workflows/pr-e2e.yml
index f972289b3f5..101dbd1c7c0 100644
--- a/.github/workflows/pr-e2e.yml
+++ b/.github/workflows/pr-e2e.yml
@@ -67,7 +67,7 @@ jobs:
needs: triage
runs-on: ubuntu-latest
name: Build images
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
if: needs.triage.outputs.run-e2e == 'true'
steps:
- name: Set status in-progress
@@ -110,7 +110,7 @@ jobs:
needs: [triage, build-test-images]
runs-on: e2e
name: Execute e2e tests
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
if: needs.triage.outputs.run-e2e == 'true'
steps:
- name: Set status in-progress
diff --git a/.github/workflows/pr-validation.yml b/.github/workflows/pr-validation.yml
index a18c42cec5e..a5300dbdf8d 100644
--- a/.github/workflows/pr-validation.yml
+++ b/.github/workflows/pr-validation.yml
@@ -5,7 +5,7 @@ jobs:
validate:
name: validate - ${{ matrix.name }}
runs-on: ${{ matrix.runner }}
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
strategy:
matrix:
include:
@@ -68,7 +68,7 @@ jobs:
validate-dockerfiles:
name: validate-dockerfiles - ${{ matrix.name }}
runs-on: ${{ matrix.runner }}
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
strategy:
matrix:
include:
@@ -99,7 +99,7 @@ jobs:
validate-build-tools:
name: Validate build-tools - ${{ matrix.name }}
runs-on: ${{ matrix.runner }}
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
strategy:
matrix:
include:
@@ -136,7 +136,7 @@ jobs:
validate-dev-container:
name: Validate dev-container - ${{ matrix.name }}
runs-on: ${{ matrix.runner }}
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
strategy:
matrix:
include:
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index bb24e1a8e34..a6d545235f8 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -13,7 +13,7 @@ jobs:
id-token: write # needed for signing the images with GitHub OIDC Token **not production ready**
# build-tools is built from ../../tools/build-tools.Dockerfile
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
steps:
- name: Check out code
uses: actions/checkout@v3
diff --git a/.github/workflows/static-analysis-codeql.yml b/.github/workflows/static-analysis-codeql.yml
index 650f2c5aea0..d7c3fd3ac40 100644
--- a/.github/workflows/static-analysis-codeql.yml
+++ b/.github/workflows/static-analysis-codeql.yml
@@ -9,7 +9,7 @@ jobs:
codeQl:
name: Analyze CodeQL Go
runs-on: ubuntu-latest
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
if: (github.actor != 'dependabot[bot]')
steps:
- name: Checkout repository
diff --git a/.github/workflows/template-main-e2e-test.yml b/.github/workflows/template-main-e2e-test.yml
index f31aa423076..2d8471e33d7 100644
--- a/.github/workflows/template-main-e2e-test.yml
+++ b/.github/workflows/template-main-e2e-test.yml
@@ -8,7 +8,7 @@ jobs:
name: Run e2e test
runs-on: ARM64
# build-tools is built from ../../tools/build-tools.Dockerfile
- container: ghcr.io/kedacore/build-tools:1.20.4
+ container: ghcr.io/kedacore/build-tools:1.20.5
concurrency: e2e-tests
steps:
- name: Check out code
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b865942b7f1..706f98cf25e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,23 +48,30 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
- **CPU/Memory scaler**: Add support for scale to zero if there are multiple triggers([#4269](https://github.com/kedacore/keda/issues/4269))
- **Redis Scalers**: Allow scaling using redis stream length ([#4277](https://github.com/kedacore/keda/issues/4277))
-- **General**: Introduce new Solr Scaler ([#4234](https://github.com/kedacore/keda/issues/4234))
+- **Redis Scalers**: Allow scaling using consumer group lag ([#3127](https://github.com/kedacore/keda/issues/3127))
+- **General:** Introduce new Solr Scaler ([#4234](https://github.com/kedacore/keda/issues/4234))
- **Pulsar Scaler**: Add support for OAuth extensions ([#4700](https://github.com/kedacore/keda/issues/4700))
### Improvements
- **General**: Metrics Adapter: remove deprecated Prometheus Metrics and non-gRPC code ([#3930](https://github.com/kedacore/keda/issues/3930))
+- **General**: Kubernetes v1.25, v1.26 or v1.27 are supported
- **AWS DynamoDB**: Add support for `indexName` ([#4680](https://github.com/kedacore/keda/issues/4680))
- **Azure Data Explorer Scaler**: Use azidentity SDK ([#4489](https://github.com/kedacore/keda/issues/4489))
- **External Scaler**: Add tls options in TriggerAuth metadata. ([#3565](https://github.com/kedacore/keda/issues/3565))
- **GCP PubSub Scaler**: Make it more flexible for metrics ([#4243](https://github.com/kedacore/keda/issues/4243))
-- **Kafka Scaler**: Add support for OAuth extensions ([#4544](https://github.com/kedacore/keda/issues/4544))
-- **NATS JetStream Scaler**: Add support for pulling AccountID from TriggerAuthentication ([#4586]https://github.com/kedacore/keda/issues/4586)
+- **GitHub Runner Scaler**: Added support for GitHub App authentication ([#4651](https://github.com/kedacore/keda/issues/4651))
+- **Kafka Scaler:** Add support for OAuth extensions ([#4544](https://github.com/kedacore/keda/issues/4544))
+- **NATS JetStream Scaler:** Add support for pulling AccountID from TriggerAuthentication ([#4586]https://github.com/kedacore/keda/issues/4586)
- **Pulsar Scaler**: Improve error messages for unsuccessful connections ([#4563](https://github.com/kedacore/keda/issues/4563))
- **Security**: Enable secret scanning in GitHub repo
- **RabbitMQ Scaler**: Add support for `unsafeSsl` in trigger metadata ([#4448](https://github.com/kedacore/keda/issues/4448))
+- **RabbitMQ Scaler**: Add support for `workloadIdentityResource` and utilize AzureAD Workload Identity for HTTP authorization ([#4716](https://github.com/kedacore/keda/issues/4716))
+- **PostgreSQL Scaler**: Replace `lib/pq` with `pgx` ([#4704](https://github.com/kedacore/keda/issues/4704))
- **Prometheus Metrics**: Add new metric with KEDA build info ([#4647](https://github.com/kedacore/keda/issues/4647))
- **Prometheus Scaler**: Add support for Google Managed Prometheus ([#4675](https://github.com/kedacore/keda/pull/4675))
+- **Solace Scaler**: Add new `messageReceiveRateTarget` metric to Solace Scaler ([#4665](https://github.com/kedacore/keda/issues/4665))
+
### Fixes
@@ -72,6 +79,7 @@ To learn more about active deprecations, we recommend checking [GitHub Discussio
- **Admission Webhooks**: Check ScaledObjects with multiple triggers with non unique name ([#4664](https://github.com/kedacore/keda/issue/4664))
- **ScaledJob**: Check if MaxReplicaCount is nil before access to it ([#4568]https://github.com/kedacore/keda/issues/4568)
- **AWS SQS Scaler**: Respect `scaleOnInFlight` value ([#4276](https://github.com/kedacore/keda/issue/4276))
+- **Azure Monitor**: Exclude Azure Monitor scaler from metricName deprecation ([#4713](https://github.com/kedacore/keda/pull/4713))
- **Azure Pipelines**: Fix for disallowing `$top` on query when using `meta.parentID` method ([#4397])
- **Azure Pipelines**: Respect all required demands ([#4404](https://github.com/kedacore/keda/issues/4404))
- **NATS Jetstream Scaler**: Fix compatibility if node is not advertised ([#4524](https://github.com/kedacore/keda/issues/4524))
@@ -103,6 +111,7 @@ New deprecation(s):
- **General**: Refactor several functions for Status & Conditions handling into pkg util functions ([#2906](https://github.com/kedacore/keda/pull/2906))
- **General**: Bump `kubernetes-sigs/controller-runtime` to v0.15.0 and code alignment ([#4582](https://github.com/kedacore/keda/pull/4582))
- **General**: Stop logging errors for paused ScaledObject (with "autoscaling.keda.sh/paused-replicas" annotation) by skipping reconciliation loop for the object (stop the scale loop and delete the HPA) ([#4253](https://github.com/kedacore/keda/pull/4253))
+- **General**: Trying to prevent operator crash when accessing `ScaledObject.Status.ScaleTargetGVKR` ([#4389](https://github.com/kedacore/keda/issues/4389))
## v2.10.1
diff --git a/Dockerfile b/Dockerfile
index 1f1c50168b2..63225873c6f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# Build the manager binary
-FROM --platform=$BUILDPLATFORM ghcr.io/kedacore/build-tools:1.20.4 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/kedacore/build-tools:1.20.5 AS builder
ARG BUILD_VERSION=main
ARG GIT_COMMIT=HEAD
diff --git a/Dockerfile.adapter b/Dockerfile.adapter
index a8bd5313df8..0b8e6ecc87a 100644
--- a/Dockerfile.adapter
+++ b/Dockerfile.adapter
@@ -1,5 +1,5 @@
# Build the adapter binary
-FROM --platform=$BUILDPLATFORM ghcr.io/kedacore/build-tools:1.20.4 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/kedacore/build-tools:1.20.5 AS builder
ARG BUILD_VERSION=main
ARG GIT_COMMIT=HEAD
diff --git a/Dockerfile.webhooks b/Dockerfile.webhooks
index e0b7877c206..022afd67e48 100644
--- a/Dockerfile.webhooks
+++ b/Dockerfile.webhooks
@@ -1,5 +1,5 @@
# Build the manager binary
-FROM --platform=$BUILDPLATFORM ghcr.io/kedacore/build-tools:1.20.4 AS builder
+FROM --platform=$BUILDPLATFORM ghcr.io/kedacore/build-tools:1.20.5 AS builder
ARG BUILD_VERSION=main
ARG GIT_COMMIT=HEAD
diff --git a/Makefile b/Makefile
index a7261ec5f92..2db12927944 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ IMAGE_CONTROLLER = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda$(SUFFIX):$(VERSION)
IMAGE_ADAPTER = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda-metrics-apiserver$(SUFFIX):$(VERSION)
IMAGE_WEBHOOKS = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/keda-admission-webhooks$(SUFFIX):$(VERSION)
-BUILD_TOOLS_GO_VERSION = 1.20.4
+BUILD_TOOLS_GO_VERSION = 1.20.5
IMAGE_BUILD_TOOLS = $(IMAGE_REGISTRY)/$(IMAGE_REPO)/build-tools:$(BUILD_TOOLS_GO_VERSION)
ARCH ?=amd64
diff --git a/apis/keda/v1alpha1/scaletriggers_types.go b/apis/keda/v1alpha1/scaletriggers_types.go
index 7214e0b2047..0e727c39570 100644
--- a/apis/keda/v1alpha1/scaletriggers_types.go
+++ b/apis/keda/v1alpha1/scaletriggers_types.go
@@ -65,8 +65,8 @@ func ValidateTriggers(logger logr.Logger, triggers []ScaleTriggers) error {
// FIXME: DEPRECATED to be removed in v2.12
_, hasMetricName := trigger.Metadata["metricName"]
- // aws-cloudwatch and huawei-cloudeye have a meaningful use of metricName
- if hasMetricName && trigger.Type != "aws-cloudwatch" && trigger.Type != "huawei-cloudeye" {
+ // aws-cloudwatch, huawei-cloudeye and azure-monitor have a meaningful use of metricName
+ if hasMetricName && trigger.Type != "aws-cloudwatch" && trigger.Type != "huawei-cloudeye" && trigger.Type != "azure-monitor" {
logger.Info("\"metricName\" is deprecated and will be removed in v2.12, please do not set it anymore", "trigger.type", trigger.Type)
}
diff --git a/go.mod b/go.mod
index 7cb2106feb5..a28336581df 100644
--- a/go.mod
+++ b/go.mod
@@ -4,15 +4,16 @@ go 1.20
require (
cloud.google.com/go/compute/metadata v0.2.3
- cloud.google.com/go/monitoring v1.15.0
+ cloud.google.com/go/monitoring v1.15.1
cloud.google.com/go/storage v1.30.1
+ dario.cat/mergo v1.0.0
github.com/Azure/azure-amqp-common-go/v4 v4.2.0
github.com/Azure/azure-event-hubs-go/v3 v3.6.0
github.com/Azure/azure-kusto-go v0.13.1
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
- github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0
+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0
- github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.3.0
+ github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.4.0
github.com/Azure/azure-storage-blob-go v0.15.0
github.com/Azure/azure-storage-queue-go v0.0.0-20230531184854-c06a8eff66fe
github.com/Azure/go-autorest/autorest v0.11.29
@@ -22,7 +23,8 @@ require (
github.com/Huawei/gophercloud v1.0.21
github.com/Shopify/sarama v1.38.1
github.com/arangodb/go-driver v1.6.0
- github.com/aws/aws-sdk-go v1.44.275
+ github.com/bradleyfalzon/ghinstallation/v2 v2.5.0
+ github.com/aws/aws-sdk-go v1.44.286
github.com/denisenkom/go-mssqldb v0.12.3
github.com/dysnix/predictkube-libs v0.0.4-0.20230109175007-5a82fccd31c7
github.com/dysnix/predictkube-proto v0.0.0-20220713123213-7135dce1e9c9
@@ -33,27 +35,26 @@ require (
github.com/go-playground/validator/v10 v10.14.1
github.com/go-sql-driver/mysql v1.7.1
github.com/gobwas/glob v0.2.3
- github.com/gocql/gocql v1.4.0
+ github.com/gocql/gocql v1.5.2
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.9
github.com/google/go-github/v50 v50.2.0
github.com/google/uuid v1.3.0
github.com/gophercloud/gophercloud v1.4.0
github.com/hashicorp/vault/api v1.9.2
- github.com/imdario/mergo v0.3.16
github.com/influxdata/influxdb-client-go/v2 v2.12.3
+ github.com/jackc/pgx/v5 v5.4.1
github.com/joho/godotenv v1.5.1
- github.com/lib/pq v1.10.9
github.com/microsoft/ApplicationInsights-Go v0.4.4
github.com/microsoft/azure-devops-go-api/azuredevops v1.0.0-b5
github.com/mitchellh/hashstructure v1.1.0
github.com/newrelic/newrelic-client-go v1.1.0
- github.com/onsi/ginkgo/v2 v2.9.7
- github.com/onsi/gomega v1.27.7
+ github.com/onsi/ginkgo/v2 v2.11.0
+ github.com/onsi/gomega v1.27.8
github.com/open-policy-agent/cert-controller v0.7.1-0.20230509041528-f5436ecd020f
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
github.com/pkg/errors v0.9.1
- github.com/prometheus/client_golang v1.15.1
+ github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_model v0.4.0
github.com/prometheus/common v0.44.0
github.com/rabbitmq/amqp091-go v1.8.1
@@ -67,24 +68,24 @@ require (
github.com/xhit/go-str2duration/v2 v2.1.0
github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a
go.etcd.io/etcd/client/v3 v3.5.9
- go.mongodb.org/mongo-driver v1.11.6
- golang.org/x/oauth2 v0.8.0
- golang.org/x/sync v0.2.0
- google.golang.org/api v0.125.0
- google.golang.org/grpc v1.55.0
+ go.mongodb.org/mongo-driver v1.11.7
+ golang.org/x/oauth2 v0.9.0
+ golang.org/x/sync v0.3.0
+ google.golang.org/api v0.128.0
+ google.golang.org/grpc v1.56.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
google.golang.org/protobuf v1.30.0
- k8s.io/api v0.27.2
- k8s.io/apimachinery v0.27.2
- k8s.io/client-go v0.27.2
- k8s.io/code-generator v0.27.2
+ k8s.io/api v0.27.3
+ k8s.io/apimachinery v0.27.3
+ k8s.io/client-go v0.27.3
+ k8s.io/code-generator v0.27.3
k8s.io/klog/v2 v2.100.1
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
- k8s.io/metrics v0.27.2
+ k8s.io/metrics v0.27.3
k8s.io/utils v0.0.0-20230505201702-9f6742963106
- knative.dev/pkg v0.0.0-20230531073936-5671699f23d9
+ knative.dev/pkg v0.0.0-20230616134650-eb63a40adfb0
sigs.k8s.io/controller-runtime v0.15.0
- sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230602114852-30dea34848b0
+ sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230620070423-a784ee78d04b
sigs.k8s.io/controller-tools v0.12.0
sigs.k8s.io/custom-metrics-apiserver v1.27.0
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
@@ -188,13 +189,14 @@ require (
github.com/golang/snappy v0.0.4 // indirect
github.com/google/cel-go v0.13.0 // indirect
github.com/google/gnostic v0.6.9 // indirect
+ github.com/google/go-github/v53 v53.0.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
- github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
- github.com/googleapis/gax-go/v2 v2.10.0 // indirect
+ github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
+ github.com/googleapis/gax-go/v2 v2.11.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
@@ -210,8 +212,11 @@ require (
github.com/hashicorp/go-sockaddr v1.0.2 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
+ github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect
+ github.com/jackc/pgpassfile v1.0.0 // indirect
+ github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
github.com/jcmturner/gofork v1.7.6 // indirect
@@ -243,7 +248,7 @@ require (
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/prometheus/procfs v0.9.0 // indirect
+ github.com/prometheus/procfs v0.10.1 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/samber/lo v1.37.0 // indirect
@@ -286,12 +291,12 @@ require (
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
golang.org/x/mod v0.10.0 // indirect
- golang.org/x/net v0.10.0 // indirect
- golang.org/x/sys v0.8.0 // indirect
+ golang.org/x/net v0.11.0 // indirect
+ golang.org/x/sys v0.9.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/time v0.3.0 // indirect
- golang.org/x/tools v0.9.1 // indirect
+ golang.org/x/tools v0.9.3 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
diff --git a/go.sum b/go.sum
index 2acdb8f2883..f2c4b384291 100644
--- a/go.sum
+++ b/go.sum
@@ -23,14 +23,15 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
cloud.google.com/go/compute v1.19.3 h1:DcTwsFgGev/wV5+q8o2fzgcHOaac+DKGC91ZlvpsQds=
cloud.google.com/go/compute v1.19.3/go.mod h1:qxvISKp/gYnXkSAD1ppcSOveRAmzxicEv/JlizULFrI=
+cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k=
cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0=
-cloud.google.com/go/monitoring v1.15.0 h1:b85k1A7eWZDkNtK08hDt45vNHJ2b0WpeNFAkUa86ons=
-cloud.google.com/go/monitoring v1.15.0/go.mod h1:/LPLNIY93ZtCpPKuO38kEYh+WhhiqIt8HYch2srelRM=
+cloud.google.com/go/monitoring v1.15.1 h1:65JhLMd+JiYnXr6j5Z63dUYCuOg770p8a/VC+gil/58=
+cloud.google.com/go/monitoring v1.15.1/go.mod h1:lADlSAlFdbqQuwwpaImhsJXu1QSdd3ojypXrFSMr2rM=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
@@ -45,6 +46,8 @@ cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7Biccwk
code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c/go.mod h1:QD9Lzhd/ux6eNQVUDVRJX/RKTigpewimNYBi7ivZKY8=
code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o=
code.cloudfoundry.org/clock v1.0.0/go.mod h1:QD9Lzhd/ux6eNQVUDVRJX/RKTigpewimNYBi7ivZKY8=
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/azure-amqp-common-go/v4 v4.2.0 h1:q/jLx1KJ8xeI8XGfkOWMN9XrXzAfVTkyvCxPvHCjd2I=
github.com/Azure/azure-amqp-common-go/v4 v4.2.0/go.mod h1:GD3m/WPPma+621UaU6KNjKEo5Hl09z86viKwQjTpV0Q=
@@ -58,16 +61,16 @@ github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 h1:8kDqDngH+DmVBiCtIjCFTGa7MBnsIOkF9IccInFEbjk=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1 h1:SEy2xmstIphdPwNBUi7uhvjyjhVKISfwjfOJmuy7kg4=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg=
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
-github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.3.0 h1:eLqmA+3GXbOOLJVTSqkrFudTbHkfOp5HIy+iShCNM7A=
-github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.3.0/go.mod h1:pXDkeh10bAqElvd+S5Ppncj+DCKvJGXNa8rRT2R7rIw=
+github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.4.0 h1:MxbPJrYY81a8xnMml4qICSq1z2WusPw3jSfdIMupnYM=
+github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus v1.4.0/go.mod h1:pXDkeh10bAqElvd+S5Ppncj+DCKvJGXNa8rRT2R7rIw=
github.com/Azure/azure-storage-blob-go v0.15.0 h1:rXtgp8tN1p29GvpGgfJetavIG0V7OgcSXPpwp3tx6qk=
github.com/Azure/azure-storage-blob-go v0.15.0/go.mod h1:vbjsVbX0dlxnRc4FFMPsS9BsJWPcne7GB7onqlPvz58=
github.com/Azure/azure-storage-queue-go v0.0.0-20230531184854-c06a8eff66fe h1:HGuouUM1533rBXmMtR7qh5pYNSSjUZG90b/MgJAnb/A=
@@ -138,8 +141,8 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/aws/aws-sdk-go v1.44.275 h1:VqRULgqrigvQLll4e4hXuc568EQAtZQ6jmBzLlQHzSI=
-github.com/aws/aws-sdk-go v1.44.275/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go v1.44.286 h1:bLnBVutuyCGYZgQlu3wiXOJXtgI7EIWAaDIqVVudF3w=
+github.com/aws/aws-sdk-go v1.44.286/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -152,10 +155,13 @@ github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2y
github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+github.com/bradleyfalzon/ghinstallation/v2 v2.5.0 h1:yaYcGQ7yEIGbsJfW/9z7v1sLiZg/5rSNNXwmMct5XaE=
+github.com/bradleyfalzon/ghinstallation/v2 v2.5.0/go.mod h1:amcvPQMrRkWNdueWOjPytGL25xQGzox7425qMgzo+Vo=
github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao=
github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y=
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
+github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0=
github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M=
github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
@@ -179,6 +185,7 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH
github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k=
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
@@ -224,6 +231,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
@@ -295,8 +303,8 @@ github.com/gobuffalo/flect v1.0.2 h1:eqjPGSo2WmjgY2XlpGwo2NXgL3RucAKo4k4qQMNA5sA
github.com/gobuffalo/flect v1.0.2/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-github.com/gocql/gocql v1.4.0 h1:NIlXAJXsjzjGvVn36njh9OLYWzS3D7FdvsifLj4eDEY=
-github.com/gocql/gocql v1.4.0/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8=
+github.com/gocql/gocql v1.5.2 h1:WnKf8xRQImcT/KLaEWG2pjEeryDB7K0qQN9mPs1C58Q=
+github.com/gocql/gocql v1.5.2/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0=
@@ -371,10 +379,13 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-github/v50 v50.2.0 h1:j2FyongEHlO9nxXLc+LP3wuBSVU9mVxfpdYUexMpIfk=
github.com/google/go-github/v50 v50.2.0/go.mod h1:VBY8FB6yPIjrtKhozXv4FQupxKLS6H4m6xFZlT43q8Q=
+github.com/google/go-github/v53 v53.0.0 h1:T1RyHbSnpHYnoF0ZYKiIPSgPtuJ8G6vgc0MKodXsQDQ=
+github.com/google/go-github/v53 v53.0.0/go.mod h1:XhFRObz+m/l+UCm9b7KSIC3lT3NWSXGt7mOsAWEloao=
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -404,12 +415,12 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9aurXEpJX+U6FLtpYTdC3R06k=
-github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
+github.com/googleapis/enterprise-certificate-proxy v0.2.4 h1:uGy6JWR/uMIILU8wbf+OkstIrNiMjGpEIyhx8f6W7s4=
+github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.10.0 h1:ebSgKfMxynOdxw8QQuFOKMgomqeLGPqNLQox2bo42zg=
-github.com/googleapis/gax-go/v2 v2.10.0/go.mod h1:4UOEnMCrxsSqQ940WnTiD6qJ63le2ev3xfyagutxiPw=
+github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4=
+github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI=
github.com/gophercloud/gophercloud v1.4.0 h1:RqEu43vaX0lb0LanZr5BylK5ICVxjpFFoc0sxivyuHU=
github.com/gophercloud/gophercloud v1.4.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -463,14 +474,20 @@ github.com/hashicorp/vault/api v1.9.2 h1:YjkZLJ7K3inKgMZ0wzCU9OHqc+UqMQyXsPXnf3C
github.com/hashicorp/vault/api v1.9.2/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
-github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/influxdata/influxdb-client-go/v2 v2.12.3 h1:28nRlNMRIV4QbtIUvxhWqaxn0IpXeMSkY/uJa/O/vC4=
github.com/influxdata/influxdb-client-go/v2 v2.12.3/go.mod h1:IrrLUbCjjfkmRuaCiGQg4m2GbkaeJDcuWoxiWdQEbA0=
github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf h1:7JTmneyiNEwVBOHSjoMxiWAqB992atOeepeFYegn5RU=
github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.4.1 h1:oKfB/FhuVtit1bBM3zNRRsZ925ZkMN3HXL+LgLUM9lE=
+github.com/jackc/pgx/v5 v5.4.1/go.mod h1:q6iHT8uDNXWiFNOlRqJzBTaSH3+2xCXkokxHZC5qWFY=
github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
@@ -525,8 +542,6 @@ github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL
github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
-github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
-github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -591,11 +606,11 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss=
-github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0=
+github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
+github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
-github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4=
+github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
+github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
github.com/open-policy-agent/cert-controller v0.7.1-0.20230509041528-f5436ecd020f h1:+K7fG/VG+S78X9JUjjgexE0SH4Wio5yYhsDYoBOIikI=
github.com/open-policy-agent/cert-controller v0.7.1-0.20230509041528-f5436ecd020f/go.mod h1:dWXTzkOJ0RQJza9IjLylAZH8J+G/upEtUViKfJMxSX4=
github.com/open-policy-agent/frameworks/constraint v0.0.0-20230411224310-3f237e2710fa h1:1r6gnPhbsswSIem/Fa11fKo/MhjijzvqSxWIu+3HQeY=
@@ -620,15 +635,15 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
-github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
+github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
+github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
-github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
-github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
+github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
+github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
github.com/rabbitmq/amqp091-go v1.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0h1hA=
github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
@@ -755,8 +770,8 @@ go.etcd.io/etcd/client/v3 v3.5.9/go.mod h1:i/Eo5LrZ5IKqpbtpPDuaUnDOUv471oDg8cjQa
go.etcd.io/etcd/pkg/v3 v3.5.7 h1:obOzeVwerFwZ9trMWapU/VjDcYUJb5OfgC1zqEGWO/0=
go.etcd.io/etcd/raft/v3 v3.5.7 h1:aN79qxLmV3SvIq84aNTliYGmjwsW6NqJSnqmI1HLJKc=
go.etcd.io/etcd/server/v3 v3.5.7 h1:BTBD8IJUV7YFgsczZMHhMTS67XuA4KpRquL0MFOJGRk=
-go.mongodb.org/mongo-driver v1.11.6 h1:XM7G6PjiGAO5betLF13BIa5TlLUUE3uJ/2Ox3Lz1K+o=
-go.mongodb.org/mongo-driver v1.11.6/go.mod h1:G9TgswdsWjX4tmDA5zfs2+6AEPpYJwqblyjsfuh8oXY=
+go.mongodb.org/mongo-driver v1.11.7 h1:LIwYxASDLGUg/8wOhgOOZhX8tQa/9tgZPgzZoVqJvcs=
+go.mongodb.org/mongo-driver v1.11.7/go.mod h1:G9TgswdsWjX4tmDA5zfs2+6AEPpYJwqblyjsfuh8oXY=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -847,8 +862,8 @@ golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4Iltr
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
-golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
+golang.org/x/oauth2 v0.9.0 h1:BPpt2kU7oMRq3kCHAA1tbSEshXRw1LpG2ztgDwrzuAs=
+golang.org/x/oauth2 v0.9.0/go.mod h1:qYgFZaFiu6Wg24azG8bdV52QJXJGbZzIIsRCdVKzbLw=
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=
@@ -860,8 +875,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
-golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -910,9 +925,10 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
@@ -970,8 +986,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
-golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -996,8 +1012,8 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M
google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.125.0 h1:7xGvEY4fyWbhWMHf3R2/4w7L4fXyfpRGE9g6lp8+DCk=
-google.golang.org/api v0.125.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
+google.golang.org/api v0.128.0 h1:RjPESny5CnQRn9V6siglged+DZCgfu9l6mO9dkX9VOg=
+google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1063,8 +1079,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
-google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
-google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
+google.golang.org/grpc v1.56.0 h1:+y7Bs8rtMd07LeXmL3NxcTLn7mUkbKZqEpPhMNkwJEE=
+google.golang.org/grpc v1.56.0/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0 h1:rNBFJjBCOgVr9pWD7rs/knKL4FRTKgpZmsRfV214zcA=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0/go.mod h1:Dk1tviKTvMCz5tvh7t+fh94dhmQVHuCt2OzJB3CTW9Y=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -1080,6 +1096,7 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1100,6 +1117,7 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
@@ -1111,18 +1129,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
-k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4=
+k8s.io/api v0.27.3 h1:yR6oQXXnUEBWEWcvPWS0jQL575KoAboQPfJAuKNrw5Y=
+k8s.io/api v0.27.3/go.mod h1:C4BNvZnQOF7JA/0Xed2S+aUyJSfTGkGFxLXz9MnpIpg=
k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo=
k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ=
-k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
-k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
+k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM=
+k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
k8s.io/apiserver v0.27.2 h1:p+tjwrcQEZDrEorCZV2/qE8osGTINPuS5ZNqWAvKm5E=
k8s.io/apiserver v0.27.2/go.mod h1:EsOf39d75rMivgvvwjJ3OW/u9n1/BmUMK5otEOJrb1Y=
-k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE=
-k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ=
-k8s.io/code-generator v0.27.2 h1:RmK0CnU5qRaK6WRtSyWNODmfTZNoJbrizpVcsgbtrvI=
-k8s.io/code-generator v0.27.2/go.mod h1:DPung1sI5vBgn4AGKtlPRQAyagj/ir/4jI55ipZHVww=
+k8s.io/client-go v0.27.3 h1:7dnEGHZEJld3lYwxvLl7WoehK6lAq7GvgjxpA3nv1E8=
+k8s.io/client-go v0.27.3/go.mod h1:2MBEKuTo6V1lbKy3z1euEGnhPfGZLKTS9tiJ2xodM48=
+k8s.io/code-generator v0.27.3 h1:JRhRQkzKdQhHmv9s5f7vuqveL8qukAQ2IqaHm6MFspM=
+k8s.io/code-generator v0.27.3/go.mod h1:DPung1sI5vBgn4AGKtlPRQAyagj/ir/4jI55ipZHVww=
k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo=
k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo=
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 h1:iu3o/SxaHVI7tKPtkGzD3M9IzrE21j+CUKH98NQJ8Ms=
@@ -1135,12 +1153,12 @@ k8s.io/kms v0.27.2/go.mod h1:dahSqjI05J55Fo5qipzvHSRbm20d7llrSeQjjl86A7c=
k8s.io/kube-aggregator v0.27.1 h1:NYgl5PDV/oX1yqAZIkRnb+KtW+eLykzc6hHg81ECgiI=
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
-k8s.io/metrics v0.27.2 h1:TD6z3dhhN9bgg5YkbTh72bPiC1BsxipBLPBWyC3VQAU=
-k8s.io/metrics v0.27.2/go.mod h1:v3OT7U0DBvoAzWVzGZWQhdV4qsRJWchzs/LeVN8bhW4=
+k8s.io/metrics v0.27.3 h1:pBVKgQjfui8xzfTidIxiOmLHwcCk3KbeuWowo/Oh0t0=
+k8s.io/metrics v0.27.3/go.mod h1:pXj63OTdOjpYgSc95p+88fB3t4krLybM7MOeqIksI6o=
k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-knative.dev/pkg v0.0.0-20230531073936-5671699f23d9 h1:xd7E2nuQ358cXR4jB7Y5+FH88Mm+SQTZty5pXa1TSfs=
-knative.dev/pkg v0.0.0-20230531073936-5671699f23d9/go.mod h1:dqC6IrvyBE7E+oZocs5PkVhq1G59pDTA7r8U17EAKMk=
+knative.dev/pkg v0.0.0-20230616134650-eb63a40adfb0 h1:weQWWxEEbNOPuL4qtGiBZuMSFhcjF/Cu163uktd/xFE=
+knative.dev/pkg v0.0.0-20230616134650-eb63a40adfb0/go.mod h1:dqC6IrvyBE7E+oZocs5PkVhq1G59pDTA7r8U17EAKMk=
nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
@@ -1149,8 +1167,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6U
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU=
sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
-sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230602114852-30dea34848b0 h1:mgd53D22GUFsiimHnAm82oikihbFq6iSfPFmpA9aoVQ=
-sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230602114852-30dea34848b0/go.mod h1:B6HLcvOy2S1qq2eWOFm9xepiKPMIc8Z9OXSPsnUDaR4=
+sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230620070423-a784ee78d04b h1:OZOsH3AuA+PGDU1ksxqhnGjP14YJRcQOHzKTcKeJw3U=
+sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230620070423-a784ee78d04b/go.mod h1:B6HLcvOy2S1qq2eWOFm9xepiKPMIc8Z9OXSPsnUDaR4=
sigs.k8s.io/controller-tools v0.12.0 h1:TY6CGE6+6hzO7hhJFte65ud3cFmmZW947jajXkuDfBw=
sigs.k8s.io/controller-tools v0.12.0/go.mod h1:rXlpTfFHZMpZA8aGq9ejArgZiieHd+fkk/fTatY8A2M=
sigs.k8s.io/custom-metrics-apiserver v1.27.0 h1:kaZwUqVBCf9L3cfQ1VtdKPLYo3rp5dN2SbNf1UXHt24=
diff --git a/pkg/metricsservice/api/metrics.pb.go b/pkg/metricsservice/api/metrics.pb.go
index a5a8730a547..e38e5e355a1 100644
--- a/pkg/metricsservice/api/metrics.pb.go
+++ b/pkg/metricsservice/api/metrics.pb.go
@@ -16,7 +16,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.22.0
+// protoc v4.23.2
// source: metrics.proto
package api
diff --git a/pkg/metricsservice/api/metrics_grpc.pb.go b/pkg/metricsservice/api/metrics_grpc.pb.go
index eaad8f385f1..9eae639dc04 100644
--- a/pkg/metricsservice/api/metrics_grpc.pb.go
+++ b/pkg/metricsservice/api/metrics_grpc.pb.go
@@ -16,7 +16,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.3.0
-// - protoc v4.22.0
+// - protoc v4.23.2
// source: metrics.proto
package api
diff --git a/pkg/scalers/azure/azure_eventhub_checkpoint.go b/pkg/scalers/azure/azure_eventhub_checkpoint.go
index 64b40ad4007..e14c2aa53ab 100644
--- a/pkg/scalers/azure/azure_eventhub_checkpoint.go
+++ b/pkg/scalers/azure/azure_eventhub_checkpoint.go
@@ -25,8 +25,8 @@ import (
"strconv"
"strings"
+ "dario.cat/mergo"
"github.com/Azure/azure-storage-blob-go/azblob"
- "github.com/imdario/mergo"
kedav1alpha1 "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
"github.com/kedacore/keda/v2/pkg/util"
diff --git a/pkg/scalers/externalscaler/externalscaler.pb.go b/pkg/scalers/externalscaler/externalscaler.pb.go
index daf98464629..71293580816 100644
--- a/pkg/scalers/externalscaler/externalscaler.pb.go
+++ b/pkg/scalers/externalscaler/externalscaler.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.22.0
+// protoc v4.23.2
// source: externalscaler.proto
package externalscaler
diff --git a/pkg/scalers/externalscaler/externalscaler_grpc.pb.go b/pkg/scalers/externalscaler/externalscaler_grpc.pb.go
index b48897943a0..5489ae58ac4 100644
--- a/pkg/scalers/externalscaler/externalscaler_grpc.pb.go
+++ b/pkg/scalers/externalscaler/externalscaler_grpc.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.3.0
-// - protoc v4.22.0
+// - protoc v4.23.2
// source: externalscaler.proto
package externalscaler
diff --git a/pkg/scalers/github_runner_scaler.go b/pkg/scalers/github_runner_scaler.go
index 505abe4b537..a310f2481d7 100644
--- a/pkg/scalers/github_runner_scaler.go
+++ b/pkg/scalers/github_runner_scaler.go
@@ -10,6 +10,7 @@ import (
"strings"
"time"
+ gha "github.com/bradleyfalzon/ghinstallation/v2"
"github.com/go-logr/logr"
v2 "k8s.io/api/autoscaling/v2"
"k8s.io/metrics/pkg/apis/external_metrics"
@@ -38,11 +39,14 @@ type githubRunnerMetadata struct {
githubAPIURL string
owner string
runnerScope string
- personalAccessToken string
+ personalAccessToken *string
repos []string
labels []string
targetWorkflowQueueLength int64
scalerIndex int
+ applicationID *int64
+ installationID *int64
+ applicationKey *string
}
type WorkflowRuns struct {
@@ -334,6 +338,15 @@ func NewGitHubRunnerScaler(config *ScalerConfig) (Scaler, error) {
return nil, fmt.Errorf("error parsing GitHub Runner metadata: %w", err)
}
+ if meta.applicationID != nil && meta.installationID != nil && meta.applicationKey != nil {
+ httpTrans := kedautil.CreateHTTPTransport(false)
+ hc, err := gha.New(httpTrans, *meta.applicationID, *meta.installationID, []byte(*meta.applicationKey))
+ if err != nil {
+ return nil, fmt.Errorf("error creating GitHub App client: %w, \n appID: %d, instID: %d", err, meta.applicationID, meta.installationID)
+ }
+ httpClient = &http.Client{Transport: hc}
+ }
+
return &githubRunnerScaler{
metricType: metricType,
metadata: meta,
@@ -367,7 +380,7 @@ func getInt64ValueFromMetaOrEnv(key string, config *ScalerConfig) (int64, error)
}
func parseGitHubRunnerMetadata(config *ScalerConfig) (*githubRunnerMetadata, error) {
- meta := githubRunnerMetadata{}
+ meta := &githubRunnerMetadata{}
meta.targetWorkflowQueueLength = defaultTargetWorkflowQueueLength
if val, err := getValueFromMetaOrEnv("runnerScope", config.TriggerMetadata, config.ResolvedEnv); err == nil && val != "" {
@@ -403,15 +416,50 @@ func parseGitHubRunnerMetadata(config *ScalerConfig) (*githubRunnerMetadata, err
}
if val, ok := config.AuthParams["personalAccessToken"]; ok && val != "" {
- // Found the organizationURL in a parameter from TriggerAuthentication
- meta.personalAccessToken = val
+ // Found the pat token in a parameter from TriggerAuthentication
+ meta.personalAccessToken = &val
+ }
+
+ if appID, instID, key, err := setupGitHubApp(config); err == nil {
+ meta.applicationID = appID
+ meta.installationID = instID
+ meta.applicationKey = key
} else {
- return nil, fmt.Errorf("no personalAccessToken given")
+ return nil, err
+ }
+
+ if meta.applicationKey == nil && meta.personalAccessToken == nil {
+ return nil, fmt.Errorf("no personalAccessToken or appKey given")
}
meta.scalerIndex = config.ScalerIndex
- return &meta, nil
+ return meta, nil
+}
+
+func setupGitHubApp(config *ScalerConfig) (*int64, *int64, *string, error) {
+ var appID *int64
+ var instID *int64
+ var appKey *string
+
+ if val, err := getInt64ValueFromMetaOrEnv("applicationID", config); err == nil && val != -1 {
+ appID = &val
+ }
+
+ if val, err := getInt64ValueFromMetaOrEnv("installationID", config); err == nil && val != -1 {
+ instID = &val
+ }
+
+ if val, ok := config.AuthParams["appKey"]; ok && val != "" {
+ appKey = &val
+ }
+
+ if (appID != nil || instID != nil || appKey != nil) &&
+ (appID == nil || instID == nil || appKey == nil) {
+ return nil, nil, nil, fmt.Errorf("applicationID, installationID and applicationKey must be given")
+ }
+
+ return appID, instID, appKey, nil
}
// getRepositories returns a list of repositories for a given organization, user or enterprise
@@ -457,9 +505,12 @@ func getGithubRequest(ctx context.Context, url string, metadata *githubRunnerMet
}
req.Header.Set("Accept", "application/vnd.github.v3+json")
- req.Header.Set("Authorization", "Bearer "+metadata.personalAccessToken)
req.Header.Set("X-GitHub-Api-Version", "2022-11-28")
+ if metadata.applicationID == nil && metadata.personalAccessToken != nil {
+ req.Header.Set("Authorization", "Bearer "+*metadata.personalAccessToken)
+ }
+
r, err := httpClient.Do(req)
if err != nil {
return []byte{}, err
diff --git a/pkg/scalers/github_runner_scaler_test.go b/pkg/scalers/github_runner_scaler_test.go
index 95ef0ffe407..9efc428829f 100644
--- a/pkg/scalers/github_runner_scaler_test.go
+++ b/pkg/scalers/github_runner_scaler_test.go
@@ -33,6 +33,8 @@ var testGitHubRunnerResolvedEnv = map[string]string{
"OWNER": "ownername",
"LABELS": "foo,bar",
"REPOS": "reponame,otherrepo",
+ "APP_ID": "1",
+ "INST_ID": "2",
}
var testGitHubRunnerTokenEnv = map[string]string{
@@ -64,6 +66,10 @@ var testGitHubRunnerMetadata = []parseGitHubRunnerMetadataTestData{
{"empty owner", map[string]string{"githubApiURL": "https://api.github.com", "runnerScope": "repo", "owner": "", "repos": "reponame", "targetWorkflowQueueLength": "1"}, true, true, "no owner given"},
// empty token
{"empty targetWorkflowQueueLength", map[string]string{"githubApiURL": "https://api.github.com", "runnerScope": "repo", "owner": "ownername", "repos": "reponame"}, true, false, ""},
+ // missing installationID From Env
+ {"missing installationID Env", map[string]string{"githubApiURL": "https://api.github.com", "runnerScope": "org", "owner": "ownername", "repos": "reponame,otherrepo", "labels": "golang", "targetWorkflowQueueLength": "1", "applicationIDFromEnv": "APP_ID"}, true, true, "applicationID, installationID and applicationKey must be given"},
+ // missing applicationID From Env
+ {"missing applicationId Env", map[string]string{"githubApiURL": "https://api.github.com", "runnerScope": "org", "owner": "ownername", "repos": "reponame,otherrepo", "labels": "golang", "targetWorkflowQueueLength": "1", "installationIDFromEnv": "INST_ID"}, true, true, "applicationID, installationID and applicationKey must be given"},
// nothing passed
{"empty, no envs", map[string]string{}, false, true, "no runnerScope given"},
// empty githubApiURL
@@ -92,6 +98,12 @@ var testGitHubRunnerMetadata = []parseGitHubRunnerMetadataTestData{
{"missing repos, no envs", map[string]string{"githubApiURL": "https://api.github.com", "runnerScope": "org", "owner": "ownername", "labels": "golang", "targetWorkflowQueueLength": "1"}, false, false, ""},
// empty repos, no envs
{"empty repos, no envs", map[string]string{"githubApiURL": "https://api.github.com", "runnerScope": "org", "owner": "ownername", "labels": "golang", "repos": "", "targetWorkflowQueueLength": "1"}, false, false, ""},
+ // missing installationID
+ {"missing installationID", map[string]string{"githubApiURL": "https://api.github.com", "runnerScope": "org", "owner": "ownername", "repos": "reponame,otherrepo", "labels": "golang", "targetWorkflowQueueLength": "1", "applicationID": "1"}, true, true, "applicationID, installationID and applicationKey must be given"},
+ // missing applicationID
+ {"missing applicationID", map[string]string{"githubApiURL": "https://api.github.com", "runnerScope": "org", "owner": "ownername", "repos": "reponame,otherrepo", "labels": "golang", "targetWorkflowQueueLength": "1", "installationID": "1"}, true, true, "applicationID, installationID and applicationKey must be given"},
+ // all good
+ {"missing applicationKey", map[string]string{"githubApiURL": "https://api.github.com", "runnerScope": "org", "owner": "ownername", "repos": "reponame,otherrepo", "labels": "golang", "targetWorkflowQueueLength": "1", "applicationID": "1", "installationID": "1"}, true, true, "applicationID, installationID and applicationKey must be given"},
}
func TestGitHubRunnerParseMetadata(t *testing.T) {
@@ -117,11 +129,13 @@ func TestGitHubRunnerParseMetadata(t *testing.T) {
}
func getGitHubTestMetaData(url string) *githubRunnerMetadata {
+ testpat := "testpat"
+
meta := githubRunnerMetadata{
githubAPIURL: url,
runnerScope: "repo",
owner: "testOwner",
- personalAccessToken: "testPAT",
+ personalAccessToken: &testpat,
targetWorkflowQueueLength: 1,
}
diff --git a/pkg/scalers/liiklus/LiiklusService.pb.go b/pkg/scalers/liiklus/LiiklusService.pb.go
index 9149ab43bfa..da287d165bd 100644
--- a/pkg/scalers/liiklus/LiiklusService.pb.go
+++ b/pkg/scalers/liiklus/LiiklusService.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.22.0
+// protoc v4.23.2
// source: LiiklusService.proto
package liiklus
diff --git a/pkg/scalers/liiklus/LiiklusService_grpc.pb.go b/pkg/scalers/liiklus/LiiklusService_grpc.pb.go
index 64cfbc5e44a..51480c39dae 100644
--- a/pkg/scalers/liiklus/LiiklusService_grpc.pb.go
+++ b/pkg/scalers/liiklus/LiiklusService_grpc.pb.go
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.3.0
-// - protoc v4.22.0
+// - protoc v4.23.2
// source: LiiklusService.proto
package liiklus
diff --git a/pkg/scalers/postgresql_scaler.go b/pkg/scalers/postgresql_scaler.go
index dc5a9e0c71c..789817641ae 100644
--- a/pkg/scalers/postgresql_scaler.go
+++ b/pkg/scalers/postgresql_scaler.go
@@ -9,7 +9,7 @@ import (
"github.com/go-logr/logr"
// PostreSQL drive required for this scaler
- _ "github.com/lib/pq"
+ _ "github.com/jackc/pgx/v5/stdlib"
v2 "k8s.io/api/autoscaling/v2"
"k8s.io/metrics/pkg/apis/external_metrics"
@@ -146,7 +146,7 @@ func parsePostgreSQLMetadata(config *ScalerConfig) (*postgreSQLMetadata, error)
}
func getConnection(meta *postgreSQLMetadata, logger logr.Logger) (*sql.DB, error) {
- db, err := sql.Open("postgres", meta.connection)
+ db, err := sql.Open("pgx", meta.connection)
if err != nil {
logger.Error(err, fmt.Sprintf("Found error opening postgreSQL: %s", err))
return nil, err
diff --git a/pkg/scalers/postgresql_scaler_test.go b/pkg/scalers/postgresql_scaler_test.go
index 5feb3509dd6..f719c1b0d6a 100644
--- a/pkg/scalers/postgresql_scaler_test.go
+++ b/pkg/scalers/postgresql_scaler_test.go
@@ -71,6 +71,8 @@ var testPostgreSQLConnectionstring = []postgreSQLConnectionStringTestData{
{metadata: map[string]string{"query": "test_query", "targetQueryValue": "5"}, authParam: map[string]string{"connection": "test_connection_from_auth"}, connectionString: "test_connection_from_auth"},
// from meta
{metadata: map[string]string{"query": "test_query", "targetQueryValue": "5", "host": "localhost", "port": "1234", "dbName": "testDb", "userName": "user", "sslmode": "required"}, connectionString: "host=localhost port=1234 user=user dbname=testDb sslmode=required password="},
+ // from meta, multiple hosts
+ {metadata: map[string]string{"query": "test_query", "targetQueryValue": "5", "host": "host1,host2", "port": "1234", "dbName": "testDb", "userName": "user", "sslmode": "required"}, connectionString: "host=host1,host2 port=1234 user=user dbname=testDb sslmode=required password="},
}
func TestPosgresSQLConnectionStringGeneration(t *testing.T) {
diff --git a/pkg/scalers/rabbitmq_scaler.go b/pkg/scalers/rabbitmq_scaler.go
index 719fd7fee4a..abdaea3ea02 100644
--- a/pkg/scalers/rabbitmq_scaler.go
+++ b/pkg/scalers/rabbitmq_scaler.go
@@ -17,6 +17,8 @@ import (
v2 "k8s.io/api/autoscaling/v2"
"k8s.io/metrics/pkg/apis/external_metrics"
+ "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
+ "github.com/kedacore/keda/v2/pkg/scalers/azure"
kedautil "github.com/kedacore/keda/v2/pkg/util"
)
@@ -59,6 +61,7 @@ type rabbitMQScaler struct {
connection *amqp.Connection
channel *amqp.Channel
httpClient *http.Client
+ azureOAuth *azure.ADWorkloadIdentityTokenProvider
logger logr.Logger
}
@@ -85,6 +88,10 @@ type rabbitMQMetadata struct {
keyPassword string
enableTLS bool
unsafeSsl bool
+
+ // token provider for azure AD
+ workloadIdentityClientID string
+ workloadIdentityResource string
}
type queueInfo struct {
@@ -233,6 +240,13 @@ func parseRabbitMQMetadata(config *ScalerConfig) (*rabbitMQMetadata, error) {
meta.keyPassword = config.AuthParams["keyPassword"]
+ if config.PodIdentity.Provider == v1alpha1.PodIdentityProviderAzureWorkload {
+ if config.AuthParams["workloadIdentityResource"] != "" {
+ meta.workloadIdentityClientID = config.PodIdentity.IdentityID
+ meta.workloadIdentityResource = config.AuthParams["workloadIdentityResource"]
+ }
+ }
+
certGiven := meta.cert != ""
keyGiven := meta.key != ""
if certGiven != keyGiven {
@@ -264,6 +278,10 @@ func parseRabbitMQMetadata(config *ScalerConfig) (*rabbitMQMetadata, error) {
}
}
+ if meta.protocol == amqpProtocol && config.AuthParams["workloadIdentityResource"] != "" {
+ return nil, fmt.Errorf("workload identity is not supported for amqp protocol currently")
+ }
+
// Resolve queueName
if val, ok := config.TriggerMetadata["queueName"]; ok {
meta.queueName = val
@@ -464,9 +482,9 @@ func (s *rabbitMQScaler) Close(context.Context) error {
return nil
}
-func (s *rabbitMQScaler) getQueueStatus() (int64, float64, error) {
+func (s *rabbitMQScaler) getQueueStatus(ctx context.Context) (int64, float64, error) {
if s.metadata.protocol == httpProtocol {
- info, err := s.getQueueInfoViaHTTP()
+ info, err := s.getQueueInfoViaHTTP(ctx)
if err != nil {
return -1, -1, err
}
@@ -488,12 +506,32 @@ func (s *rabbitMQScaler) getQueueStatus() (int64, float64, error) {
return int64(items.Messages), 0, nil
}
-func getJSON(s *rabbitMQScaler, url string) (queueInfo, error) {
+func getJSON(ctx context.Context, s *rabbitMQScaler, url string) (queueInfo, error) {
var result queueInfo
- r, err := s.httpClient.Get(url)
+
+ request, err := http.NewRequest("GET", url, nil)
+ if err != nil {
+ return result, err
+ }
+
+ if s.metadata.workloadIdentityResource != "" {
+ if s.azureOAuth == nil {
+ s.azureOAuth = azure.NewAzureADWorkloadIdentityTokenProvider(ctx, s.metadata.workloadIdentityClientID, s.metadata.workloadIdentityResource)
+ }
+
+ err = s.azureOAuth.Refresh()
+ if err != nil {
+ return result, err
+ }
+
+ request.Header.Set("Authorization", "Bearer "+s.azureOAuth.OAuthToken())
+ }
+
+ r, err := s.httpClient.Do(request)
if err != nil {
return result, err
}
+
defer r.Body.Close()
if r.StatusCode == 200 {
@@ -518,7 +556,7 @@ func getJSON(s *rabbitMQScaler, url string) (queueInfo, error) {
return result, fmt.Errorf("error requesting rabbitMQ API status: %s, response: %s, from: %s", r.Status, body, url)
}
-func (s *rabbitMQScaler) getQueueInfoViaHTTP() (*queueInfo, error) {
+func (s *rabbitMQScaler) getQueueInfoViaHTTP(ctx context.Context) (*queueInfo, error) {
parsedURL, err := url.Parse(s.metadata.host)
if err != nil {
@@ -547,7 +585,7 @@ func (s *rabbitMQScaler) getQueueInfoViaHTTP() (*queueInfo, error) {
}
var info queueInfo
- info, err = getJSON(s, getQueueInfoManagementURI)
+ info, err = getJSON(ctx, s, getQueueInfoManagementURI)
if err != nil {
return nil, err
@@ -572,8 +610,8 @@ func (s *rabbitMQScaler) GetMetricSpecForScaling(context.Context) []v2.MetricSpe
}
// GetMetricsAndActivity returns value for a supported metric and an error if there is a problem getting the metric
-func (s *rabbitMQScaler) GetMetricsAndActivity(_ context.Context, metricName string) ([]external_metrics.ExternalMetricValue, bool, error) {
- messages, publishRate, err := s.getQueueStatus()
+func (s *rabbitMQScaler) GetMetricsAndActivity(ctx context.Context, metricName string) ([]external_metrics.ExternalMetricValue, bool, error) {
+ messages, publishRate, err := s.getQueueStatus(ctx)
if err != nil {
return []external_metrics.ExternalMetricValue{}, false, s.anonymizeRabbitMQError(err)
}
diff --git a/pkg/scalers/rabbitmq_scaler_test.go b/pkg/scalers/rabbitmq_scaler_test.go
index 90cc9294251..c1dcf1f301e 100644
--- a/pkg/scalers/rabbitmq_scaler_test.go
+++ b/pkg/scalers/rabbitmq_scaler_test.go
@@ -11,6 +11,8 @@ import (
"time"
"github.com/stretchr/testify/assert"
+
+ "github.com/kedacore/keda/v2/apis/keda/v1alpha1"
)
const (
@@ -24,10 +26,12 @@ type parseRabbitMQMetadataTestData struct {
}
type parseRabbitMQAuthParamTestData struct {
- metadata map[string]string
- authParams map[string]string
- isError bool
- enableTLS bool
+ metadata map[string]string
+ podIdentity v1alpha1.AuthPodIdentity
+ authParams map[string]string
+ isError bool
+ enableTLS bool
+ workloadIdentity bool
}
type rabbitMQMetricIdentifier struct {
@@ -134,19 +138,23 @@ var testRabbitMQMetadata = []parseRabbitMQMetadataTestData{
}
var testRabbitMQAuthParamData = []parseRabbitMQAuthParamTestData{
- {map[string]string{"queueName": "sample", "hostFromEnv": host}, map[string]string{"tls": "enable", "ca": "caaa", "cert": "ceert", "key": "keey"}, false, true},
+ {map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"tls": "enable", "ca": "caaa", "cert": "ceert", "key": "keey"}, false, true, false},
// success, TLS cert/key and assumed public CA
- {map[string]string{"queueName": "sample", "hostFromEnv": host}, map[string]string{"tls": "enable", "cert": "ceert", "key": "keey"}, false, true},
+ {map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"tls": "enable", "cert": "ceert", "key": "keey"}, false, true, false},
// success, TLS cert/key + key password and assumed public CA
- {map[string]string{"queueName": "sample", "hostFromEnv": host}, map[string]string{"tls": "enable", "cert": "ceert", "key": "keey", "keyPassword": "keeyPassword"}, false, true},
+ {map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"tls": "enable", "cert": "ceert", "key": "keey", "keyPassword": "keeyPassword"}, false, true, false},
// success, TLS CA only
- {map[string]string{"queueName": "sample", "hostFromEnv": host}, map[string]string{"tls": "enable", "ca": "caaa"}, false, true},
+ {map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"tls": "enable", "ca": "caaa"}, false, true, false},
// failure, TLS missing cert
- {map[string]string{"queueName": "sample", "hostFromEnv": host}, map[string]string{"tls": "enable", "ca": "caaa", "key": "kee"}, true, true},
+ {map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"tls": "enable", "ca": "caaa", "key": "kee"}, true, true, false},
// failure, TLS missing key
- {map[string]string{"queueName": "sample", "hostFromEnv": host}, map[string]string{"tls": "enable", "ca": "caaa", "cert": "ceert"}, true, true},
+ {map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"tls": "enable", "ca": "caaa", "cert": "ceert"}, true, true, false},
// failure, TLS invalid
- {map[string]string{"queueName": "sample", "hostFromEnv": host}, map[string]string{"tls": "yes", "ca": "caaa", "cert": "ceert", "key": "kee"}, true, true},
+ {map[string]string{"queueName": "sample", "hostFromEnv": host}, v1alpha1.AuthPodIdentity{}, map[string]string{"tls": "yes", "ca": "caaa", "cert": "ceert", "key": "kee"}, true, true, false},
+ // success, WorkloadIdentity
+ {map[string]string{"queueName": "sample", "hostFromEnv": host, "protocol": "http"}, v1alpha1.AuthPodIdentity{Provider: v1alpha1.PodIdentityProviderAzureWorkload, IdentityID: "client-id"}, map[string]string{"workloadIdentityResource": "rabbitmq-resource-id"}, false, false, true},
+ // failure, WoekloadIdentity not supported for amqp
+ {map[string]string{"queueName": "sample", "hostFromEnv": host, "protocol": "amqp"}, v1alpha1.AuthPodIdentity{Provider: v1alpha1.PodIdentityProviderAzureWorkload, IdentityID: "client-id"}, map[string]string{"workloadIdentityResource": "rabbitmq-resource-id"}, true, false, false},
}
var rabbitMQMetricIdentifiers = []rabbitMQMetricIdentifier{
{&testRabbitMQMetadata[1], 0, "s0-rabbitmq-sample"},
@@ -177,7 +185,7 @@ func TestRabbitMQParseMetadata(t *testing.T) {
func TestRabbitMQParseAuthParamData(t *testing.T) {
for _, testData := range testRabbitMQAuthParamData {
- metadata, err := parseRabbitMQMetadata(&ScalerConfig{ResolvedEnv: sampleRabbitMqResolvedEnv, TriggerMetadata: testData.metadata, AuthParams: testData.authParams})
+ metadata, err := parseRabbitMQMetadata(&ScalerConfig{ResolvedEnv: sampleRabbitMqResolvedEnv, TriggerMetadata: testData.metadata, AuthParams: testData.authParams, PodIdentity: testData.podIdentity})
if err != nil && !testData.isError {
t.Error("Expected success but got error", err)
}
@@ -201,6 +209,12 @@ func TestRabbitMQParseAuthParamData(t *testing.T) {
t.Errorf("Expected key to be set to %v but got %v\n", testData.authParams["keyPassword"], metadata.key)
}
}
+ if metadata != nil && metadata.workloadIdentityClientID != "" && !testData.workloadIdentity {
+ t.Errorf("Expected workloadIdentity to be disabled but got %v as client ID and %v as resource\n", metadata.workloadIdentityClientID, metadata.workloadIdentityResource)
+ }
+ if metadata != nil && metadata.workloadIdentityClientID == "" && testData.workloadIdentity {
+ t.Error("Expected workloadIdentity to be enabled but was not\n")
+ }
}
}
diff --git a/pkg/scalers/redis_streams_scaler.go b/pkg/scalers/redis_streams_scaler.go
index 98200f24ec4..106c3c0106a 100644
--- a/pkg/scalers/redis_streams_scaler.go
+++ b/pkg/scalers/redis_streams_scaler.go
@@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"strconv"
+ "strings"
"github.com/go-logr/logr"
"github.com/redis/go-redis/v9"
@@ -19,22 +20,27 @@ type scaleFactor int8
const (
xPendingFactor scaleFactor = iota + 1
xLengthFactor
+ lagFactor
)
const (
// defaults
- defaultDBIndex = 0
- defaultTargetEntries = 5
+ defaultDBIndex = 0
+ defaultTargetEntries = 5
+ defaultTargetLag = 5
+ defaultActivationLagCount = 0
// metadata names
- pendingEntriesCountMetadata = "pendingEntriesCount"
- streamLengthMetadata = "streamLength"
- streamNameMetadata = "stream"
- consumerGroupNameMetadata = "consumerGroup"
- usernameMetadata = "username"
- passwordMetadata = "password"
- databaseIndexMetadata = "databaseIndex"
- enableTLSMetadata = "enableTLS"
+ lagMetadata = "lagCount"
+ pendingEntriesCountMetadata = "pendingEntriesCount"
+ streamLengthMetadata = "streamLength"
+ streamNameMetadata = "stream"
+ consumerGroupNameMetadata = "consumerGroup"
+ usernameMetadata = "username"
+ passwordMetadata = "password"
+ databaseIndexMetadata = "databaseIndex"
+ enableTLSMetadata = "enableTLS"
+ activationValueTriggerConfigName = "activationLagCount"
)
type redisStreamsScaler struct {
@@ -49,11 +55,13 @@ type redisStreamsMetadata struct {
scaleFactor scaleFactor
targetPendingEntriesCount int64
targetStreamLength int64
+ targetLag int64
streamName string
consumerGroupName string
databaseIndex int
connectionInfo redisConnectionInfo
scalerIndex int
+ activationLagCount int64
}
// NewRedisStreamsScaler creates a new redisStreamsScaler
@@ -87,6 +95,7 @@ func NewRedisStreamsScaler(ctx context.Context, isClustered, isSentinel bool, co
func createClusteredRedisStreamsScaler(ctx context.Context, meta *redisStreamsMetadata, metricType v2.MetricTargetType, logger logr.Logger) (Scaler, error) {
client, err := getRedisClusterClient(ctx, meta.connectionInfo)
+
if err != nil {
return nil, fmt.Errorf("connection to redis cluster failed: %w", err)
}
@@ -166,6 +175,76 @@ func createEntriesCountFn(client redis.Cmdable, meta *redisStreamsMetadata) (ent
}
return entriesLength, nil
}
+ case lagFactor:
+ entriesCountFn = func(ctx context.Context) (int64, error) {
+ // Make sure that redis is version 7+, which is required for xinfo lag
+ info, err := client.Info(ctx).Result()
+ if err != nil {
+ err := errors.New("could not find Redis version")
+ return -1, err
+ }
+ infoLines := strings.Split(info, "\n")
+ versionFound := false
+ for i := 0; i < len(infoLines); i++ {
+ line := infoLines[i]
+ lineSplit := strings.Split(line, ":")
+ if len(lineSplit) > 1 {
+ fieldName := lineSplit[0]
+ fieldValue := lineSplit[1]
+ if fieldName == "redis_version" {
+ versionFound = true
+ versionNumString := strings.Split(fieldValue, ".")[0]
+ versionNum, err := strconv.ParseInt(versionNumString, 10, 64)
+ if err != nil {
+ err := errors.New("redis version could not be converted to number")
+ return -1, err
+ }
+ if versionNum < int64(7) {
+ err := errors.New("redis version 7+ required for lag")
+ return -1, err
+ }
+ break
+ }
+ }
+ }
+ if !versionFound {
+ err := errors.New("could not find Redis version number")
+ return -1, err
+ }
+ groups, err := client.XInfoGroups(ctx, meta.streamName).Result()
+
+ // If XINFO GROUPS can't find the stream key, it hasn't been created
+ // yet. In that case, we return a lag of 0.
+ if fmt.Sprint(err) == "ERR no such key" {
+ return 0, nil
+ }
+
+ // If the stream has been created, then we find the consumer group
+ // associated with this scaler and return its lag.
+ numGroups := len(groups)
+ for i := 0; i < numGroups; i++ {
+ group := groups[i]
+ if group.Name == meta.consumerGroupName {
+ return group.Lag, nil
+ }
+ }
+
+ // There is an edge case where the Redis producer has set up the
+ // stream [meta.streamName], but the consumer group [meta.consumerGroupName]
+ // for that stream isn't registered with Redis. In other words, the
+ // producer has created messages for the stream, but the consumer group
+ // hasn't yet registered itself on Redis because scaling starts with 0
+ // consumers. In this case, it's necessary to use XLEN to return what
+ // the lag would have been if the consumer group had been created since
+ // it's not possible to obtain the lag for a nonexistent consumer
+ // group. From here, the consumer group gets instantiated, and scaling
+ // again occurs according to XINFO GROUP lag.
+ entriesLength, err := client.XLen(ctx, meta.streamName).Result()
+ if err != nil {
+ return -1, err
+ }
+ return entriesLength, nil
+ }
default:
err = fmt.Errorf("unrecognized scale factor %v", meta.scaleFactor)
}
@@ -210,16 +289,38 @@ func parseRedisStreamsMetadata(config *ScalerConfig, parseFn redisAddressParser)
return nil, ErrRedisMissingStreamName
}
+ meta.activationLagCount = defaultActivationLagCount
+
if val, ok := config.TriggerMetadata[consumerGroupNameMetadata]; ok {
meta.consumerGroupName = val
- meta.scaleFactor = xPendingFactor
- meta.targetPendingEntriesCount = defaultTargetEntries
- if val, ok := config.TriggerMetadata[pendingEntriesCountMetadata]; ok {
- pendingEntriesCount, err := strconv.ParseInt(val, 10, 64)
+ if val, ok := config.TriggerMetadata[lagMetadata]; ok {
+ meta.scaleFactor = lagFactor
+ lag, err := strconv.ParseInt(val, 10, 64)
if err != nil {
- return nil, fmt.Errorf("error parsing pending entries count: %w", err)
+ return nil, fmt.Errorf("error parsing lag: %w", err)
+ }
+ meta.targetLag = lag
+
+ if val, ok := config.TriggerMetadata[activationValueTriggerConfigName]; ok {
+ activationVal, err := strconv.ParseInt(val, 10, 64)
+ if err != nil {
+ return nil, errors.New("error while parsing activation lag value")
+ }
+ meta.activationLagCount = activationVal
+ } else {
+ err := errors.New("activationLagCount required for Redis lag")
+ return nil, err
+ }
+ } else {
+ meta.scaleFactor = xPendingFactor
+ meta.targetPendingEntriesCount = defaultTargetEntries
+ if val, ok := config.TriggerMetadata[pendingEntriesCountMetadata]; ok {
+ pendingEntriesCount, err := strconv.ParseInt(val, 10, 64)
+ if err != nil {
+ return nil, fmt.Errorf("error parsing pending entries count: %w", err)
+ }
+ meta.targetPendingEntriesCount = pendingEntriesCount
}
- meta.targetPendingEntriesCount = pendingEntriesCount
}
} else {
meta.scaleFactor = xLengthFactor
@@ -259,6 +360,8 @@ func (s *redisStreamsScaler) GetMetricSpecForScaling(context.Context) []v2.Metri
metricValue = s.metadata.targetPendingEntriesCount
case xLengthFactor:
metricValue = s.metadata.targetStreamLength
+ case lagFactor:
+ metricValue = s.metadata.targetLag
}
externalMetric := &v2.ExternalMetricSource{
@@ -271,16 +374,15 @@ func (s *redisStreamsScaler) GetMetricSpecForScaling(context.Context) []v2.Metri
return []v2.MetricSpec{metricSpec}
}
-// GetMetricsAndActivity fetches the number of pending entries for a consumer group in a stream
+// GetMetricsAndActivity fetches the metric value for a consumer group in a stream
func (s *redisStreamsScaler) GetMetricsAndActivity(ctx context.Context, metricName string) ([]external_metrics.ExternalMetricValue, bool, error) {
- pendingEntriesCount, err := s.getEntriesCountFn(ctx)
+ metricCount, err := s.getEntriesCountFn(ctx)
if err != nil {
- s.logger.Error(err, "error fetching pending entries count")
+ s.logger.Error(err, "error fetching metric count")
return []external_metrics.ExternalMetricValue{}, false, err
}
- metric := GenerateMetricInMili(metricName, float64(pendingEntriesCount))
-
- return []external_metrics.ExternalMetricValue{metric}, pendingEntriesCount > 0, nil
+ metric := GenerateMetricInMili(metricName, float64(metricCount))
+ return []external_metrics.ExternalMetricValue{metric}, metricCount > s.metadata.activationLagCount, nil
}
diff --git a/pkg/scalers/redis_streams_scaler_test.go b/pkg/scalers/redis_streams_scaler_test.go
index 94915f98f73..26e67797b4b 100644
--- a/pkg/scalers/redis_streams_scaler_test.go
+++ b/pkg/scalers/redis_streams_scaler_test.go
@@ -19,7 +19,7 @@ func TestParseRedisStreamsMetadata(t *testing.T) {
authParams := map[string]string{"username": "foobarred", "password": "foobarred"}
- testCases := []testCase{
+ testCasesPending := []testCase{
{
name: "with address",
metadata: map[string]string{"stream": "my-stream", "consumerGroup": "my-stream-consumer-group", "pendingEntriesCount": "5", "addressFromEnv": "REDIS_SERVICE", "usernameFromEnv": "REDIS_USERNAME", "passwordFromEnv": "REDIS_PASSWORD", "databaseIndex": "0", "enableTLS": "true"},
@@ -44,7 +44,7 @@ func TestParseRedisStreamsMetadata(t *testing.T) {
},
}
- for _, tc := range testCases {
+ for _, tc := range testCasesPending {
tc := tc
t.Run(tc.name, func(te *testing.T) {
m, err := parseRedisStreamsMetadata(&ScalerConfig{TriggerMetadata: tc.metadata, ResolvedEnv: tc.resolvedEnv, AuthParams: tc.authParams}, parseRedisAddress)
@@ -68,6 +68,56 @@ func TestParseRedisStreamsMetadata(t *testing.T) {
assert.Equal(t, b, m.connectionInfo.enableTLS)
})
}
+
+ testCasesLag := []testCase{
+ {
+ name: "with address",
+ metadata: map[string]string{"stream": "my-stream", "consumerGroup": "my-stream-consumer-group", "lagCount": "5", "activationLagCount": "3", "addressFromEnv": "REDIS_SERVICE", "usernameFromEnv": "REDIS_USERNAME", "passwordFromEnv": "REDIS_PASSWORD", "databaseIndex": "0", "enableTLS": "true"},
+ resolvedEnv: map[string]string{
+ "REDIS_SERVICE": "myredis:6379",
+ "REDIS_USERNAME": "foobarred",
+ "REDIS_PASSWORD": "foobarred",
+ },
+ authParams: nil,
+ },
+
+ {
+ name: "with host and port",
+ metadata: map[string]string{"stream": "my-stream", "consumerGroup": "my-stream-consumer-group", "lagCount": "2", "activationLagCount": "3", "hostFromEnv": "REDIS_HOST", "port": "REDIS_PORT", "usernameFromEnv": "REDIS_USERNAME", "passwordFromEnv": "REDIS_PASSWORD", "databaseIndex": "0", "enableTLS": "false"},
+ resolvedEnv: map[string]string{
+ "REDIS_HOST": "myredis",
+ "REDIS_PORT": "6379",
+ "REDIS_USERNAME": "foobarred",
+ "REDIS_PASSWORD": "foobarred",
+ },
+ authParams: authParams,
+ },
+ }
+
+ for _, tc := range testCasesLag {
+ tc := tc
+ t.Run(tc.name, func(te *testing.T) {
+ m, err := parseRedisStreamsMetadata(&ScalerConfig{TriggerMetadata: tc.metadata, ResolvedEnv: tc.resolvedEnv, AuthParams: tc.authParams}, parseRedisAddress)
+ assert.Nil(t, err)
+ assert.Equal(t, m.streamName, tc.metadata[streamNameMetadata])
+ assert.Equal(t, m.consumerGroupName, tc.metadata[consumerGroupNameMetadata])
+ assert.Equal(t, strconv.FormatInt(m.targetLag, 10), tc.metadata[lagMetadata])
+ if authParams != nil {
+ // if authParam is used
+ assert.Equal(t, m.connectionInfo.username, authParams[usernameMetadata])
+ assert.Equal(t, m.connectionInfo.password, authParams[passwordMetadata])
+ } else {
+ // if metadata is used to pass credentials' env var names
+ assert.Equal(t, m.connectionInfo.username, tc.resolvedEnv[tc.metadata[usernameMetadata]])
+ assert.Equal(t, m.connectionInfo.password, tc.resolvedEnv[tc.metadata[passwordMetadata]])
+ }
+
+ assert.Equal(t, strconv.Itoa(m.databaseIndex), tc.metadata[databaseIndexMetadata])
+ b, err := strconv.ParseBool(tc.metadata[enableTLSMetadata])
+ assert.Nil(t, err)
+ assert.Equal(t, m.connectionInfo.enableTLS, b)
+ })
+ }
}
func TestParseRedisStreamsMetadataForInvalidCases(t *testing.T) {
@@ -85,15 +135,17 @@ func TestParseRedisStreamsMetadataForInvalidCases(t *testing.T) {
testCases := []testCase{
// missing mandatory metadata
- {"missing address as well as host/port", map[string]string{"stream": "my-stream", "pendingEntriesCount": "5", "consumerGroup": "my-stream-consumer-group"}, resolvedEnvMap},
+ {"missing address as well as host/port", map[string]string{"stream": "my-stream", "pendingEntriesCount": "5", "lagCount": "5", "consumerGroup": "my-stream-consumer-group"}, resolvedEnvMap},
- {"host present but missing port", map[string]string{"stream": "my-stream", "pendingEntriesCount": "5", "consumerGroup": "my-stream-consumer-group", "host": "REDIS_HOST"}, resolvedEnvMap},
+ {"host present but missing port", map[string]string{"stream": "my-stream", "pendingEntriesCount": "5", "lagCount": "5", "consumerGroup": "my-stream-consumer-group", "host": "REDIS_HOST"}, resolvedEnvMap},
- {"port present but missing host", map[string]string{"stream": "my-stream", "pendingEntriesCount": "5", "consumerGroup": "my-stream-consumer-group", "port": "REDIS_PORT"}, resolvedEnvMap},
+ {"port present but missing host", map[string]string{"stream": "my-stream", "pendingEntriesCount": "5", "lagCount": "5", "consumerGroup": "my-stream-consumer-group", "port": "REDIS_PORT"}, resolvedEnvMap},
{"missing stream", map[string]string{"pendingEntriesCount": "5", "consumerGroup": "my-stream-consumer-group", "address": "REDIS_HOST"}, resolvedEnvMap},
// invalid value for respective fields
+ {"invalid lag", map[string]string{"stream": "my-stream", "consumerGroup": "my-stream-consumer-group", "pendingEntriesCount": "5", "lagCount": "junk", "host": "REDIS_HOST", "port": "REDIS_PORT", "databaseIndex": "0", "enableTLS": "false"}, resolvedEnvMap},
+
{"invalid pendingEntriesCount", map[string]string{"stream": "my-stream", "consumerGroup": "my-stream-consumer-group", "pendingEntriesCount": "junk", "host": "REDIS_HOST", "port": "REDIS_PORT", "databaseIndex": "0", "enableTLS": "false"}, resolvedEnvMap},
{"invalid streamLength", map[string]string{"stream": "my-stream", "streamLength": "junk", "host": "REDIS_HOST", "port": "REDIS_PORT", "databaseIndex": "0", "enableTLS": "false"}, resolvedEnvMap},
@@ -198,11 +250,48 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
wantMeta: nil,
wantErr: strconv.ErrSyntax,
},
+ {
+ name: "invalid lag",
+ metadata: map[string]string{
+ "stream": "my-stream",
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "consumerGroup": "consumer1",
+ "pendingEntriesCount": "5",
+ "lagCount": "junk",
+ },
+ wantMeta: nil,
+ wantErr: strconv.ErrSyntax,
+ },
+ {
+ name: "address is defined in auth params",
+ metadata: map[string]string{
+ "stream": "my-stream",
+ "lagCount": "6",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "addresses": ":7001, :7002",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 6,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{":7001", ":7002"},
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "address is defined in auth params",
metadata: map[string]string{
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
@@ -210,7 +299,8 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{":7001", ":7002"},
@@ -219,11 +309,38 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "hosts and ports given in auth params",
+ metadata: map[string]string{
+ "stream": "my-stream",
+ "lagCount": "6",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "hosts": " a, b, c ",
+ "ports": "1, 2, 3",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 6,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "hosts and ports given in auth params",
metadata: map[string]string{
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
@@ -232,7 +349,8 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -243,13 +361,42 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "username given in authParams",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "username": "username",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ username: "username",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "username given in authParams",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
@@ -257,7 +404,8 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -275,14 +423,15 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"username": "username",
},
authParams: map[string]string{},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -294,13 +443,42 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "username given in metadata from env",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "usernameFromEnv": "REDIS_USERNAME",
+ },
+ authParams: map[string]string{},
+ resolvedEnv: testRedisResolvedEnv,
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ username: "none",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "username given in metadata from env",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"usernameFromEnv": "REDIS_USERNAME",
},
@@ -308,7 +486,8 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
resolvedEnv: testRedisResolvedEnv,
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -320,13 +499,42 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "password given in authParams",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "password": "password",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ password: "password",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "password given in authParams",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
@@ -334,7 +542,8 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -346,13 +555,42 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "password given in metadata from env",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "passwordFromEnv": "REDIS_PASSWORD",
+ },
+ authParams: map[string]string{},
+ resolvedEnv: testRedisResolvedEnv,
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ password: "none",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "password given in metadata from env",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"passwordFromEnv": "REDIS_PASSWORD",
},
@@ -360,7 +598,8 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
resolvedEnv: testRedisResolvedEnv,
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -372,13 +611,45 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "tls enabled without setting unsafeSsl",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "enableTLS": "true",
+ },
+ authParams: map[string]string{
+ "password": "password",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ password: "password",
+ enableTLS: true,
+ unsafeSsl: false,
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "tls enabled without setting unsafeSsl",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"enableTLS": "true",
},
@@ -387,7 +658,8 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -401,13 +673,46 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "tls enabled with unsafeSsl true",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "enableTLS": "true",
+ "unsafeSsl": "true",
+ },
+ authParams: map[string]string{
+ "password": "password",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ password: "password",
+ enableTLS: true,
+ unsafeSsl: true,
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "tls enabled with unsafeSsl true",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"enableTLS": "true",
"unsafeSsl": "true",
@@ -417,7 +722,8 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -461,6 +767,8 @@ func TestParseRedisClusterStreamsMetadata(t *testing.T) {
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
targetPendingEntriesCount: 5,
+ targetLag: 0,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{":7001", ":7002"},
@@ -524,22 +832,48 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
wantErr: ErrRedisMissingStreamName,
},
{
- name: "invalid pending entries count",
+ name: "invalid lag count",
metadata: map[string]string{
"stream": "my-stream",
"hosts": "a, b, c",
"ports": "1, 2, 3",
"consumerGroup": "consumer1",
- "pendingEntriesCount": "invalid",
+ "pendingEntriesCount": "5",
+ "lagCount": "invalid",
+ "activationLagCount": "3",
},
wantMeta: nil,
wantErr: strconv.ErrSyntax,
},
+ {
+ name: "address is defined in auth params",
+ metadata: map[string]string{
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "addresses": ":7001, :7002",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{":7001", ":7002"},
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "address is defined in auth params",
metadata: map[string]string{
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
@@ -547,7 +881,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{":7001", ":7002"},
@@ -559,9 +894,10 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
{
name: "hosts and ports given in auth params",
metadata: map[string]string{
- "stream": "my-stream",
- "pendingEntriesCount": "10",
- "consumerGroup": "consumer1",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
},
authParams: map[string]string{
"hosts": " a, b, c ",
@@ -569,57 +905,142 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
hosts: []string{"a", "b", "c"},
ports: []string{"1", "2", "3"},
},
- scaleFactor: xPendingFactor,
+ scaleFactor: lagFactor,
},
wantErr: nil,
},
{
- name: "username given in authParams",
+ name: "hosts and ports given in auth params",
metadata: map[string]string{
- "hosts": "a, b, c",
- "ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
- "username": "username",
+ "hosts": " a, b, c ",
+ "ports": "1, 2, 3",
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
hosts: []string{"a", "b", "c"},
ports: []string{"1", "2", "3"},
- username: "username",
},
scaleFactor: xPendingFactor,
},
wantErr: nil,
},
{
- name: "username given in metadata",
+ name: "username given in authParams",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "username": "username",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ username: "username",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
+ {
+ name: "username given in authParams",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "pendingEntriesCount": "5",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "username": "username",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ username: "username",
+ },
+ scaleFactor: xPendingFactor,
+ },
+ wantErr: nil,
+ },
+ {
+ name: "username given in metadata",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "username": "username",
+ },
+ authParams: map[string]string{},
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ username: "username",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
+ {
+ name: "username given in metadata",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"username": "username",
},
authParams: map[string]string{},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -631,13 +1052,42 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "username given in metadata from env",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "usernameFromEnv": "REDIS_USERNAME",
+ },
+ authParams: map[string]string{},
+ resolvedEnv: testRedisResolvedEnv,
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ username: "none",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "username given in metadata from env",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"usernameFromEnv": "REDIS_USERNAME",
},
@@ -645,7 +1095,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
resolvedEnv: testRedisResolvedEnv,
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -657,13 +1108,42 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "password given in authParams",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "password": "password",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ password: "password",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "password given in authParams",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
@@ -671,7 +1151,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -683,13 +1164,42 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "password given in metadata from env",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "passwordFromEnv": "REDIS_PASSWORD",
+ },
+ authParams: map[string]string{},
+ resolvedEnv: testRedisResolvedEnv,
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ password: "none",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "password given in metadata from env",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"passwordFromEnv": "REDIS_PASSWORD",
},
@@ -697,7 +1207,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
resolvedEnv: testRedisResolvedEnv,
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -709,13 +1220,42 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "sentinelUsername given in authParams",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "sentinelUsername": "sentinelUsername",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ sentinelUsername: "sentinelUsername",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "sentinelUsername given in authParams",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
@@ -723,7 +1263,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -735,20 +1276,49 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "sentinelUsername given in metadata",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "sentinelUsername": "sentinelUsername",
+ },
+ authParams: map[string]string{},
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ sentinelUsername: "sentinelUsername",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "sentinelUsername given in metadata",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"sentinelUsername": "sentinelUsername",
},
authParams: map[string]string{},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -766,7 +1336,36 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "sentinelUsernameFromEnv": "REDIS_SENTINEL_USERNAME",
+ },
+ authParams: map[string]string{},
+ resolvedEnv: testRedisResolvedEnv,
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ sentinelUsername: "none",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
+ {
+ name: "sentinelUsername given in metadata from env",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"sentinelUsernameFromEnv": "REDIS_SENTINEL_USERNAME",
},
@@ -774,7 +1373,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
resolvedEnv: testRedisResolvedEnv,
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -786,13 +1386,42 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "sentinelPassword given in authParams",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "sentinelPassword": "sentinelPassword",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ sentinelPassword: "sentinelPassword",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "sentinelPassword given in authParams",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
@@ -800,7 +1429,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -818,7 +1448,36 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "sentinelPasswordFromEnv": "REDIS_SENTINEL_PASSWORD",
+ },
+ authParams: map[string]string{},
+ resolvedEnv: testRedisResolvedEnv,
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ sentinelPassword: "none",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
+ {
+ name: "sentinelPassword given in metadata from env",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"sentinelPasswordFromEnv": "REDIS_SENTINEL_PASSWORD",
},
@@ -826,7 +1485,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
resolvedEnv: testRedisResolvedEnv,
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -838,13 +1498,42 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "sentinelMaster given in authParams",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{
+ "sentinelMaster": "sentinelMaster",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ sentinelMaster: "sentinelMaster",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "sentinelMaster given in authParams",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{
@@ -852,7 +1541,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -864,20 +1554,49 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "sentinelMaster given in metadata",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "sentinelMaster": "sentinelMaster",
+ },
+ authParams: map[string]string{},
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ sentinelMaster: "sentinelMaster",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "sentinelMaster given in metadata",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"sentinelMaster": "sentinelMaster",
},
authParams: map[string]string{},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -895,7 +1614,36 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "sentinelMasterFromEnv": "REDIS_SENTINEL_MASTER",
+ },
+ authParams: map[string]string{},
+ resolvedEnv: testRedisResolvedEnv,
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ sentinelMaster: "none",
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
+ {
+ name: "sentinelMaster given in metadata from env",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"sentinelMasterFromEnv": "REDIS_SENTINEL_MASTER",
},
@@ -903,7 +1651,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
resolvedEnv: testRedisResolvedEnv,
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -915,13 +1664,45 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "tls enabled without setting unsafeSsl",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "enableTLS": "true",
+ },
+ authParams: map[string]string{
+ "password": "password",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ password: "password",
+ enableTLS: true,
+ unsafeSsl: false,
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "tls enabled without setting unsafeSsl",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"enableTLS": "true",
},
@@ -930,7 +1711,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -944,13 +1726,46 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "tls enabled with unsafeSsl true",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ "enableTLS": "true",
+ "unsafeSsl": "true",
+ },
+ authParams: map[string]string{
+ "password": "password",
+ },
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ password: "password",
+ enableTLS: true,
+ unsafeSsl: true,
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "tls enabled with unsafeSsl true",
metadata: map[string]string{
"hosts": "a, b, c",
"ports": "1, 2, 3",
"stream": "my-stream",
- "pendingEntriesCount": "10",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
"enableTLS": "true",
"unsafeSsl": "true",
@@ -960,7 +1775,8 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 10,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1", "b:2", "c:3"},
@@ -998,6 +1814,36 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
},
wantErr: nil,
},
+ {
+ name: "streamLength, pendingEntriesCount and consumerGroup passed",
+ metadata: map[string]string{
+ "hosts": "a",
+ "ports": "1",
+ "stream": "my-stream",
+ "streamLength": "15",
+ "lagCount": "70",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{},
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 70,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1"},
+ hosts: []string{"a"},
+ ports: []string{"1"},
+ password: "",
+ enableTLS: false,
+ unsafeSsl: false,
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ },
{
name: "streamLength, pendingEntriesCount and consumerGroup passed",
metadata: map[string]string{
@@ -1005,13 +1851,14 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
"ports": "1",
"stream": "my-stream",
"streamLength": "15",
- "pendingEntriesCount": "30",
+ "pendingEntriesCount": "5",
"consumerGroup": "consumer1",
},
authParams: map[string]string{},
wantMeta: &redisStreamsMetadata{
streamName: "my-stream",
- targetPendingEntriesCount: 30,
+ targetPendingEntriesCount: 5,
+ activationLagCount: 0,
consumerGroupName: "consumer1",
connectionInfo: redisConnectionInfo{
addresses: []string{"a:1"},
@@ -1070,3 +1917,102 @@ func TestParseRedisSentinelStreamsMetadata(t *testing.T) {
})
}
}
+
+func TestActivityCount(t *testing.T) {
+ // Test to make sure GetMetricsAndActivity returns true for isActive
+ // when the lag count is greater than activationLagCount and false
+ // when it is less.
+ type testCase struct {
+ name string
+ metadata map[string]string
+ resolvedEnv map[string]string
+ authParams map[string]string
+ wantMeta *redisStreamsMetadata
+ wantErr error
+ }
+ c := testCase{
+ name: "sentinelMaster given in metadata from env",
+ metadata: map[string]string{
+ "hosts": "a, b, c",
+ "ports": "1, 2, 3",
+ "stream": "my-stream",
+ "lagCount": "7",
+ "activationLagCount": "3",
+ "consumerGroup": "consumer1",
+ },
+ authParams: map[string]string{},
+ resolvedEnv: testRedisResolvedEnv,
+ wantMeta: &redisStreamsMetadata{
+ streamName: "my-stream",
+ targetPendingEntriesCount: 0,
+ targetLag: 7,
+ activationLagCount: 3,
+ consumerGroupName: "consumer1",
+ connectionInfo: redisConnectionInfo{
+ addresses: []string{"a:1", "b:2", "c:3"},
+ hosts: []string{"a", "b", "c"},
+ ports: []string{"1", "2", "3"},
+ },
+ scaleFactor: lagFactor,
+ },
+ wantErr: nil,
+ }
+ t.Run(c.name, func(t *testing.T) {
+ config := &ScalerConfig{
+ TriggerMetadata: c.metadata,
+ ResolvedEnv: c.resolvedEnv,
+ AuthParams: c.authParams,
+ }
+ meta, err := parseRedisStreamsMetadata(config, parseRedisClusterAddress)
+ if c.wantErr != nil {
+ assert.ErrorIs(t, err, c.wantErr)
+ } else {
+ assert.NoError(t, err)
+ }
+ assert.Equal(t, c.wantMeta, meta)
+ ctx := context.Background()
+ metricType, err := GetMetricTargetType(config)
+ logger := InitializeLogger(config, "redis_streams_scaler")
+ closeFn := func() error {
+ return nil
+ }
+
+ entriesCountFn := func(ctx context.Context) (int64, error) {
+ return 0, nil // Initiall, there is a lag of 0.
+ }
+
+ scaler := &redisStreamsScaler{
+ metricType: metricType,
+ metadata: meta,
+ closeFn: closeFn,
+ getEntriesCountFn: entriesCountFn,
+ logger: logger,
+ }
+
+ if err != nil {
+ t.Logf("Scaler error: %s", err)
+ }
+
+ // When the lag is 0, the scaler should be inactive.
+ metricSpec := scaler.GetMetricSpecForScaling(context.Background())
+ metricName := metricSpec[0].External.Metric.Name
+ _, isActive, err := scaler.GetMetricsAndActivity(ctx, metricName)
+
+ if err != nil {
+ t.Logf("Error when running GetMetricsAndActivity: %s", err)
+ }
+
+ assert.Equal(t, isActive, false, "redis scaler shouldn't be active when lag is less than activation")
+
+ scaler.getEntriesCountFn = func(ctx context.Context) (int64, error) {
+ return 4, nil // Simulate having a lag of 4, one more than the activation value.
+ }
+ _, isActive, err = scaler.GetMetricsAndActivity(ctx, metricName)
+
+ if err != nil {
+ t.Logf("Error when running GetMetricsAndActivity: %s", err)
+ }
+
+ assert.Equal(t, isActive, true, "redis scaler should be active when lag is greater than activation")
+ })
+}
diff --git a/pkg/scalers/solace_scaler.go b/pkg/scalers/solace_scaler.go
index e150b75a7c0..8ec5b2c7eae 100644
--- a/pkg/scalers/solace_scaler.go
+++ b/pkg/scalers/solace_scaler.go
@@ -18,34 +18,47 @@ import (
const (
solaceExtMetricType = "External"
solaceScalerID = "solace"
+
// REST ENDPOINT String Patterns
- solaceSempEndpointURLTemplate = "%s/%s/%s/monitor/msgVpns/%s/%ss/%s"
+ solaceSempQueryFieldURLSuffix = "?select=msgs,msgSpoolUsage,averageRxMsgRate"
+ solaceSempEndpointURLTemplate = "%s/%s/%s/monitor/msgVpns/%s/%ss/%s" + solaceSempQueryFieldURLSuffix
+
// SEMP REST API Context
solaceAPIName = "SEMP"
solaceAPIVersion = "v2"
solaceAPIObjectTypeQueue = "queue"
+
// Log Message Templates
solaceFoundMetaFalse = "required Field %s NOT FOUND in Solace Metadata"
+
// YAML Configuration Metadata Field Names
// Broker Identifiers
solaceMetaSempBaseURL = "solaceSempBaseURL"
+
// Credential Identifiers
solaceMetaUsername = "username"
solaceMetaPassword = "password"
solaceMetaUsernameFromEnv = "usernameFromEnv"
solaceMetaPasswordFromEnv = "passwordFromEnv"
+
// Target Object Identifiers
solaceMetaMsgVpn = "messageVpn"
solaceMetaQueueName = "queueName"
+
// Metric Targets
solaceMetaMsgCountTarget = "messageCountTarget"
solaceMetaMsgSpoolUsageTarget = "messageSpoolUsageTarget"
+ solaceMetaMsgRxRateTarget = "messageReceiveRateTarget"
+
// Metric Activation Targets
solaceMetaActivationMsgCountTarget = "activationMessageCountTarget"
solaceMetaActivationMsgSpoolUsageTarget = "activationMessageSpoolUsageTarget"
+ solaceMetaActivationMsgRxRateTarget = "activationMessageReceiveRateTarget"
+
// Trigger type identifiers
solaceTriggermsgcount = "msgcount"
solaceTriggermsgspoolusage = "msgspoolusage"
+ solaceTriggermsgrxrate = "msgrcvrate"
)
// Struct for Observed Metric Values
@@ -54,6 +67,8 @@ type SolaceMetricValues struct {
msgCount int
// Observed Message Spool Usage
msgSpoolUsage int
+ // Observed Message Received Rate
+ msgRcvRate int
}
type SolaceScaler struct {
@@ -67,19 +82,25 @@ type SolaceMetadata struct {
// Full SEMP URL to target queue (CONSTRUCTED IN CODE)
endpointURL string
solaceSempURL string
+
// Solace Message VPN
messageVpn string
queueName string
+
// Basic Auth Username
username string
// Basic Auth Password
password string
+
// Target Message Count
msgCountTarget int64
msgSpoolUsageTarget int64 // Spool Use Target in Megabytes
+ msgRxRateTarget int64 // Ingress Rate Target per consumer in msgs/second
+
// Activation Target Message Count
activationMsgCountTarget int
activationMsgSpoolUsageTarget int // Spool Use Target in Megabytes
+ activationMsgRxRateTarget int // Ingress Rate Target per consumer in msgs/second
// Scaler index
scalerIndex int
}
@@ -99,6 +120,7 @@ type solaceSEMPCollections struct {
// SEMP API Response Queue Data Struct
type solaceSEMPData struct {
MsgSpoolUsage int `json:"msgSpoolUsage"`
+ MsgRcvRate int `json:"averageRxMsgRate"`
}
// SEMP API Messages Struct
@@ -162,6 +184,7 @@ func parseSolaceMetadata(config *ScalerConfig) (*SolaceMetadata, error) {
// GET METRIC TARGET VALUES
// GET msgCountTarget
+ meta.msgCountTarget = 0
if val, ok := config.TriggerMetadata[solaceMetaMsgCountTarget]; ok && val != "" {
if msgCount, err := strconv.ParseInt(val, 10, 64); err == nil {
meta.msgCountTarget = msgCount
@@ -170,6 +193,7 @@ func parseSolaceMetadata(config *ScalerConfig) (*SolaceMetadata, error) {
}
}
// GET msgSpoolUsageTarget
+ meta.msgSpoolUsageTarget = 0
if val, ok := config.TriggerMetadata[solaceMetaMsgSpoolUsageTarget]; ok && val != "" {
if msgSpoolUsage, err := strconv.ParseInt(val, 10, 64); err == nil {
meta.msgSpoolUsageTarget = msgSpoolUsage * 1024 * 1024
@@ -177,9 +201,18 @@ func parseSolaceMetadata(config *ScalerConfig) (*SolaceMetadata, error) {
return nil, fmt.Errorf("can't parse [%s], not a valid integer: %w", solaceMetaMsgSpoolUsageTarget, err)
}
}
+ // GET msgRcvRateTarget
+ meta.msgRxRateTarget = 0
+ if val, ok := config.TriggerMetadata[solaceMetaMsgRxRateTarget]; ok && val != "" {
+ if msgRcvRate, err := strconv.ParseInt(val, 10, 64); err == nil {
+ meta.msgRxRateTarget = msgRcvRate
+ } else {
+ return nil, fmt.Errorf("can't parse [%s], not a valid integer: %w", solaceMetaMsgRxRateTarget, err)
+ }
+ }
// Check that we have at least one positive target value for the scaler
- if meta.msgCountTarget < 1 && meta.msgSpoolUsageTarget < 1 {
+ if meta.msgCountTarget < 1 && meta.msgSpoolUsageTarget < 1 && meta.msgRxRateTarget < 1 {
return nil, fmt.Errorf("no target value found in the scaler configuration")
}
@@ -202,6 +235,14 @@ func parseSolaceMetadata(config *ScalerConfig) (*SolaceMetadata, error) {
return nil, fmt.Errorf("can't parse [%s], not a valid integer: %w", solaceMetaActivationMsgSpoolUsageTarget, err)
}
}
+ meta.activationMsgRxRateTarget = 0
+ if val, ok := config.TriggerMetadata[solaceMetaActivationMsgRxRateTarget]; ok && val != "" {
+ if activationMsgRxRateTarget, err := strconv.Atoi(val); err == nil {
+ meta.activationMsgRxRateTarget = activationMsgRxRateTarget
+ } else {
+ return nil, fmt.Errorf("can't parse [%s], not a valid integer: %w", solaceMetaActivationMsgRxRateTarget, err)
+ }
+ }
// Format Solace SEMP Queue Endpoint (REST URL)
meta.endpointURL = fmt.Sprintf(
@@ -296,6 +337,18 @@ func (s *SolaceScaler) GetMetricSpecForScaling(context.Context) []v2.MetricSpec
metricSpec := v2.MetricSpec{External: externalMetric, Type: solaceExtMetricType}
metricSpecList = append(metricSpecList, metricSpec)
}
+ // Message Receive Rate Target Spec
+ if s.metadata.msgRxRateTarget > 0 {
+ metricName := kedautil.NormalizeString(fmt.Sprintf("solace-%s-%s", s.metadata.queueName, solaceTriggermsgrxrate))
+ externalMetric := &v2.ExternalMetricSource{
+ Metric: v2.MetricIdentifier{
+ Name: GenerateMetricNameWithIndex(s.metadata.scalerIndex, metricName),
+ },
+ Target: GetMetricTarget(s.metricType, s.metadata.msgRxRateTarget),
+ }
+ metricSpec := v2.MetricSpec{External: externalMetric, Type: solaceExtMetricType}
+ metricSpecList = append(metricSpecList, metricSpec)
+ }
return metricSpecList
}
@@ -341,6 +394,7 @@ func (s *SolaceScaler) getSolaceQueueMetricsFromSEMP(ctx context.Context) (Solac
// Set Return Values
metricValues.msgCount = sempResponse.Collections.Msgs.Count
metricValues.msgSpoolUsage = sempResponse.Data.MsgSpoolUsage
+ metricValues.msgRcvRate = sempResponse.Data.MsgRcvRate
return metricValues, nil
}
@@ -363,13 +417,19 @@ func (s *SolaceScaler) GetMetricsAndActivity(ctx context.Context, metricName str
metric = GenerateMetricInMili(metricName, float64(metricValues.msgCount))
case strings.HasSuffix(metricName, solaceTriggermsgspoolusage):
metric = GenerateMetricInMili(metricName, float64(metricValues.msgSpoolUsage))
+ case strings.HasSuffix(metricName, solaceTriggermsgrxrate):
+ metric = GenerateMetricInMili(metricName, float64(metricValues.msgRcvRate))
default:
// Should never end up here
err := fmt.Errorf("unidentified metric: %s", metricName)
s.logger.Error(err, "returning error to calling app")
return []external_metrics.ExternalMetricValue{}, false, err
}
- return []external_metrics.ExternalMetricValue{metric}, (metricValues.msgCount > s.metadata.activationMsgCountTarget || metricValues.msgSpoolUsage > s.metadata.activationMsgSpoolUsageTarget), nil
+ return []external_metrics.ExternalMetricValue{metric},
+ (metricValues.msgCount > s.metadata.activationMsgCountTarget ||
+ metricValues.msgSpoolUsage > s.metadata.activationMsgSpoolUsageTarget ||
+ metricValues.msgRcvRate > s.metadata.activationMsgRxRateTarget),
+ nil
}
// Do Nothing - Satisfies Interface
diff --git a/pkg/scalers/solace_scaler_test.go b/pkg/scalers/solace_scaler_test.go
index 436c033be8c..3b6df9fd24f 100644
--- a/pkg/scalers/solace_scaler_test.go
+++ b/pkg/scalers/solace_scaler_test.go
@@ -17,15 +17,16 @@ type testSolaceMetadata struct {
}
var (
- soltestValidBaseURL = "http://localhost:8080"
- soltestValidUsername = "admin"
- soltestValidPassword = "admin"
- soltestValidVpn = "dennis_vpn"
- soltestValidQueueName = "queue3"
- soltestValidMsgCountTarget = "10"
- soltestValidMsgSpoolTarget = "20"
- soltestEnvUsername = "SOLTEST_USERNAME"
- soltestEnvPassword = "SOLTEST_PASSWORD"
+ soltestValidBaseURL = "http://localhost:8080"
+ soltestValidUsername = "admin"
+ soltestValidPassword = "admin"
+ soltestValidVpn = "dennis_vpn"
+ soltestValidQueueName = "queue3"
+ soltestValidMsgCountTarget = "10"
+ soltestValidMsgSpoolTarget = "20"
+ soltestValidMsgRxRateTarget = "15"
+ soltestEnvUsername = "SOLTEST_USERNAME"
+ soltestEnvPassword = "SOLTEST_PASSWORD"
)
// AUTH RECORD FOR TEST
@@ -212,6 +213,39 @@ var testParseSolaceMetadata = []testSolaceMetadata{
1,
false,
},
+ // -Case - msgRxRateTarget non-numeric
+ {
+ "#014 - msgRxRateTarget non-numeric",
+ map[string]string{
+ solaceMetaSempBaseURL: soltestValidBaseURL,
+ solaceMetaMsgVpn: soltestValidVpn,
+ solaceMetaUsernameFromEnv: "",
+ solaceMetaPasswordFromEnv: "",
+ solaceMetaUsername: soltestValidUsername,
+ solaceMetaPassword: soltestValidPassword,
+ solaceMetaQueueName: soltestValidQueueName,
+ solaceMetaMsgRxRateTarget: "NOT_AN_INTEGER",
+ },
+ 1,
+ true,
+ },
+ // -Case - activationMsgRxRateTarget non-numeric
+ {
+ "#015 - activationMsgRxRateTarget non-numeric",
+ map[string]string{
+ solaceMetaSempBaseURL: soltestValidBaseURL,
+ solaceMetaMsgVpn: soltestValidVpn,
+ solaceMetaUsernameFromEnv: "",
+ solaceMetaPasswordFromEnv: "",
+ solaceMetaUsername: soltestValidUsername,
+ solaceMetaPassword: soltestValidPassword,
+ solaceMetaQueueName: soltestValidQueueName,
+ solaceMetaMsgRxRateTarget: "10",
+ solaceMetaActivationMsgRxRateTarget: "NOT_AN_INTEGER",
+ },
+ 1,
+ true,
+ },
}
var testSolaceEnvCreds = []testSolaceMetadata{
@@ -399,11 +433,81 @@ var testSolaceGetMetricSpecData = []testSolaceMetadata{
1,
false,
},
+ // Added for 'solaceMetaMsgRxRateTarget'
+ {
+ "#410 - Get Metric Spec - msgRxRateTarget",
+ map[string]string{
+ solaceMetaSempBaseURL: soltestValidBaseURL,
+ solaceMetaMsgVpn: soltestValidVpn,
+ solaceMetaUsernameFromEnv: "",
+ solaceMetaPasswordFromEnv: "",
+ solaceMetaUsername: soltestValidUsername,
+ solaceMetaPassword: soltestValidPassword,
+ solaceMetaQueueName: soltestValidQueueName,
+ solaceMetaMsgCountTarget: soltestValidMsgCountTarget,
+ // solaceMetaMsgSpoolUsageTarget: soltestValidMsgSpoolTarget,
+ solaceMetaMsgRxRateTarget: soltestValidMsgRxRateTarget,
+ },
+ 1,
+ false,
+ },
+ {
+ "#411 - Get Metric Spec - ALL msgSpoolUsage, msgCountTarget, and msgRxRateTarget",
+ map[string]string{
+ solaceMetaSempBaseURL: soltestValidBaseURL,
+ solaceMetaMsgVpn: soltestValidVpn,
+ solaceMetaUsernameFromEnv: "",
+ solaceMetaPasswordFromEnv: "",
+ solaceMetaUsername: soltestValidUsername,
+ solaceMetaPassword: soltestValidPassword,
+ solaceMetaQueueName: soltestValidQueueName,
+ solaceMetaMsgCountTarget: soltestValidMsgCountTarget,
+ solaceMetaMsgSpoolUsageTarget: soltestValidMsgSpoolTarget,
+ solaceMetaMsgRxRateTarget: soltestValidMsgRxRateTarget,
+ },
+ 1,
+ false,
+ },
+ {
+ "#412 - Get Metric Spec - ALL ZERO",
+ map[string]string{
+ solaceMetaSempBaseURL: soltestValidBaseURL,
+ solaceMetaMsgVpn: soltestValidVpn,
+ solaceMetaUsernameFromEnv: "",
+ solaceMetaPasswordFromEnv: "",
+ solaceMetaUsername: soltestValidUsername,
+ solaceMetaPassword: soltestValidPassword,
+ solaceMetaQueueName: soltestValidQueueName,
+ solaceMetaMsgCountTarget: "0",
+ solaceMetaMsgSpoolUsageTarget: "0",
+ solaceMetaMsgRxRateTarget: "0",
+ },
+ 1,
+ true,
+ },
+ {
+ "#413 - Get Metric Spec - msgRxRateTarget, OTHERS ZERO",
+ map[string]string{
+ solaceMetaSempBaseURL: soltestValidBaseURL,
+ solaceMetaMsgVpn: soltestValidVpn,
+ solaceMetaUsernameFromEnv: "",
+ solaceMetaPasswordFromEnv: "",
+ solaceMetaUsername: soltestValidUsername,
+ solaceMetaPassword: soltestValidPassword,
+ solaceMetaQueueName: soltestValidQueueName,
+ solaceMetaMsgCountTarget: "0",
+ solaceMetaMsgSpoolUsageTarget: "0",
+ solaceMetaMsgRxRateTarget: soltestValidMsgRxRateTarget,
+ },
+ 1,
+ false,
+ },
}
var testSolaceExpectedMetricNames = map[string]string{
"s1-" + solaceScalerID + "-" + soltestValidQueueName + "-" + solaceTriggermsgcount: "",
"s1-" + solaceScalerID + "-" + soltestValidQueueName + "-" + solaceTriggermsgspoolusage: "",
+ "s1-" + solaceScalerID + "-" + soltestValidQueueName + "-" + solaceTriggermsgrxrate: "",
}
func TestSolaceParseSolaceMetadata(t *testing.T) {
diff --git a/pkg/scaling/resolver/scale_resolvers.go b/pkg/scaling/resolver/scale_resolvers.go
index 6292e23b826..9efb6ac8dce 100644
--- a/pkg/scaling/resolver/scale_resolvers.go
+++ b/pkg/scaling/resolver/scale_resolvers.go
@@ -70,6 +70,24 @@ func ResolveScaleTargetPodSpec(ctx context.Context, kubeClient client.Client, sc
case *kedav1alpha1.ScaledObject:
// Try to get a real object instance for better cache usage, but fall back to an Unstructured if needed.
podTemplateSpec := corev1.PodTemplateSpec{}
+
+ // trying to prevent operator crashes, due to some race condition, sometimes obj.Status.ScaleTargetGVKR is nil
+ // see https://github.com/kedacore/keda/issues/4389
+ if obj.Status.ScaleTargetGVKR == nil {
+ scaledObject := &kedav1alpha1.ScaledObject{}
+ err := kubeClient.Get(ctx, types.NamespacedName{Name: obj.Name, Namespace: obj.Namespace}, scaledObject)
+ if err != nil {
+ log.Error(err, "failed to get ScaledObject", "name", obj.Name, "namespace", obj.Namespace)
+ return nil, "", err
+ }
+ obj = scaledObject
+ }
+ if obj.Status.ScaleTargetGVKR == nil {
+ err := fmt.Errorf("failed to get ScaledObject.Status.ScaleTargetGVKR, probably invalid ScaledObject cache")
+ log.Error(err, "failed to get ScaledObject.Status.ScaleTargetGVKR, probably invalid ScaledObject cache", "scaledObject.Name", obj.Name, "scaledObject.Namespace", obj.Namespace)
+ return nil, "", err
+ }
+
gvk := obj.Status.ScaleTargetGVKR.GroupVersionKind()
objKey := client.ObjectKey{Namespace: obj.Namespace, Name: obj.Spec.ScaleTargetRef.Name}
diff --git a/pkg/util/welcome.go b/pkg/util/welcome.go
index 774d69730eb..c4d81e6435e 100644
--- a/pkg/util/welcome.go
+++ b/pkg/util/welcome.go
@@ -26,8 +26,8 @@ import (
)
const (
- minSupportedVersion = 24
- maxSupportedVersion = 26
+ minSupportedVersion = 25
+ maxSupportedVersion = 27
)
func PrintWelcome(logger logr.Logger, kubeVersion K8sVersion, component string) {
diff --git a/tests/.env b/tests/.env
index ece74504325..70ae9cc29db 100644
--- a/tests/.env
+++ b/tests/.env
@@ -45,4 +45,8 @@ GH_SCOPE=
GH_REPOS=
GH_WORKFLOW_ID=
GH_SO_WORKFLOW_ID=
+GH_GHA_WORKFLOW_ID=
GH_AUTOMATION_PAT=
+GH_APP_ID=
+GH_INST_ID=
+GH_APP_KEY=
diff --git a/tests/scalers/github_runner/github_runner_test.go b/tests/scalers/github_runner/github_runner_test.go
index 5bd19c8333c..b87b8e149bb 100644
--- a/tests/scalers/github_runner/github_runner_test.go
+++ b/tests/scalers/github_runner/github_runner_test.go
@@ -42,6 +42,10 @@ var (
maxReplicaCount = 1
workflowID = os.Getenv("GH_WORKFLOW_ID")
soWorkflowID = os.Getenv("GH_SO_WORKFLOW_ID")
+ ghaWorkflowID = os.Getenv("GH_GHA_WORKFLOW_ID")
+ appID = os.Getenv("GH_APP_ID")
+ instID = os.Getenv("GH_INST_ID")
+ appKey = os.Getenv("GH_APP_KEY")
)
type templateData struct {
@@ -57,6 +61,9 @@ type templateData struct {
Repos string
RunnerScope string
Labels string
+ ApplicationID string
+ InstallationID string
+ ApplicationKey string
}
const (
@@ -81,6 +88,28 @@ spec:
name: {{.SecretName}}
key: personalAccessToken
`
+ secretGhaTemplate = `
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{.SecretName}}-gha
+ namespace: {{.TestNamespace}}
+data:
+ appKey: {{.ApplicationKey}}
+`
+ triggerGhaAuthTemplate = `
+apiVersion: keda.sh/v1alpha1
+kind: TriggerAuthentication
+metadata:
+ name: github-gha-trigger-auth
+ namespace: {{.TestNamespace}}
+spec:
+ secretTargetRef:
+ - parameter: appKey
+ name: {{.SecretName}}-gha
+ key: appKey
+`
+
deploymentTemplate = `
apiVersion: apps/v1
kind: Deployment
@@ -180,6 +209,7 @@ spec:
restartPolicy: Never
minReplicaCount: {{.MinReplicaCount}}
maxReplicaCount: {{.MaxReplicaCount}}
+ successfulJobsHistoryLimit: 0
pollingInterval: 15
triggers:
- type: github-runner
@@ -191,6 +221,57 @@ spec:
authenticationRef:
name: github-trigger-auth
`
+
+ scaledGhaJobTemplate = `
+apiVersion: keda.sh/v1alpha1
+kind: ScaledJob
+metadata:
+ name: {{.ScaledJobName}}-gha
+ namespace: {{.TestNamespace}}
+spec:
+ jobTargetRef:
+ template:
+ metadata:
+ labels:
+ app: {{.ScaledJobName}}
+ spec:
+ containers:
+ - name: {{.ScaledJobName}}
+ image: myoung34/github-runner
+ imagePullPolicy: IfNotPresent
+ env:
+ - name: EPHEMERAL
+ value: "true"
+ - name: DISABLE_RUNNER_UPDATE
+ value: "true"
+ - name: REPO_URL
+ value: "https://github.com/{{.Owner}}/{{.Repos}}"
+ - name: RUNNER_SCOPE
+ value: {{.RunnerScope}}
+ - name: LABELS
+ value: "e2e-gha-tester"
+ - name: ACCESS_TOKEN
+ valueFrom:
+ secretKeyRef:
+ name: {{.SecretName}}
+ key: personalAccessToken
+ restartPolicy: Never
+ minReplicaCount: {{.MinReplicaCount}}
+ maxReplicaCount: {{.MaxReplicaCount}}
+ successfulJobsHistoryLimit: 0
+ pollingInterval: 15
+ triggers:
+ - type: github-runner
+ metadata:
+ owner: {{.Owner}}
+ repos: {{.Repos}}
+ labels: "e2e-gha-tester"
+ runnerScopeFromEnv: "RUNNER_SCOPE"
+ applicationID: "{{.ApplicationID}}"
+ installationID: "{{.InstallationID}}"
+ authenticationRef:
+ name: github-gha-trigger-auth
+`
)
// getGitHub Client
@@ -213,10 +294,15 @@ func TestScaler(t *testing.T) {
require.NotEmpty(t, repos, "GH_REPOS env variable is required for github runner test")
require.NotEmpty(t, workflowID, "GH_WORKFLOW_ID env variable is required for github runner test")
require.NotEmpty(t, soWorkflowID, "GH_SO_WORKFLOW_ID env variable is required for github runner test")
+ require.NotEmpty(t, ghaWorkflowID, "GH_GHA_WORKFLOW_ID env variable is required for github runner test")
+ require.NotEmpty(t, appID, "GH_APPLICATION_ID env variable is required for github runner test")
+ require.NotEmpty(t, instID, "GH_INSTALLATION_ID env variable is required for github runner test")
+ require.NotEmpty(t, appKey, "GH_APP_KEY env variable is required for github runner test")
client := getGitHubClient()
cancelAllRuns(t, client, repos, workflowID)
cancelAllRuns(t, client, repos, soWorkflowID)
+ cancelAllRuns(t, client, repos, ghaWorkflowID)
// Create kubernetes resources
kc := GetKubernetesClient(t)
@@ -225,10 +311,16 @@ func TestScaler(t *testing.T) {
WaitForPodCountInNamespace(t, kc, testNamespace, minReplicaCount, 60, 2)
+ // test scaling Scaled Job with App
+ KubectlApplyWithTemplate(t, data, "scaledGhaJobTemplate", scaledGhaJobTemplate)
+ // testActivation(t, kc, client)
+ testJobScaleOut(t, kc, client, ghaWorkflowID)
+ testJobScaleIn(t, kc)
+
// test scaling Scaled Job
KubectlApplyWithTemplate(t, data, "scaledJobTemplate", scaledJobTemplate)
// testActivation(t, kc, client)
- testJobScaleOut(t, kc, client)
+ testJobScaleOut(t, kc, client, workflowID)
testJobScaleIn(t, kc)
// test scaling Scaled Object
@@ -294,12 +386,18 @@ func getTemplateData() (templateData, []Template) {
Owner: owner,
Repos: repos,
Labels: "e2etester",
+ ApplicationID: appID,
+ InstallationID: instID,
+ ApplicationKey: appKey,
}, []Template{
{Name: "secretTemplate", Config: secretTemplate},
{Name: "authTemplate", Config: triggerAuthTemplate},
+ {Name: "secretGhaTemplate", Config: secretGhaTemplate},
+ {Name: "authGhaTemplate", Config: triggerGhaAuthTemplate},
{Name: "deploymentTemplate", Config: deploymentTemplate},
{Name: "scaledObjectTemplate", Config: scaledObjectTemplate},
{Name: "scaledJobTemplate", Config: scaledJobTemplate},
+ {Name: "scaledGhaJobTemplate", Config: scaledGhaJobTemplate},
}
}
@@ -323,9 +421,9 @@ func testSOScaleIn(t *testing.T, kc *kubernetes.Clientset) {
"pod count should be 0 after 1 minute")
}
-func testJobScaleOut(t *testing.T, kc *kubernetes.Clientset, ghClient *github.Client) {
+func testJobScaleOut(t *testing.T, kc *kubernetes.Clientset, ghClient *github.Client, wfID string) {
t.Log("--- testing scale out ---")
- queueRun(t, ghClient, workflowID)
+ queueRun(t, ghClient, wfID)
assert.True(t, WaitForJobCount(t, kc, testNamespace, 1, 60, 1), "replica count should be 1 after 1 minute")
}
diff --git a/tests/scalers/postgresql/helper/postgresql_helper.go b/tests/scalers/postgresql/helper/postgresql_helper.go
new file mode 100644
index 00000000000..acfd0a49f51
--- /dev/null
+++ b/tests/scalers/postgresql/helper/postgresql_helper.go
@@ -0,0 +1,219 @@
+//go:build e2e
+// +build e2e
+
+package helper
+
+import (
+ "fmt"
+ "strings"
+)
+
+const (
+ PostgresqlImage = "postgres:10.5"
+)
+
+const (
+ DeploymentTemplate = `apiVersion: apps/v1
+kind: Deployment
+metadata:
+ labels:
+ app: postgresql-update-worker
+ name: {{.DeploymentName}}
+ namespace: {{.TestNamespace}}
+spec:
+ replicas: 0
+ selector:
+ matchLabels:
+ app: postgresql-update-worker
+ template:
+ metadata:
+ labels:
+ app: postgresql-update-worker
+ spec:
+ containers:
+ - image: ghcr.io/kedacore/tests-postgresql
+ imagePullPolicy: Always
+ name: postgresql-processor-test
+ command:
+ - /app
+ - update
+ env:
+ - name: TASK_INSTANCES_COUNT
+ value: "6000"
+ - name: CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: {{.SecretName}}
+ key: postgresql_conn_str
+`
+ ScaledObjectTemplate = `apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+ name: {{.ScaledObjectName}}
+ namespace: {{.TestNamespace}}
+spec:
+ scaleTargetRef:
+ name: {{.DeploymentName}}
+ pollingInterval: 5
+ cooldownPeriod: 10
+ minReplicaCount: {{.MinReplicaCount}}
+ maxReplicaCount: {{.MaxReplicaCount}}
+ triggers:
+ - type: postgresql
+ metadata:
+ targetQueryValue: "4"
+ activationTargetQueryValue: "5"
+ query: "SELECT CEIL(COUNT(*) / 5) FROM task_instance WHERE state='running' OR state='queued'"
+ authenticationRef:
+ name: {{.TriggerAuthenticationName}}
+`
+ LowLevelRecordsJobTemplate = `apiVersion: batch/v1
+kind: Job
+metadata:
+ labels:
+ app: postgresql-insert-low-level-job
+ name: postgresql-insert-low-level-job
+ namespace: {{.TestNamespace}}
+spec:
+ template:
+ metadata:
+ labels:
+ app: postgresql-insert-low-level-job
+ spec:
+ containers:
+ - image: ghcr.io/kedacore/tests-postgresql
+ imagePullPolicy: Always
+ name: postgresql-processor-test
+ command:
+ - /app
+ - insert
+ env:
+ - name: TASK_INSTANCES_COUNT
+ value: "20"
+ - name: CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: {{.SecretName}}
+ key: postgresql_conn_str
+ restartPolicy: Never
+ backoffLimit: 4
+`
+ InsertRecordsJobTemplate = `apiVersion: batch/v1
+kind: Job
+metadata:
+ labels:
+ app: postgresql-insert-job
+ name: postgresql-insert-job
+ namespace: {{.TestNamespace}}
+spec:
+ template:
+ metadata:
+ labels:
+ app: postgresql-insert-job
+ spec:
+ containers:
+ - image: ghcr.io/kedacore/tests-postgresql
+ imagePullPolicy: Always
+ name: postgresql-processor-test
+ command:
+ - /app
+ - insert
+ env:
+ - name: TASK_INSTANCES_COUNT
+ value: "10000"
+ - name: CONNECTION_STRING
+ valueFrom:
+ secretKeyRef:
+ name: {{.SecretName}}
+ key: postgresql_conn_str
+ restartPolicy: Never
+ backoffLimit: 4
+`
+ TriggerAuthenticationTemplate = `apiVersion: keda.sh/v1alpha1
+kind: TriggerAuthentication
+metadata:
+ name: {{.TriggerAuthenticationName}}
+ namespace: {{.TestNamespace}}
+spec:
+ secretTargetRef:
+ - parameter: connection
+ name: {{.SecretName}}
+ key: {{.SecretKey}}
+`
+ PostgreSQLStatefulSetTemplate = `apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+ labels:
+ app: {{.PostgreSQLStatefulSetName}}
+ name: {{.PostgreSQLStatefulSetName}}
+ namespace: {{.TestNamespace}}
+spec:
+ replicas: 1
+ serviceName: {{.PostgreSQLStatefulSetName}}
+ selector:
+ matchLabels:
+ app: {{.PostgreSQLStatefulSetName}}
+ template:
+ metadata:
+ labels:
+ app: {{.PostgreSQLStatefulSetName}}
+ spec:
+ containers:
+ - name: postgresql
+ image: {{.PostgreSQLImage}}
+ env:
+ - name: POSTGRES_USER
+ value: {{.PostgreSQLUsername}}
+ - name: POSTGRES_PASSWORD
+ value: {{.PostgreSQLPassword}}
+ - name: POSTGRES_DB
+ value: {{.PostgreSQLDatabase}}
+ ports:
+ - name: postgresql
+ protocol: TCP
+ containerPort: 5432
+ readinessProbe:
+ tcpSocket:
+ port: 5432
+ initialDelaySeconds: 5
+ timeoutSeconds: 5
+ livenessProbe:
+ tcpSocket:
+ port: 5432
+ initialDelaySeconds: 5
+ timeoutSeconds: 5
+ volumeMounts:
+ - name: init-scripts
+ mountPath: /docker-entrypoint-initdb.d
+ volumes:
+ - name: init-scripts
+ configMap:
+ name: master-slave-config
+ optional: true
+`
+ PostgreSQLServiceTemplate = `apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: {{.PostgreSQLStatefulSetName}}
+ name: {{.PostgreSQLStatefulSetName}}
+ namespace: {{.TestNamespace}}
+spec:
+ ports:
+ - port: 5432
+ protocol: TCP
+ targetPort: 5432
+ selector:
+ app: {{.PostgreSQLStatefulSetName}}
+ type: ClusterIP
+`
+)
+
+func GetConnectionString(username string, password string, svcNames []string, namespace string, database string) string {
+ svcFQDNs := make([]string, 0, len(svcNames))
+ for _, svcName := range svcNames {
+ svcFQDNs = append(svcFQDNs, fmt.Sprintf("%s.%s.svc.cluster.local", svcName, namespace))
+ }
+ fqdns := strings.Join(svcFQDNs, ",")
+ return fmt.Sprintf("postgresql://%s:%s@%s:5432/%s?sslmode=disable", username, password, fqdns, database)
+}
diff --git a/tests/scalers/postgresql/postgresql_high_available/postgresql_ha_test.go b/tests/scalers/postgresql/postgresql_high_available/postgresql_ha_test.go
new file mode 100644
index 00000000000..543336350ef
--- /dev/null
+++ b/tests/scalers/postgresql/postgresql_high_available/postgresql_ha_test.go
@@ -0,0 +1,220 @@
+//go:build e2e
+// +build e2e
+
+package postgresql_standalone_test
+
+import (
+ "encoding/base64"
+ "fmt"
+ "strings"
+ "testing"
+
+ "github.com/joho/godotenv"
+ "github.com/stretchr/testify/assert"
+ "k8s.io/client-go/kubernetes"
+
+ . "github.com/kedacore/keda/v2/tests/helper"
+ pg "github.com/kedacore/keda/v2/tests/scalers/postgresql/helper"
+)
+
+// Load environment variables from .env file
+var _ = godotenv.Load("../../.env")
+
+const (
+ testName = "postgresql-ha-test"
+)
+
+var (
+ testNamespace = fmt.Sprintf("%s-ns", testName)
+ deploymentName = fmt.Sprintf("%s-deployment", testName)
+ scaledObjectName = fmt.Sprintf("%s-so", testName)
+ triggerAuthenticationName = fmt.Sprintf("%s-ta", testName)
+ secretName = fmt.Sprintf("%s-secret", testName)
+ secretKey = "postgresql_multihost_conn_str"
+ postgreSQLImage = pg.PostgresqlImage
+ postgreSQLStatefulSetName = "postgresql-master"
+ postgreSQLReplicaStatefulSetName = "postgresql-replica"
+ postgresqlMasterPodName = fmt.Sprintf("%s-0", postgreSQLStatefulSetName)
+ postgresqlReplicaPodName = fmt.Sprintf("%s-0", postgreSQLReplicaStatefulSetName)
+ postgreSQLUsername = "test-user"
+ postgreSQLPassword = "test-password"
+ postgreSQLDatabase = "test_db"
+ postgreSQLConnectionString = pg.GetConnectionString(postgreSQLUsername, postgreSQLPassword,
+ []string{postgreSQLStatefulSetName}, testNamespace, postgreSQLDatabase)
+ postgreSQLMultihostConnectionString = pg.GetConnectionString(postgreSQLUsername, postgreSQLPassword,
+ []string{postgreSQLStatefulSetName, postgreSQLReplicaStatefulSetName}, testNamespace, postgreSQLDatabase)
+ minReplicaCount = 0
+ maxReplicaCount = 2
+)
+
+type templateData struct {
+ TestNamespace string
+ DeploymentName string
+ ScaledObjectName string
+ TriggerAuthenticationName string
+ SecretName string
+ SecretKey string
+ PostgreSQLImage string
+ PostgreSQLStatefulSetName string
+ PostgreSQLReplicaStatefulSetName string
+ PostgreSQLConnectionStringBase64 string
+ PostgreSQLMultihostConnectionStringBase64 string
+ PostgreSQLUsername string
+ PostgreSQLPassword string
+ PostgreSQLDatabase string
+ MinReplicaCount int
+ MaxReplicaCount int
+}
+
+const (
+ postgresqlInitScriptsConfigMapTemplate = `apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: master-slave-config
+ namespace: {{.TestNamespace}}
+data:
+ master-slave-config.sh: |-
+ HOST=$(hostname -s)
+ HOST_TEMPLATE=${HOST%-*}
+ case $HOST_TEMPLATE in
+ *master*)
+ echo "host replication all all md5" >> /var/lib/postgresql/data/pg_hba.conf
+ echo "archive_mode = on" >> /etc/postgresql/postgresql.conf
+ echo "archive_mode = on" >> /etc/postgresql/postgresql.conf
+ echo "archive_command = '/bin/true'" >> /etc/postgresql/postgresql.conf
+ echo "archive_timeout = 0" >> /etc/postgresql/postgresql.conf
+ echo "max_wal_senders = 8" >> /etc/postgresql/postgresql.conf
+ echo "wal_keep_segments = 32" >> /etc/postgresql/postgresql.conf
+ echo "wal_level = hot_standby" >> /etc/postgresql/postgresql.conf
+ ;;
+ *replica*)
+ # stop initial server to copy data
+ pg_ctl -D /var/lib/postgresql/data/ -m fast -w stop
+ rm -rf /var/lib/postgresql/data/*
+ # add service name for DNS resolution
+ PGPASSWORD=postgresql-ha pg_basebackup -h {{.PostgreSQLStatefulSetName}} -w -U replicator -p 5432 -D /var/lib/postgresql/data -Fp -Xs -P -R
+ # start server to keep container's screep happy
+ pg_ctl -D /var/lib/postgresql/data/ -w start
+ ;;
+ esac
+
+
+ create-replication-role.sql: |-
+ CREATE USER replicator WITH REPLICATION ENCRYPTED PASSWORD 'postgresql-ha';
+`
+ secretTemplate = `apiVersion: v1
+kind: Secret
+metadata:
+ name: {{.SecretName}}
+ namespace: {{.TestNamespace}}
+type: Opaque
+data:
+ postgresql_conn_str: {{.PostgreSQLConnectionStringBase64}}
+ postgresql_multihost_conn_str: {{.PostgreSQLMultihostConnectionStringBase64}}
+`
+)
+
+func TestPostreSQLScaler(t *testing.T) {
+ // Create kubernetes resources for PostgreSQL server
+ kc := GetKubernetesClient(t)
+ data, postgreSQLtemplates := getPostgreSQLTemplateData()
+ CreateKubernetesResources(t, kc, testNamespace, data, postgreSQLtemplates)
+
+ assert.True(t, WaitForStatefulsetReplicaReadyCount(t, kc, postgreSQLStatefulSetName, testNamespace, 1, 60, 3),
+ "replica count should be %d after 3 minutes", 1)
+ assert.True(t, WaitForStatefulsetReplicaReadyCount(t, kc, postgreSQLReplicaStatefulSetName, testNamespace, 1, 60, 3),
+ "replica count should be %d after 3 minutes", 1)
+
+ createTableSQL := "CREATE TABLE task_instance (id serial PRIMARY KEY,state VARCHAR(10));"
+ ok, out, errOut, err := WaitForSuccessfulExecCommandOnSpecificPod(t, postgresqlMasterPodName, testNamespace,
+ fmt.Sprintf("psql -U %s -d %s -c \"%s\"", postgreSQLUsername, postgreSQLDatabase, createTableSQL), 60, 3)
+ assert.True(t, ok, "executing a command on PostreSQL Master Pod should work; Output: %s, ErrorOutput: %s, Error: %s", out, errOut, err)
+
+ checkTableExists := "SELECT * from task_instance;"
+ ok, out, errOut, err = WaitForSuccessfulExecCommandOnSpecificPod(t, postgresqlReplicaPodName, testNamespace,
+ fmt.Sprintf("psql -U %s -d %s -c \"%s\"", postgreSQLUsername, postgreSQLDatabase, checkTableExists), 60, 3)
+
+ assert.True(t, ok, "executing a command on PostreSQL Replica Pod should work; Output: %s, ErrorOutput: %s, Error: %s", out, errOut, err)
+
+ // Create kubernetes resources for testing
+ data, templates := getTemplateData()
+ KubectlApplyMultipleWithTemplate(t, data, templates)
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicaCount)
+
+ testActivation(t, kc, data)
+ testScaleOut(t, kc, data)
+ testScaleIn(t, kc)
+
+ // cleanup
+ KubectlDeleteMultipleWithTemplate(t, data, templates)
+ DeleteKubernetesResources(t, testNamespace, data, postgreSQLtemplates)
+}
+
+func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) {
+ t.Log("--- testing activation ---")
+ KubectlApplyWithTemplate(t, data, "lowLevelRecordsJobTemplate", pg.LowLevelRecordsJobTemplate)
+
+ AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60)
+}
+
+func testScaleOut(t *testing.T, kc *kubernetes.Clientset, data templateData) {
+ t.Log("--- testing scale out ---")
+ KubectlApplyWithTemplate(t, data, "insertRecordsJobTemplate", pg.InsertRecordsJobTemplate)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3),
+ "replica count should be %d after 3 minutes", maxReplicaCount)
+}
+
+func testScaleIn(t *testing.T, kc *kubernetes.Clientset) {
+ t.Log("--- testing scale in ---")
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicaCount)
+}
+
+var data = templateData{
+ TestNamespace: testNamespace,
+ PostgreSQLStatefulSetName: postgreSQLStatefulSetName,
+ PostgreSQLReplicaStatefulSetName: postgreSQLReplicaStatefulSetName,
+ DeploymentName: deploymentName,
+ ScaledObjectName: scaledObjectName,
+ MinReplicaCount: minReplicaCount,
+ MaxReplicaCount: maxReplicaCount,
+ TriggerAuthenticationName: triggerAuthenticationName,
+ SecretName: secretName,
+ SecretKey: secretKey,
+ PostgreSQLImage: postgreSQLImage,
+ PostgreSQLUsername: postgreSQLUsername,
+ PostgreSQLPassword: postgreSQLPassword,
+ PostgreSQLDatabase: postgreSQLDatabase,
+ PostgreSQLConnectionStringBase64: base64.StdEncoding.EncodeToString([]byte(postgreSQLConnectionString)),
+ PostgreSQLMultihostConnectionStringBase64: base64.StdEncoding.EncodeToString([]byte(postgreSQLMultihostConnectionString)),
+}
+
+func getPostgreSQLTemplateData() (templateData, []Template) {
+ return data, []Template{
+ {Name: "postgresqlInitScriptsConfigMapTemplate", Config: postgresqlInitScriptsConfigMapTemplate},
+ {Name: "postgresqlMasterStatefulSetTemplate", Config: pg.PostgreSQLStatefulSetTemplate},
+ {Name: "postgresqlReplicaStatefulSetTemplate", Config: postgreSQLReplicaStatefulSetTemplate()},
+ {Name: "postgreSQLMasterServiceTemplate", Config: pg.PostgreSQLServiceTemplate},
+ {Name: "postgreSQLReplicaServiceTemplate", Config: postgreSQLReplicaServiceTemplate()},
+ }
+}
+
+func postgreSQLReplicaStatefulSetTemplate() string {
+ return strings.ReplaceAll(pg.PostgreSQLStatefulSetTemplate, ".PostgreSQLStatefulSetName", ".PostgreSQLReplicaStatefulSetName")
+}
+
+func postgreSQLReplicaServiceTemplate() string {
+ return strings.ReplaceAll(pg.PostgreSQLServiceTemplate, ".PostgreSQLStatefulSetName", ".PostgreSQLReplicaStatefulSetName")
+}
+
+func getTemplateData() (templateData, []Template) {
+ return data, []Template{
+ {Name: "secretTemplate", Config: secretTemplate},
+ {Name: "deploymentTemplate", Config: pg.DeploymentTemplate},
+ {Name: "triggerAuthenticationTemplate", Config: pg.TriggerAuthenticationTemplate},
+ {Name: "scaledObjectTemplate", Config: pg.ScaledObjectTemplate},
+ }
+}
diff --git a/tests/scalers/postgresql/postgresql_standalone/postgresql_test.go b/tests/scalers/postgresql/postgresql_standalone/postgresql_test.go
new file mode 100644
index 00000000000..9b17a405aec
--- /dev/null
+++ b/tests/scalers/postgresql/postgresql_standalone/postgresql_test.go
@@ -0,0 +1,154 @@
+//go:build e2e
+// +build e2e
+
+package postgresql_standalone_test
+
+import (
+ "encoding/base64"
+ "fmt"
+ "testing"
+
+ "github.com/joho/godotenv"
+ "github.com/stretchr/testify/assert"
+ "k8s.io/client-go/kubernetes"
+
+ . "github.com/kedacore/keda/v2/tests/helper"
+ pg "github.com/kedacore/keda/v2/tests/scalers/postgresql/helper"
+)
+
+// Load environment variables from .env file
+var _ = godotenv.Load("../../.env")
+
+const (
+ testName = "postgresql-test"
+)
+
+var (
+ testNamespace = fmt.Sprintf("%s-ns", testName)
+ deploymentName = fmt.Sprintf("%s-deployment", testName)
+ scaledObjectName = fmt.Sprintf("%s-so", testName)
+ triggerAuthenticationName = fmt.Sprintf("%s-ta", testName)
+ secretName = fmt.Sprintf("%s-secret", testName)
+ secretKey = "postgresql_conn_str"
+ postgreSQLStatefulSetName = "postgresql"
+ postgresqlPodName = fmt.Sprintf("%s-0", postgreSQLStatefulSetName)
+ postgreSQLUsername = "test-user"
+ postgreSQLPassword = "test-password"
+ postgreSQLDatabase = "test_db"
+ postgreSQLConnectionString = pg.GetConnectionString(postgreSQLUsername, postgreSQLPassword, []string{postgreSQLStatefulSetName}, testNamespace, postgreSQLDatabase)
+ minReplicaCount = 0
+ maxReplicaCount = 2
+)
+
+type templateData struct {
+ TestNamespace string
+ DeploymentName string
+ ScaledObjectName string
+ TriggerAuthenticationName string
+ SecretName string
+ SecretKey string
+ PostgreSQLImage string
+ PostgreSQLStatefulSetName string
+ PostgreSQLConnectionStringBase64 string
+ PostgreSQLUsername string
+ PostgreSQLPassword string
+ PostgreSQLDatabase string
+ MinReplicaCount int
+ MaxReplicaCount int
+}
+
+const (
+ secretTemplate = `apiVersion: v1
+kind: Secret
+metadata:
+ name: {{.SecretName}}
+ namespace: {{.TestNamespace}}
+type: Opaque
+data:
+ postgresql_conn_str: {{.PostgreSQLConnectionStringBase64}}
+`
+)
+
+func TestPostreSQLScaler(t *testing.T) {
+ // Create kubernetes resources for PostgreSQL server
+ kc := GetKubernetesClient(t)
+ data, postgreSQLtemplates := getPostgreSQLTemplateData()
+ CreateKubernetesResources(t, kc, testNamespace, data, postgreSQLtemplates)
+
+ assert.True(t, WaitForStatefulsetReplicaReadyCount(t, kc, postgreSQLStatefulSetName, testNamespace, 1, 60, 3),
+ "replica count should be %d after 3 minutes", 1)
+
+ createTableSQL := "CREATE TABLE task_instance (id serial PRIMARY KEY,state VARCHAR(10));"
+ ok, out, errOut, err := WaitForSuccessfulExecCommandOnSpecificPod(t, postgresqlPodName, testNamespace,
+ fmt.Sprintf("psql -U %s -d %s -c \"%s\"", postgreSQLUsername, postgreSQLDatabase, createTableSQL), 60, 3)
+ assert.True(t, ok, "executing a command on PostreSQL Pod should work; Output: %s, ErrorOutput: %s, Error: %s", out, errOut, err)
+
+ // Create kubernetes resources for testing
+ data, templates := getTemplateData()
+ KubectlApplyMultipleWithTemplate(t, data, templates)
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicaCount)
+
+ testActivation(t, kc, data)
+ testScaleOut(t, kc, data)
+ testScaleIn(t, kc)
+
+ // cleanup
+ KubectlDeleteMultipleWithTemplate(t, data, templates)
+ DeleteKubernetesResources(t, testNamespace, data, postgreSQLtemplates)
+}
+
+func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) {
+ t.Log("--- testing activation ---")
+ KubectlApplyWithTemplate(t, data, "lowLevelRecordsJobTemplate", pg.LowLevelRecordsJobTemplate)
+
+ AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60)
+}
+
+func testScaleOut(t *testing.T, kc *kubernetes.Clientset, data templateData) {
+ t.Log("--- testing scale out ---")
+ KubectlApplyWithTemplate(t, data, "insertRecordsJobTemplate", pg.InsertRecordsJobTemplate)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3),
+ "replica count should be %d after 3 minutes", maxReplicaCount)
+}
+
+func testScaleIn(t *testing.T, kc *kubernetes.Clientset) {
+ t.Log("--- testing scale in ---")
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicaCount)
+}
+
+var data = templateData{
+ TestNamespace: testNamespace,
+ PostgreSQLStatefulSetName: postgreSQLStatefulSetName,
+ DeploymentName: deploymentName,
+ ScaledObjectName: scaledObjectName,
+ MinReplicaCount: minReplicaCount,
+ MaxReplicaCount: maxReplicaCount,
+ TriggerAuthenticationName: triggerAuthenticationName,
+ SecretName: secretName,
+ SecretKey: secretKey,
+ PostgreSQLImage: pg.PostgresqlImage,
+ PostgreSQLUsername: postgreSQLUsername,
+ PostgreSQLPassword: postgreSQLPassword,
+ PostgreSQLDatabase: postgreSQLDatabase,
+ PostgreSQLConnectionStringBase64: base64.StdEncoding.EncodeToString([]byte(postgreSQLConnectionString)),
+}
+
+func getPostgreSQLTemplateData() (templateData, []Template) {
+ return data, []Template{
+ {Name: "postgreSQLStatefulSetTemplate", Config: pg.PostgreSQLStatefulSetTemplate},
+ {Name: "postgreSQLServiceTemplate", Config: pg.PostgreSQLServiceTemplate},
+ }
+}
+
+func getTemplateData() (templateData, []Template) {
+ return data, []Template{
+ {Name: "secretTemplate", Config: secretTemplate},
+ {Name: "deploymentTemplate", Config: pg.DeploymentTemplate},
+ {Name: "triggerAuthenticationTemplate", Config: pg.TriggerAuthenticationTemplate},
+ {Name: "scaledObjectTemplate", Config: pg.ScaledObjectTemplate},
+ }
+}
diff --git a/tests/scalers/postgresql/postgresql_test.go b/tests/scalers/postgresql/postgresql_test.go
deleted file mode 100644
index 57e9d63576f..00000000000
--- a/tests/scalers/postgresql/postgresql_test.go
+++ /dev/null
@@ -1,332 +0,0 @@
-//go:build e2e
-// +build e2e
-
-package postgresql_test
-
-import (
- "encoding/base64"
- "fmt"
- "testing"
-
- "github.com/joho/godotenv"
- "github.com/stretchr/testify/assert"
- "k8s.io/client-go/kubernetes"
-
- . "github.com/kedacore/keda/v2/tests/helper"
-)
-
-// Load environment variables from .env file
-var _ = godotenv.Load("../../.env")
-
-const (
- testName = "postgresql-test"
-)
-
-var (
- testNamespace = fmt.Sprintf("%s-ns", testName)
- deploymentName = fmt.Sprintf("%s-deployment", testName)
- scaledObjectName = fmt.Sprintf("%s-so", testName)
- triggerAuthenticationName = fmt.Sprintf("%s-ta", testName)
- secretName = fmt.Sprintf("%s-secret", testName)
- postgreSQLStatefulSetName = "postgresql"
- postgresqlPodName = fmt.Sprintf("%s-0", postgreSQLStatefulSetName)
- postgreSQLUsername = "test-user"
- postgreSQLPassword = "test-password"
- postgreSQLDatabase = "test_db"
- postgreSQLConnectionString = fmt.Sprintf("postgresql://%s:%s@postgresql.%s.svc.cluster.local:5432/%s?sslmode=disable",
- postgreSQLUsername, postgreSQLPassword, testNamespace, postgreSQLDatabase)
- minReplicaCount = 0
- maxReplicaCount = 2
-)
-
-type templateData struct {
- TestNamespace string
- DeploymentName string
- ScaledObjectName string
- TriggerAuthenticationName string
- SecretName string
- PostgreSQLStatefulSetName string
- PostgreSQLConnectionStringBase64 string
- PostgreSQLUsername string
- PostgreSQLPassword string
- PostgreSQLDatabase string
- MinReplicaCount int
- MaxReplicaCount int
-}
-
-const (
- deploymentTemplate = `apiVersion: apps/v1
-kind: Deployment
-metadata:
- labels:
- app: postgresql-update-worker
- name: {{.DeploymentName}}
- namespace: {{.TestNamespace}}
-spec:
- replicas: 0
- selector:
- matchLabels:
- app: postgresql-update-worker
- template:
- metadata:
- labels:
- app: postgresql-update-worker
- spec:
- containers:
- - image: ghcr.io/kedacore/tests-postgresql
- imagePullPolicy: Always
- name: postgresql-processor-test
- command:
- - /app
- - update
- env:
- - name: TASK_INSTANCES_COUNT
- value: "6000"
- - name: CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: {{.SecretName}}
- key: postgresql_conn_str
-`
-
- secretTemplate = `apiVersion: v1
-kind: Secret
-metadata:
- name: {{.SecretName}}
- namespace: {{.TestNamespace}}
-type: Opaque
-data:
- postgresql_conn_str: {{.PostgreSQLConnectionStringBase64}}
-`
-
- triggerAuthenticationTemplate = `apiVersion: keda.sh/v1alpha1
-kind: TriggerAuthentication
-metadata:
- name: {{.TriggerAuthenticationName}}
- namespace: {{.TestNamespace}}
-spec:
- secretTargetRef:
- - parameter: connection
- name: {{.SecretName}}
- key: postgresql_conn_str
-`
-
- scaledObjectTemplate = `apiVersion: keda.sh/v1alpha1
-kind: ScaledObject
-metadata:
- name: {{.ScaledObjectName}}
- namespace: {{.TestNamespace}}
-spec:
- scaleTargetRef:
- name: {{.DeploymentName}}
- pollingInterval: 5
- cooldownPeriod: 10
- minReplicaCount: {{.MinReplicaCount}}
- maxReplicaCount: {{.MaxReplicaCount}}
- triggers:
- - type: postgresql
- metadata:
- targetQueryValue: "4"
- activationTargetQueryValue: "5"
- query: "SELECT CEIL(COUNT(*) / 5) FROM task_instance WHERE state='running' OR state='queued'"
- authenticationRef:
- name: {{.TriggerAuthenticationName}}
-`
-
- postgreSQLStatefulSetTemplate = `apiVersion: apps/v1
-kind: StatefulSet
-metadata:
- labels:
- app: {{.PostgreSQLStatefulSetName}}
- name: {{.PostgreSQLStatefulSetName}}
- namespace: {{.TestNamespace}}
-spec:
- replicas: 1
- serviceName: {{.PostgreSQLStatefulSetName}}
- selector:
- matchLabels:
- app: {{.PostgreSQLStatefulSetName}}
- template:
- metadata:
- labels:
- app: {{.PostgreSQLStatefulSetName}}
- spec:
- containers:
- - image: postgres:10.5
- name: postgresql
- env:
- - name: POSTGRES_USER
- value: {{.PostgreSQLUsername}}
- - name: POSTGRES_PASSWORD
- value: {{.PostgreSQLPassword}}
- - name: POSTGRES_DB
- value: {{.PostgreSQLDatabase}}
- ports:
- - name: postgresql
- protocol: TCP
- containerPort: 5432
-`
-
- postgreSQLServiceTemplate = `apiVersion: v1
-kind: Service
-metadata:
- labels:
- app: {{.PostgreSQLStatefulSetName}}
- name: {{.PostgreSQLStatefulSetName}}
- namespace: {{.TestNamespace}}
-spec:
- ports:
- - port: 5432
- protocol: TCP
- targetPort: 5432
- selector:
- app: {{.PostgreSQLStatefulSetName}}
- type: ClusterIP
-`
-
- lowLevelRecordsJobTemplate = `apiVersion: batch/v1
-kind: Job
-metadata:
- labels:
- app: postgresql-insert-low-level-job
- name: postgresql-insert-low-level-job
- namespace: {{.TestNamespace}}
-spec:
- template:
- metadata:
- labels:
- app: postgresql-insert-low-level-job
- spec:
- containers:
- - image: ghcr.io/kedacore/tests-postgresql
- imagePullPolicy: Always
- name: postgresql-processor-test
- command:
- - /app
- - insert
- env:
- - name: TASK_INSTANCES_COUNT
- value: "20"
- - name: CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: {{.SecretName}}
- key: postgresql_conn_str
- restartPolicy: Never
- backoffLimit: 4
-`
-
- insertRecordsJobTemplate = `apiVersion: batch/v1
-kind: Job
-metadata:
- labels:
- app: postgresql-insert-job
- name: postgresql-insert-job
- namespace: {{.TestNamespace}}
-spec:
- template:
- metadata:
- labels:
- app: postgresql-insert-job
- spec:
- containers:
- - image: ghcr.io/kedacore/tests-postgresql
- imagePullPolicy: Always
- name: postgresql-processor-test
- command:
- - /app
- - insert
- env:
- - name: TASK_INSTANCES_COUNT
- value: "10000"
- - name: CONNECTION_STRING
- valueFrom:
- secretKeyRef:
- name: {{.SecretName}}
- key: postgresql_conn_str
- restartPolicy: Never
- backoffLimit: 4
-`
-)
-
-func TestPostreSQLScaler(t *testing.T) {
- // Create kubernetes resources for PostgreSQL server
- kc := GetKubernetesClient(t)
- data, postgreSQLtemplates := getPostgreSQLTemplateData()
- CreateKubernetesResources(t, kc, testNamespace, data, postgreSQLtemplates)
-
- assert.True(t, WaitForStatefulsetReplicaReadyCount(t, kc, postgreSQLStatefulSetName, testNamespace, 1, 60, 3),
- "replica count should be %d after 3 minutes", 1)
-
- createTableSQL := "CREATE TABLE task_instance (id serial PRIMARY KEY,state VARCHAR(10));"
- ok, out, errOut, err := WaitForSuccessfulExecCommandOnSpecificPod(t, postgresqlPodName, testNamespace,
- fmt.Sprintf("psql -U %s -d %s -c \"%s\"", postgreSQLUsername, postgreSQLDatabase, createTableSQL), 60, 3)
- assert.True(t, ok, "executing a command on PostreSQL Pod should work; Output: %s, ErrorOutput: %s, Error: %s", out, errOut, err)
-
- // Create kubernetes resources for testing
- data, templates := getTemplateData()
- KubectlApplyMultipleWithTemplate(t, data, templates)
- assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3),
- "replica count should be %d after 3 minutes", minReplicaCount)
-
- testActivation(t, kc, data)
- testScaleOut(t, kc, data)
- testScaleIn(t, kc)
-
- // cleanup
- KubectlDeleteMultipleWithTemplate(t, data, templates)
- DeleteKubernetesResources(t, testNamespace, data, postgreSQLtemplates)
-}
-
-func testActivation(t *testing.T, kc *kubernetes.Clientset, data templateData) {
- t.Log("--- testing activation ---")
- KubectlApplyWithTemplate(t, data, "lowLevelRecordsJobTemplate", lowLevelRecordsJobTemplate)
-
- AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 60)
-}
-
-func testScaleOut(t *testing.T, kc *kubernetes.Clientset, data templateData) {
- t.Log("--- testing scale out ---")
- KubectlApplyWithTemplate(t, data, "insertRecordsJobTemplate", insertRecordsJobTemplate)
-
- assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3),
- "replica count should be %d after 3 minutes", maxReplicaCount)
-}
-
-func testScaleIn(t *testing.T, kc *kubernetes.Clientset) {
- t.Log("--- testing scale in ---")
-
- assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3),
- "replica count should be %d after 3 minutes", minReplicaCount)
-}
-
-var data = templateData{
- TestNamespace: testNamespace,
- PostgreSQLStatefulSetName: postgreSQLStatefulSetName,
- DeploymentName: deploymentName,
- ScaledObjectName: scaledObjectName,
- MinReplicaCount: minReplicaCount,
- MaxReplicaCount: maxReplicaCount,
- TriggerAuthenticationName: triggerAuthenticationName,
- SecretName: secretName,
- PostgreSQLUsername: postgreSQLUsername,
- PostgreSQLPassword: postgreSQLPassword,
- PostgreSQLDatabase: postgreSQLDatabase,
- PostgreSQLConnectionStringBase64: base64.StdEncoding.EncodeToString([]byte(postgreSQLConnectionString)),
-}
-
-func getPostgreSQLTemplateData() (templateData, []Template) {
- return data, []Template{
- {Name: "postgreSQLStatefulSetTemplate", Config: postgreSQLStatefulSetTemplate},
- {Name: "postgreSQLServiceTemplate", Config: postgreSQLServiceTemplate},
- }
-}
-
-func getTemplateData() (templateData, []Template) {
- return data, []Template{
- {Name: "secretTemplate", Config: secretTemplate},
- {Name: "deploymentTemplate", Config: deploymentTemplate},
- {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate},
- {Name: "scaledObjectTemplate", Config: scaledObjectTemplate},
- }
-}
diff --git a/tests/scalers/rabbitmq/rabbitmq_helper.go b/tests/scalers/rabbitmq/rabbitmq_helper.go
index a3ad2e2d6e2..b44c4ce135b 100644
--- a/tests/scalers/rabbitmq/rabbitmq_helper.go
+++ b/tests/scalers/rabbitmq/rabbitmq_helper.go
@@ -60,6 +60,15 @@ data:
default_vhost = {{.VHostName}}
management.tcp.port = 15672
management.tcp.ip = 0.0.0.0
+ {{if .EnableOAuth}}
+ auth_backends.1 = rabbit_auth_backend_internal
+ auth_backends.2 = rabbit_auth_backend_oauth2
+ auth_backends.3 = rabbit_auth_backend_amqp
+ auth_oauth2.resource_server_id = {{.OAuthClientID}}
+ auth_oauth2.scope_prefix = rabbitmq.
+ auth_oauth2.additional_scopes_key = {{.OAuthScopesKey}}
+ auth_oauth2.jwks_url = {{.OAuthJwksURI}}
+ {{end}}
enabled_plugins: |
[rabbitmq_management].
---
@@ -158,6 +167,28 @@ spec:
`
)
+type RabbitOAuthConfig struct {
+ Enable bool
+ ClientID string
+ ScopesKey string
+ JwksURI string
+}
+
+func WithoutOAuth() RabbitOAuthConfig {
+ return RabbitOAuthConfig{
+ Enable: false,
+ }
+}
+
+func WithAzureADOAuth(tenantID string, clientID string) RabbitOAuthConfig {
+ return RabbitOAuthConfig{
+ Enable: true,
+ ClientID: clientID,
+ ScopesKey: "roles",
+ JwksURI: fmt.Sprintf("https://login.microsoftonline.com/%s/discovery/keys", tenantID),
+ }
+}
+
type templateData struct {
Namespace string
Connection string
@@ -165,26 +196,38 @@ type templateData struct {
HostName, VHostName string
Username, Password string
MessageCount int
+ EnableOAuth bool
+ OAuthClientID string
+ OAuthScopesKey string
+ OAuthJwksURI string
}
-func RMQInstall(t *testing.T, kc *kubernetes.Clientset, namespace, user, password, vhost string) {
+func RMQInstall(t *testing.T, kc *kubernetes.Clientset, namespace, user, password, vhost string, oauth RabbitOAuthConfig) {
helper.CreateNamespace(t, kc, namespace)
data := templateData{
- Namespace: namespace,
- VHostName: vhost,
- Username: user,
- Password: password,
+ Namespace: namespace,
+ VHostName: vhost,
+ Username: user,
+ Password: password,
+ EnableOAuth: oauth.Enable,
+ OAuthClientID: oauth.ClientID,
+ OAuthScopesKey: oauth.ScopesKey,
+ OAuthJwksURI: oauth.JwksURI,
}
helper.KubectlApplyWithTemplate(t, data, "rmqDeploymentTemplate", deploymentTemplate)
}
-func RMQUninstall(t *testing.T, namespace, user, password, vhost string) {
+func RMQUninstall(t *testing.T, namespace, user, password, vhost string, oauth RabbitOAuthConfig) {
data := templateData{
- Namespace: namespace,
- VHostName: vhost,
- Username: user,
- Password: password,
+ Namespace: namespace,
+ VHostName: vhost,
+ Username: user,
+ Password: password,
+ EnableOAuth: oauth.Enable,
+ OAuthClientID: oauth.ClientID,
+ OAuthScopesKey: oauth.ScopesKey,
+ OAuthJwksURI: oauth.JwksURI,
}
helper.KubectlDeleteWithTemplate(t, data, "rmqDeploymentTemplate", deploymentTemplate)
diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_amqp/rabbitmq_queue_amqp_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_amqp/rabbitmq_queue_amqp_test.go
index fd3fc89ffc6..be16d0a480b 100644
--- a/tests/scalers/rabbitmq/rabbitmq_queue_amqp/rabbitmq_queue_amqp_test.go
+++ b/tests/scalers/rabbitmq/rabbitmq_queue_amqp/rabbitmq_queue_amqp_test.go
@@ -17,7 +17,7 @@ import (
)
// Load environment variables from .env file
-var _ = godotenv.Load("../../.env")
+var _ = godotenv.Load("../../../.env")
const (
testName = "rmq-queue-amqp-test"
@@ -79,7 +79,7 @@ func TestScaler(t *testing.T) {
kc := GetKubernetesClient(t)
data, templates := getTemplateData()
- RMQInstall(t, kc, rmqNamespace, user, password, vhost)
+ RMQInstall(t, kc, rmqNamespace, user, password, vhost, WithoutOAuth())
CreateKubernetesResources(t, kc, testNamespace, data, templates)
assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 1),
@@ -92,7 +92,7 @@ func TestScaler(t *testing.T) {
// cleanup
t.Log("--- cleaning up ---")
DeleteKubernetesResources(t, testNamespace, data, templates)
- RMQUninstall(t, rmqNamespace, user, password, vhost)
+ RMQUninstall(t, rmqNamespace, user, password, vhost, WithoutOAuth())
}
func getTemplateData() (templateData, []Template) {
diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_amqp_vhost/rabbitmq_queue_amqp_vhost_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_amqp_vhost/rabbitmq_queue_amqp_vhost_test.go
index 299c9a6a74a..7ae59414a0d 100644
--- a/tests/scalers/rabbitmq/rabbitmq_queue_amqp_vhost/rabbitmq_queue_amqp_vhost_test.go
+++ b/tests/scalers/rabbitmq/rabbitmq_queue_amqp_vhost/rabbitmq_queue_amqp_vhost_test.go
@@ -17,7 +17,7 @@ import (
)
// Load environment variables from .env file
-var _ = godotenv.Load("../../.env")
+var _ = godotenv.Load("../../../.env")
const (
testName = "rmq-queue-amqp-vhost-test"
@@ -79,7 +79,7 @@ func TestScaler(t *testing.T) {
kc := GetKubernetesClient(t)
data, templates := getTemplateData()
- RMQInstall(t, kc, rmqNamespace, user, password, vhost)
+ RMQInstall(t, kc, rmqNamespace, user, password, vhost, WithoutOAuth())
CreateKubernetesResources(t, kc, testNamespace, data, templates)
assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 1),
@@ -92,7 +92,7 @@ func TestScaler(t *testing.T) {
// cleanup
t.Log("--- cleaning up ---")
DeleteKubernetesResources(t, testNamespace, data, templates)
- RMQUninstall(t, rmqNamespace, user, password, vhost)
+ RMQUninstall(t, rmqNamespace, user, password, vhost, WithoutOAuth())
}
func getTemplateData() (templateData, []Template) {
diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_http/rabbitmq_queue_http_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_http/rabbitmq_queue_http_test.go
index 26749ddd9af..d19c5138956 100644
--- a/tests/scalers/rabbitmq/rabbitmq_queue_http/rabbitmq_queue_http_test.go
+++ b/tests/scalers/rabbitmq/rabbitmq_queue_http/rabbitmq_queue_http_test.go
@@ -17,7 +17,7 @@ import (
)
// Load environment variables from .env file
-var _ = godotenv.Load("../../.env")
+var _ = godotenv.Load("../../../.env")
const (
testName = "rmq-queue-http-test"
@@ -80,7 +80,7 @@ func TestScaler(t *testing.T) {
kc := GetKubernetesClient(t)
data, templates := getTemplateData()
- RMQInstall(t, kc, rmqNamespace, user, password, vhost)
+ RMQInstall(t, kc, rmqNamespace, user, password, vhost, WithoutOAuth())
CreateKubernetesResources(t, kc, testNamespace, data, templates)
assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 1),
@@ -91,7 +91,7 @@ func TestScaler(t *testing.T) {
// cleanup
t.Log("--- cleaning up ---")
DeleteKubernetesResources(t, testNamespace, data, templates)
- RMQUninstall(t, rmqNamespace, user, password, vhost)
+ RMQUninstall(t, rmqNamespace, user, password, vhost, WithoutOAuth())
}
func getTemplateData() (templateData, []Template) {
diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_http_aad_wi/rabbitmq_queue_http_aad_wi_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_http_aad_wi/rabbitmq_queue_http_aad_wi_test.go
new file mode 100644
index 00000000000..865ff77b1b2
--- /dev/null
+++ b/tests/scalers/rabbitmq/rabbitmq_queue_http_aad_wi/rabbitmq_queue_http_aad_wi_test.go
@@ -0,0 +1,172 @@
+//go:build e2e
+// +build e2e
+
+package rabbitmq_queue_http_add_wi_test
+
+import (
+ "encoding/base64"
+ "fmt"
+ "os"
+ "testing"
+
+ "github.com/joho/godotenv"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "k8s.io/client-go/kubernetes"
+
+ . "github.com/kedacore/keda/v2/tests/helper"
+ . "github.com/kedacore/keda/v2/tests/scalers/rabbitmq"
+)
+
+// Load environment variables from .env file
+var _ = godotenv.Load("../../../.env")
+
+const (
+ testName = "rmq-queue-http-test-aad-wi"
+)
+
+var (
+ testNamespace = fmt.Sprintf("%s-ns", testName)
+ rmqNamespace = fmt.Sprintf("%s-rmq", testName)
+ deploymentName = fmt.Sprintf("%s-deployment", testName)
+ secretName = fmt.Sprintf("%s-secret", testName)
+ triggerAuthName = fmt.Sprintf("%s-ta", testName)
+ triggerSecretName = fmt.Sprintf("%s-ta-secret", testName)
+ scaledObjectName = fmt.Sprintf("%s-so", testName)
+ queueName = "hello"
+ user = fmt.Sprintf("%s-user", testName)
+ password = fmt.Sprintf("%s-password", testName)
+ vhost = "/"
+ connectionString = fmt.Sprintf("amqp://%s:%s@rabbitmq.%s.svc.cluster.local/", user, password, rmqNamespace)
+ httpConnectionString = fmt.Sprintf("http://%s:%s@rabbitmq.%s.svc.cluster.local/", user, password, rmqNamespace)
+ httpNoAuthConnectionString = fmt.Sprintf("http://rabbitmq.%s.svc.cluster.local/", rmqNamespace)
+ rabbitAppClientID = os.Getenv("TF_AZURE_RABBIT_API_APPLICATION_ID")
+ azureADTenantID = os.Getenv("TF_AZURE_SP_TENANT")
+ messageCount = 100
+)
+
+const (
+ secretTemplate = `
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{.TriggerSecretName}}
+ namespace: {{.TestNamespace}}
+type: Opaque
+data:
+ workloadIdentityResource: {{.Base64RabbitAppClientID}}
+`
+
+ triggerAuthTemplate = `
+apiVersion: keda.sh/v1alpha1
+kind: TriggerAuthentication
+metadata:
+ name: {{.TriggerAuthName}}
+ namespace: {{.TestNamespace}}
+spec:
+ podIdentity:
+ provider: azure-workload
+
+ secretTargetRef:
+ - parameter: workloadIdentityResource
+ name: {{.TriggerSecretName}}
+ key: workloadIdentityResource
+`
+ scaledObjectTemplate = `
+apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+ name: {{.ScaledObjectName}}
+ namespace: {{.TestNamespace}}
+spec:
+ scaleTargetRef:
+ name: {{.DeploymentName}}
+ pollingInterval: 5
+ cooldownPeriod: 10
+ minReplicaCount: 0
+ maxReplicaCount: 4
+ triggers:
+ - type: rabbitmq
+ metadata:
+ queueName: {{.QueueName}}
+ vhostName: {{.VHost}}
+ host: {{.ConnectionNoAuth}}
+ protocol: http
+ mode: QueueLength
+ value: '10'
+ authenticationRef:
+ name: {{.TriggerAuthName}}
+`
+)
+
+type templateData struct {
+ TestNamespace string
+ DeploymentName string
+ TriggerSecretName string
+ TriggerAuthName string
+ ScaledObjectName string
+ SecretName string
+ QueueName string
+ VHost string
+ Connection, Base64Connection string
+ ConnectionNoAuth string
+ RabbitAppClientID, Base64RabbitAppClientID string
+}
+
+func TestScaler(t *testing.T) {
+ // setup
+ t.Log("--- setting up ---")
+ require.NotEmpty(t, rabbitAppClientID, "TF_AZURE_RABBIT_API_APPLICATION_ID env variable is required for rabbitmq workload identity tests")
+ require.NotEmpty(t, azureADTenantID, "TF_AZURE_SP_TENANT env variable is required for rabbitmq workload identity tests")
+
+ // Create kubernetes resources
+ kc := GetKubernetesClient(t)
+ data, templates := getTemplateData()
+
+ RMQInstall(t, kc, rmqNamespace, user, password, vhost, WithAzureADOAuth(azureADTenantID, rabbitAppClientID))
+ CreateKubernetesResources(t, kc, testNamespace, data, templates)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 1),
+ "replica count should be 0 after 1 minute")
+
+ testScaling(t, kc)
+
+ // cleanup
+ t.Log("--- cleaning up ---")
+ DeleteKubernetesResources(t, testNamespace, data, templates)
+ RMQUninstall(t, rmqNamespace, user, password, vhost, WithAzureADOAuth(azureADTenantID, rabbitAppClientID))
+}
+
+func getTemplateData() (templateData, []Template) {
+ return templateData{
+ TestNamespace: testNamespace,
+ DeploymentName: deploymentName,
+ ScaledObjectName: scaledObjectName,
+ SecretName: secretName,
+ VHost: vhost,
+ QueueName: queueName,
+ Connection: connectionString,
+ Base64Connection: base64.StdEncoding.EncodeToString([]byte(httpConnectionString)),
+ TriggerAuthName: triggerAuthName,
+ TriggerSecretName: triggerSecretName,
+ ConnectionNoAuth: httpNoAuthConnectionString,
+ RabbitAppClientID: rabbitAppClientID,
+ Base64RabbitAppClientID: base64.StdEncoding.EncodeToString([]byte(rabbitAppClientID)),
+ }, []Template{
+ {Name: "deploymentTemplate", Config: RMQTargetDeploymentTemplate},
+ {Name: "secretTemplate", Config: secretTemplate},
+ {Name: "triggerAuthTemplate", Config: triggerAuthTemplate},
+ {Name: "scaledObjectTemplate", Config: scaledObjectTemplate},
+ }
+}
+
+func testScaling(t *testing.T, kc *kubernetes.Clientset) {
+ t.Log("--- testing scale out ---")
+ RMQPublishMessages(t, rmqNamespace, connectionString, queueName, messageCount)
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 4, 60, 1),
+ "replica count should be 4 after 1 minute")
+
+ t.Log("--- testing scale in ---")
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 1),
+ "replica count should be 0 after 1 minute")
+}
diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_http_regex/rabbitmq_queue_http_regex_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex/rabbitmq_queue_http_regex_test.go
index 16551e57655..da128a85519 100644
--- a/tests/scalers/rabbitmq/rabbitmq_queue_http_regex/rabbitmq_queue_http_regex_test.go
+++ b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex/rabbitmq_queue_http_regex_test.go
@@ -17,7 +17,7 @@ import (
)
// Load environment variables from .env file
-var _ = godotenv.Load("../../.env")
+var _ = godotenv.Load("../../../.env")
const (
testName = "rmq-queue-http-regex-test"
@@ -83,7 +83,7 @@ func TestScaler(t *testing.T) {
kc := GetKubernetesClient(t)
data, templates := getTemplateData()
- RMQInstall(t, kc, rmqNamespace, user, password, vhost)
+ RMQInstall(t, kc, rmqNamespace, user, password, vhost, WithoutOAuth())
CreateKubernetesResources(t, kc, testNamespace, data, templates)
assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 1),
@@ -94,7 +94,7 @@ func TestScaler(t *testing.T) {
// cleanup
t.Log("--- cleaning up ---")
DeleteKubernetesResources(t, testNamespace, data, templates)
- RMQUninstall(t, rmqNamespace, user, password, vhost)
+ RMQUninstall(t, rmqNamespace, user, password, vhost, WithoutOAuth())
}
func getTemplateData() (templateData, []Template) {
diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_aad_wi/rabbitmq_queue_http_regex_aad_wi_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_aad_wi/rabbitmq_queue_http_regex_aad_wi_test.go
new file mode 100644
index 00000000000..db40a384f24
--- /dev/null
+++ b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_aad_wi/rabbitmq_queue_http_regex_aad_wi_test.go
@@ -0,0 +1,178 @@
+//go:build e2e
+// +build e2e
+
+package rabbitmq_queue_http_regex_aad_wi_test
+
+import (
+ "encoding/base64"
+ "fmt"
+ "os"
+ "testing"
+
+ "github.com/joho/godotenv"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+ "k8s.io/client-go/kubernetes"
+
+ . "github.com/kedacore/keda/v2/tests/helper"
+ . "github.com/kedacore/keda/v2/tests/scalers/rabbitmq"
+)
+
+// Load environment variables from .env file
+var _ = godotenv.Load("../../../.env")
+
+const (
+ testName = "rmq-queue-http-regex-aad-wi-test"
+)
+
+var (
+ testNamespace = fmt.Sprintf("%s-ns", testName)
+ rmqNamespace = fmt.Sprintf("%s-rmq", testName)
+ deploymentName = fmt.Sprintf("%s-deployment", testName)
+ secretName = fmt.Sprintf("%s-secret", testName)
+ triggerAuthName = fmt.Sprintf("%s-ta", testName)
+ triggerSecretName = fmt.Sprintf("%s-ta-secret", testName)
+ scaledObjectName = fmt.Sprintf("%s-so", testName)
+ queueName = "hello"
+ queueRegex = "^hell.{1}$"
+ user = fmt.Sprintf("%s-user", testName)
+ password = fmt.Sprintf("%s-password", testName)
+ vhost = "/"
+ connectionString = fmt.Sprintf("amqp://%s:%s@rabbitmq.%s.svc.cluster.local/", user, password, rmqNamespace)
+ httpConnectionString = fmt.Sprintf("http://%s:%s@rabbitmq.%s.svc.cluster.local/", user, password, rmqNamespace)
+ httpNoAuthConnectionString = fmt.Sprintf("http://rabbitmq.%s.svc.cluster.local/", rmqNamespace)
+ rabbitAppClientID = os.Getenv("TF_AZURE_RABBIT_API_APPLICATION_ID")
+ azureADTenantID = os.Getenv("TF_AZURE_SP_TENANT")
+ messageCount = 100
+)
+
+const (
+ secretTemplate = `
+apiVersion: v1
+kind: Secret
+metadata:
+ name: {{.TriggerSecretName}}
+ namespace: {{.TestNamespace}}
+type: Opaque
+data:
+ workloadIdentityResource: {{.Base64RabbitAppClientID}}
+`
+ triggerAuthTemplate = `
+apiVersion: keda.sh/v1alpha1
+kind: TriggerAuthentication
+metadata:
+ name: {{.TriggerAuthName}}
+ namespace: {{.TestNamespace}}
+spec:
+ podIdentity:
+ provider: azure-workload
+
+ secretTargetRef:
+ - parameter: workloadIdentityResource
+ name: {{.TriggerSecretName}}
+ key: workloadIdentityResource
+`
+ scaledObjectTemplate = `
+apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+ name: {{.ScaledObjectName}}
+ namespace: {{.TestNamespace}}
+spec:
+ scaleTargetRef:
+ name: {{.DeploymentName}}
+ pollingInterval: 5
+ cooldownPeriod: 10
+ minReplicaCount: 0
+ maxReplicaCount: 4
+ triggers:
+ - type: rabbitmq
+ metadata:
+ queueName: {{.QueueName}}
+ vhostName: {{.VHost}}
+ host: {{.ConnectionNoAuth}}
+ protocol: http
+ mode: QueueLength
+ value: '10'
+ useRegex: 'true'
+ operation: sum
+ authenticationRef:
+ name: {{.TriggerAuthName}}
+`
+)
+
+type templateData struct {
+ TestNamespace string
+ DeploymentName string
+ TriggerSecretName string
+ TriggerAuthName string
+ ScaledObjectName string
+ SecretName string
+ QueueName string
+ VHost string
+ Connection, Base64Connection string
+ ConnectionNoAuth string
+ RabbitAppClientID, Base64RabbitAppClientID string
+}
+
+func TestScaler(t *testing.T) {
+ // setup
+ t.Log("--- setting up ---")
+ require.NotEmpty(t, rabbitAppClientID, "TF_AZURE_RABBIT_API_APPLICATION_ID env variable is required for rabbitmq workload identity tests")
+ require.NotEmpty(t, azureADTenantID, "TF_AZURE_SP_TENANT env variable is required for rabbitmq workload identity tests")
+
+ // Create kubernetes resources
+ kc := GetKubernetesClient(t)
+ data, templates := getTemplateData()
+
+ RMQInstall(t, kc, rmqNamespace, user, password, vhost, WithAzureADOAuth(azureADTenantID, rabbitAppClientID))
+ CreateKubernetesResources(t, kc, testNamespace, data, templates)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 1),
+ "replica count should be 0 after 1 minute")
+
+ testScaling(t, kc)
+
+ // cleanup
+ t.Log("--- cleaning up ---")
+ DeleteKubernetesResources(t, testNamespace, data, templates)
+ RMQUninstall(t, rmqNamespace, user, password, vhost, WithAzureADOAuth(azureADTenantID, rabbitAppClientID))
+}
+
+func getTemplateData() (templateData, []Template) {
+ return templateData{
+ TestNamespace: testNamespace,
+ DeploymentName: deploymentName,
+ ScaledObjectName: scaledObjectName,
+ SecretName: secretName,
+ VHost: vhost,
+ QueueName: queueRegex,
+ Connection: connectionString,
+ Base64Connection: base64.StdEncoding.EncodeToString([]byte(httpConnectionString)),
+ TriggerAuthName: triggerAuthName,
+ TriggerSecretName: triggerSecretName,
+ ConnectionNoAuth: httpNoAuthConnectionString,
+ RabbitAppClientID: rabbitAppClientID,
+ Base64RabbitAppClientID: base64.StdEncoding.EncodeToString([]byte(rabbitAppClientID)),
+ }, []Template{
+ {Name: "deploymentTemplate", Config: RMQTargetDeploymentTemplate},
+ {Name: "secretTemplate", Config: secretTemplate},
+ {Name: "triggerAuthTemplate", Config: triggerAuthTemplate},
+ {Name: "scaledObjectTemplate", Config: scaledObjectTemplate},
+ }
+}
+
+func testScaling(t *testing.T, kc *kubernetes.Clientset) {
+ t.Log("--- testing scale out ---")
+ RMQPublishMessages(t, rmqNamespace, connectionString, queueName, messageCount)
+ // dummies
+ RMQPublishMessages(t, rmqNamespace, connectionString, fmt.Sprintf("%s-1", queueName), messageCount)
+ RMQPublishMessages(t, rmqNamespace, connectionString, fmt.Sprintf("%s-%s", queueName, queueName), messageCount)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 4, 60, 2),
+ "replica count should be 4 after 2 minute")
+
+ t.Log("--- testing scale in ---")
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 1),
+ "replica count should be 0 after 1 minute")
+}
diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_vhost/rabbitmq_queue_http_regex_vhost_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_vhost/rabbitmq_queue_http_regex_vhost_test.go
index 5e8a7f932bd..113d92d3cff 100644
--- a/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_vhost/rabbitmq_queue_http_regex_vhost_test.go
+++ b/tests/scalers/rabbitmq/rabbitmq_queue_http_regex_vhost/rabbitmq_queue_http_regex_vhost_test.go
@@ -17,7 +17,7 @@ import (
)
// Load environment variables from .env file
-var _ = godotenv.Load("../../.env")
+var _ = godotenv.Load("../../../.env")
const (
testName = "rmq-queue-http-regex-vhost-test"
@@ -88,7 +88,7 @@ func TestScaler(t *testing.T) {
kc := GetKubernetesClient(t)
data, templates := getTemplateData()
- RMQInstall(t, kc, rmqNamespace, user, password, vhost)
+ RMQInstall(t, kc, rmqNamespace, user, password, vhost, WithoutOAuth())
CreateKubernetesResources(t, kc, testNamespace, data, templates)
RMQCreateVHost(t, rmqNamespace, connectionHost, user, password, dummyVhost1)
@@ -102,7 +102,7 @@ func TestScaler(t *testing.T) {
// cleanup
t.Log("--- cleaning up ---")
DeleteKubernetesResources(t, testNamespace, data, templates)
- RMQUninstall(t, rmqNamespace, user, password, vhost)
+ RMQUninstall(t, rmqNamespace, user, password, vhost, WithoutOAuth())
}
func getTemplateData() (templateData, []Template) {
diff --git a/tests/scalers/rabbitmq/rabbitmq_queue_http_vhost/rabbitmq_queue_http_vhost_test.go b/tests/scalers/rabbitmq/rabbitmq_queue_http_vhost/rabbitmq_queue_http_vhost_test.go
index f7ed7c6a8e6..a6c6963841b 100644
--- a/tests/scalers/rabbitmq/rabbitmq_queue_http_vhost/rabbitmq_queue_http_vhost_test.go
+++ b/tests/scalers/rabbitmq/rabbitmq_queue_http_vhost/rabbitmq_queue_http_vhost_test.go
@@ -17,7 +17,7 @@ import (
)
// Load environment variables from .env file
-var _ = godotenv.Load("../../.env")
+var _ = godotenv.Load("../../../.env")
const (
testName = "rmq-queue-http-vhost-test"
@@ -80,7 +80,7 @@ func TestScaler(t *testing.T) {
kc := GetKubernetesClient(t)
data, templates := getTemplateData()
- RMQInstall(t, kc, rmqNamespace, user, password, vhost)
+ RMQInstall(t, kc, rmqNamespace, user, password, vhost, WithoutOAuth())
CreateKubernetesResources(t, kc, testNamespace, data, templates)
assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 1),
@@ -91,7 +91,7 @@ func TestScaler(t *testing.T) {
// cleanup
t.Log("--- cleaning up ---")
DeleteKubernetesResources(t, testNamespace, data, templates)
- RMQUninstall(t, rmqNamespace, user, password, vhost)
+ RMQUninstall(t, rmqNamespace, user, password, vhost, WithoutOAuth())
}
func getTemplateData() (templateData, []Template) {
diff --git a/tests/scalers/redis/redis_cluster_streams_lag/redis_cluster_streams_lag_test.go b/tests/scalers/redis/redis_cluster_streams_lag/redis_cluster_streams_lag_test.go
new file mode 100644
index 00000000000..240b372f113
--- /dev/null
+++ b/tests/scalers/redis/redis_cluster_streams_lag/redis_cluster_streams_lag_test.go
@@ -0,0 +1,252 @@
+//go:build e2e
+// +build e2e
+
+package redis_cluster_streams_lag_test
+
+import (
+ "encoding/base64"
+ "fmt"
+ "testing"
+
+ "github.com/joho/godotenv"
+ "github.com/stretchr/testify/assert"
+ "k8s.io/client-go/kubernetes"
+
+ . "github.com/kedacore/keda/v2/tests/helper"
+ redis "github.com/kedacore/keda/v2/tests/scalers/redis/helper"
+)
+
+// Load environment variables from .env file
+var _ = godotenv.Load("../../.env")
+
+const (
+ testName = "redis-cluster-streams-lag-test"
+)
+
+var (
+ testNamespace = fmt.Sprintf("%s-ns", testName)
+ redisNamespace = fmt.Sprintf("%s-redis-ns", testName)
+ deploymentName = fmt.Sprintf("%s-deployment", testName)
+ jobName = fmt.Sprintf("%s-job", testName)
+ scaledObjectName = fmt.Sprintf("%s-so", testName)
+ triggerAuthenticationName = fmt.Sprintf("%s-ta", testName)
+ secretName = fmt.Sprintf("%s-secret", testName)
+ redisPassword = "admin"
+ redisHost = fmt.Sprintf("%s-headless", testName)
+ minReplicaCount = 0
+ maxReplicaCount = 4
+)
+
+type templateData struct {
+ TestNamespace string
+ RedisNamespace string
+ DeploymentName string
+ JobName string
+ ScaledObjectName string
+ TriggerAuthenticationName string
+ SecretName string
+ MinReplicaCount int
+ MaxReplicaCount int
+ RedisPassword string
+ RedisPasswordBase64 string
+ RedisHost string
+ ItemsToWrite int
+}
+
+const (
+ deploymentTemplate = `apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{.DeploymentName}}
+ namespace: {{.TestNamespace}}
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: {{.DeploymentName}}
+ template:
+ metadata:
+ labels:
+ app: {{.DeploymentName}}
+ spec:
+ containers:
+ - name: redis-worker
+ image: ghcr.io/kedacore/tests-redis-streams:latest
+ imagePullPolicy: IfNotPresent
+ command: ["./main"]
+ args: ["consumer"]
+ env:
+ - name: REDIS_MODE
+ value: CLUSTER
+ - name: REDIS_HOSTS
+ value: {{.RedisHost}}.{{.RedisNamespace}}
+ - name: REDIS_PORTS
+ value: "6379"
+ - name: REDIS_STREAM_NAME
+ value: my-stream
+ - name: REDIS_STREAM_CONSUMER_GROUP_NAME
+ value: consumer-group-1
+ - name: REDIS_PASSWORD
+ value: {{.RedisPassword}}
+`
+
+ secretTemplate = `apiVersion: v1
+kind: Secret
+metadata:
+ name: {{.SecretName}}
+ namespace: {{.TestNamespace}}
+type: Opaque
+data:
+ password: {{.RedisPasswordBase64}}
+`
+
+ triggerAuthenticationTemplate = `apiVersion: keda.sh/v1alpha1
+kind: TriggerAuthentication
+metadata:
+ name: {{.TriggerAuthenticationName}}
+ namespace: {{.TestNamespace}}
+spec:
+ secretTargetRef:
+ - parameter: password
+ name: {{.SecretName}}
+ key: password
+`
+
+ scaledObjectTemplate = `apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+ name: {{.ScaledObjectName}}
+ namespace: {{.TestNamespace}}
+spec:
+ scaleTargetRef:
+ name: {{.DeploymentName}}
+ pollingInterval: 5
+ cooldownPeriod: 10
+ minReplicaCount: {{.MinReplicaCount}}
+ maxReplicaCount: {{.MaxReplicaCount}}
+ advanced:
+ horizontalPodAutoscalerConfig:
+ behavior:
+ scaleDown:
+ stabilizationWindowSeconds: 15
+ triggers:
+ - type: redis-cluster-streams
+ metadata:
+ hostsFromEnv: REDIS_HOSTS
+ portsFromEnv: REDIS_PORTS
+ stream: my-stream
+ consumerGroup: consumer-group-1
+ lagCount: "12"
+ activationLagCount: "10"
+ authenticationRef:
+ name: {{.TriggerAuthenticationName}}
+`
+
+ insertJobTemplate = `apiVersion: batch/v1
+kind: Job
+metadata:
+ name: {{.JobName}}
+ namespace: {{.TestNamespace}}
+spec:
+ ttlSecondsAfterFinished: 0
+ template:
+ spec:
+ containers:
+ - name: redis
+ image: ghcr.io/kedacore/tests-redis-streams:latest
+ imagePullPolicy: IfNotPresent
+ command: ["./main"]
+ args: ["producer"]
+ env:
+ - name: REDIS_MODE
+ value: CLUSTER
+ - name: REDIS_HOSTS
+ value: {{.RedisHost}}.{{.RedisNamespace}}
+ - name: REDIS_PORTS
+ value: "6379"
+ - name: REDIS_STREAM_NAME
+ value: my-stream
+ - name: REDIS_PASSWORD
+ value: {{.RedisPassword}}
+ - name: NUM_MESSAGES
+ value: "{{.ItemsToWrite}}"
+ restartPolicy: Never
+ backoffLimit: 4
+`
+)
+
+func TestScaler(t *testing.T) {
+ // Create kubernetes resources for PostgreSQL server
+ kc := GetKubernetesClient(t)
+
+ // Create Redis Cluster
+ redis.InstallCluster(t, kc, testName, redisNamespace, redisPassword)
+
+ // Create kubernetes resources for testing
+ data, templates := getTemplateData()
+
+ CreateKubernetesResources(t, kc, testNamespace, data, templates)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicaCount)
+
+ t.Log("--- testing activation ---")
+ testActivationValue(t, kc, data, 10)
+
+ t.Log("--- testing scale out with one more than activation value ---")
+ testScaleOut(t, kc, data, 1, 1)
+
+ t.Log("--- testing scale out with many messages ---")
+ testScaleOut(t, kc, data, 100, maxReplicaCount)
+
+ t.Log("--- testing scale in ---")
+ testScaleIn(t, kc, minReplicaCount)
+
+ // Clean up
+ DeleteKubernetesResources(t, testNamespace, data, templates)
+ redis.RemoveCluster(t, testName, redisNamespace)
+}
+
+func testScaleOut(t *testing.T, kc *kubernetes.Clientset, data templateData, numMessages int, maxReplicas int) {
+ data.ItemsToWrite = numMessages
+ KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicas, 60, 3),
+ "replica count should be %d after 3 minutes", maxReplicas)
+}
+
+func testScaleIn(t *testing.T, kc *kubernetes.Clientset, minReplicas int) {
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicas, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicas)
+}
+
+func testActivationValue(t *testing.T, kc *kubernetes.Clientset, data templateData, numMessages int) {
+ data.ItemsToWrite = numMessages
+ KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate)
+ AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, 0, 30)
+}
+
+var data = templateData{
+ TestNamespace: testNamespace,
+ RedisNamespace: redisNamespace,
+ DeploymentName: deploymentName,
+ ScaledObjectName: scaledObjectName,
+ MinReplicaCount: minReplicaCount,
+ MaxReplicaCount: maxReplicaCount,
+ TriggerAuthenticationName: triggerAuthenticationName,
+ SecretName: secretName,
+ JobName: jobName,
+ RedisPassword: redisPassword,
+ RedisPasswordBase64: base64.StdEncoding.EncodeToString([]byte(redisPassword)),
+ RedisHost: redisHost,
+ ItemsToWrite: 1,
+}
+
+func getTemplateData() (templateData, []Template) {
+ return data, []Template{
+ {Name: "secretTemplate", Config: secretTemplate},
+ {Name: "deploymentTemplate", Config: deploymentTemplate},
+ {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate},
+ {Name: "scaledObjectTemplate", Config: scaledObjectTemplate},
+ }
+}
diff --git a/tests/scalers/redis/redis_cluster_streams/redis_cluster_streams_test.go b/tests/scalers/redis/redis_cluster_streams_pending_entries/redis_cluster_streams_pending_entries_test.go
similarity index 98%
rename from tests/scalers/redis/redis_cluster_streams/redis_cluster_streams_test.go
rename to tests/scalers/redis/redis_cluster_streams_pending_entries/redis_cluster_streams_pending_entries_test.go
index a21574d71ab..65a960ae95a 100644
--- a/tests/scalers/redis/redis_cluster_streams/redis_cluster_streams_test.go
+++ b/tests/scalers/redis/redis_cluster_streams_pending_entries/redis_cluster_streams_pending_entries_test.go
@@ -1,7 +1,7 @@
//go:build e2e
// +build e2e
-package redis_cluster_streams_test
+package redis_cluster_streams_pending_entries_test
import (
"encoding/base64"
@@ -20,7 +20,7 @@ import (
var _ = godotenv.Load("../../.env")
const (
- testName = "redis-cluster-streams-test"
+ testName = "redis-cluster-streams-pending-entries-test"
)
var (
diff --git a/tests/scalers/redis/redis_sentinel_streams_lag/redis_sentinel_streams_lag_test.go b/tests/scalers/redis/redis_sentinel_streams_lag/redis_sentinel_streams_lag_test.go
new file mode 100644
index 00000000000..8e2a4cce3e4
--- /dev/null
+++ b/tests/scalers/redis/redis_sentinel_streams_lag/redis_sentinel_streams_lag_test.go
@@ -0,0 +1,267 @@
+//go:build e2e
+// +build e2e
+
+package redis_sentinel_streams_lag_test
+
+import (
+ "encoding/base64"
+ "fmt"
+ "testing"
+
+ "github.com/joho/godotenv"
+ "github.com/stretchr/testify/assert"
+ "k8s.io/client-go/kubernetes"
+
+ . "github.com/kedacore/keda/v2/tests/helper"
+ redis "github.com/kedacore/keda/v2/tests/scalers/redis/helper"
+)
+
+// Load environment variables from .env file
+var _ = godotenv.Load("../../.env")
+
+const (
+ testName = "redis-sentinel-streams-lag-test"
+)
+
+var (
+ testNamespace = fmt.Sprintf("%s-ns", testName)
+ redisNamespace = fmt.Sprintf("%s-redis-ns", testName)
+ deploymentName = fmt.Sprintf("%s-deployment", testName)
+ jobName = fmt.Sprintf("%s-job", testName)
+ scaledObjectName = fmt.Sprintf("%s-so", testName)
+ triggerAuthenticationName = fmt.Sprintf("%s-ta", testName)
+ secretName = fmt.Sprintf("%s-secret", testName)
+ redisPassword = "admin"
+ redisHost = fmt.Sprintf("%s-headless", testName)
+ minReplicaCount = 0
+ maxReplicaCount = 4
+)
+
+type templateData struct {
+ TestNamespace string
+ RedisNamespace string
+ DeploymentName string
+ JobName string
+ ScaledObjectName string
+ TriggerAuthenticationName string
+ SecretName string
+ MinReplicaCount int
+ MaxReplicaCount int
+ RedisPassword string
+ RedisPasswordBase64 string
+ RedisHost string
+ ItemsToWrite int
+}
+
+const (
+ deploymentTemplate = `apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{.DeploymentName}}
+ namespace: {{.TestNamespace}}
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: {{.DeploymentName}}
+ template:
+ metadata:
+ labels:
+ app: {{.DeploymentName}}
+ spec:
+ containers:
+ - name: redis-worker
+ image: ghcr.io/kedacore/tests-redis-streams:latest
+ imagePullPolicy: IfNotPresent
+ command: ["./main"]
+ args: ["consumer"]
+ env:
+ - name: REDIS_MODE
+ value: SENTINEL
+ - name: REDIS_HOSTS
+ value: {{.RedisHost}}.{{.RedisNamespace}}
+ - name: REDIS_PORTS
+ value: "26379"
+ - name: REDIS_STREAM_NAME
+ value: my-stream
+ - name: REDIS_STREAM_CONSUMER_GROUP_NAME
+ value: consumer-group-1
+ - name: REDIS_PASSWORD
+ value: {{.RedisPassword}}
+ - name: REDIS_SENTINEL_PASSWORD
+ value: {{.RedisPassword}}
+ - name: REDIS_SENTINEL_MASTER
+ value: mymaster
+`
+
+ secretTemplate = `apiVersion: v1
+kind: Secret
+metadata:
+ name: {{.SecretName}}
+ namespace: {{.TestNamespace}}
+type: Opaque
+data:
+ password: {{.RedisPasswordBase64}}
+`
+
+ triggerAuthenticationTemplate = `apiVersion: keda.sh/v1alpha1
+kind: TriggerAuthentication
+metadata:
+ name: {{.TriggerAuthenticationName}}
+ namespace: {{.TestNamespace}}
+spec:
+ secretTargetRef:
+ - parameter: password
+ name: {{.SecretName}}
+ key: password
+ - parameter: sentinelPassword
+ name: {{.SecretName}}
+ key: password
+`
+
+ scaledObjectTemplate = `apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+ name: {{.ScaledObjectName}}
+ namespace: {{.TestNamespace}}
+spec:
+ scaleTargetRef:
+ name: {{.DeploymentName}}
+ pollingInterval: 5
+ cooldownPeriod: 10
+ minReplicaCount: {{.MinReplicaCount}}
+ maxReplicaCount: {{.MaxReplicaCount}}
+ advanced:
+ horizontalPodAutoscalerConfig:
+ behavior:
+ scaleDown:
+ stabilizationWindowSeconds: 15
+ triggers:
+ - type: redis-sentinel-streams
+ metadata:
+ hostsFromEnv: REDIS_HOSTS
+ portsFromEnv: REDIS_PORTS
+ stream: my-stream
+ consumerGroup: consumer-group-1
+ sentinelMaster: mymaster
+ lagCount: "12"
+ activationLagCount: "10"
+ authenticationRef:
+ name: {{.TriggerAuthenticationName}}
+`
+
+ insertJobTemplate = `apiVersion: batch/v1
+kind: Job
+metadata:
+ name: {{.JobName}}
+ namespace: {{.TestNamespace}}
+spec:
+ ttlSecondsAfterFinished: 0
+ template:
+ spec:
+ containers:
+ - name: redis
+ image: ghcr.io/kedacore/tests-redis-streams:latest
+ imagePullPolicy: IfNotPresent
+ command: ["./main"]
+ args: ["producer"]
+ env:
+ - name: REDIS_MODE
+ value: SENTINEL
+ - name: REDIS_HOSTS
+ value: {{.RedisHost}}.{{.RedisNamespace}}
+ - name: REDIS_PORTS
+ value: "26379"
+ - name: REDIS_STREAM_NAME
+ value: my-stream
+ - name: REDIS_STREAM_CONSUMER_GROUP_NAME
+ value: consumer-group-1
+ - name: REDIS_PASSWORD
+ value: {{.RedisPassword}}
+ - name: REDIS_SENTINEL_PASSWORD
+ value: {{.RedisPassword}}
+ - name: REDIS_SENTINEL_MASTER
+ value: mymaster
+ - name: NUM_MESSAGES
+ value: "{{.ItemsToWrite}}"
+ restartPolicy: Never
+ backoffLimit: 4
+`
+)
+
+func TestScaler(t *testing.T) {
+ // Create kubernetes resources for PostgreSQL server
+ kc := GetKubernetesClient(t)
+
+ // Create Redis Sentinel
+ redis.InstallSentinel(t, kc, testName, redisNamespace, redisPassword)
+
+ // Create kubernetes resources for testing
+ data, templates := getTemplateData()
+
+ CreateKubernetesResources(t, kc, testNamespace, data, templates)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicaCount)
+
+ t.Log("--- testing activation ---")
+ testActivationValue(t, kc, data, 10)
+
+ t.Log("--- testing scale out with one more than activation value ---")
+ testScaleOut(t, kc, data, 1, 1)
+
+ t.Log("--- testing scale out with many messages ---")
+ testScaleOut(t, kc, data, 100, maxReplicaCount)
+
+ t.Log("--- testing scale in ---")
+ testScaleIn(t, kc, minReplicaCount)
+
+ // Clean up
+ DeleteKubernetesResources(t, testNamespace, data, templates)
+ redis.RemoveSentinel(t, testName, redisNamespace)
+}
+
+func testScaleOut(t *testing.T, kc *kubernetes.Clientset, data templateData, numMessages int, maxReplicas int) {
+ data.ItemsToWrite = numMessages
+ KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicas, 60, 3),
+ "replica count should be %d after 3 minutes", maxReplicas)
+}
+
+func testScaleIn(t *testing.T, kc *kubernetes.Clientset, minReplicas int) {
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicas, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicas)
+}
+
+func testActivationValue(t *testing.T, kc *kubernetes.Clientset, data templateData, numMessages int) {
+ data.ItemsToWrite = numMessages
+ KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate)
+
+ AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, 0, 30)
+}
+
+var data = templateData{
+ TestNamespace: testNamespace,
+ RedisNamespace: redisNamespace,
+ DeploymentName: deploymentName,
+ ScaledObjectName: scaledObjectName,
+ MinReplicaCount: minReplicaCount,
+ MaxReplicaCount: maxReplicaCount,
+ TriggerAuthenticationName: triggerAuthenticationName,
+ SecretName: secretName,
+ JobName: jobName,
+ RedisPassword: redisPassword,
+ RedisPasswordBase64: base64.StdEncoding.EncodeToString([]byte(redisPassword)),
+ RedisHost: redisHost,
+ ItemsToWrite: 100,
+}
+
+func getTemplateData() (templateData, []Template) {
+ return data, []Template{
+ {Name: "secretTemplate", Config: secretTemplate},
+ {Name: "deploymentTemplate", Config: deploymentTemplate},
+ {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate},
+ {Name: "scaledObjectTemplate", Config: scaledObjectTemplate},
+ }
+}
diff --git a/tests/scalers/redis/redis_sentinel_streams/redis_sentinel_streams_test.go b/tests/scalers/redis/redis_sentinel_streams_pending_entries/redis_sentinel_streams_pending_entries_test.go
similarity index 98%
rename from tests/scalers/redis/redis_sentinel_streams/redis_sentinel_streams_test.go
rename to tests/scalers/redis/redis_sentinel_streams_pending_entries/redis_sentinel_streams_pending_entries_test.go
index 8918609dafe..7aa7aad1620 100644
--- a/tests/scalers/redis/redis_sentinel_streams/redis_sentinel_streams_test.go
+++ b/tests/scalers/redis/redis_sentinel_streams_pending_entries/redis_sentinel_streams_pending_entries_test.go
@@ -1,7 +1,7 @@
//go:build e2e
// +build e2e
-package redis_sentinel_streams_test
+package redis_sentinel_streams_pending_entries_test
import (
"encoding/base64"
@@ -20,7 +20,7 @@ import (
var _ = godotenv.Load("../../.env")
const (
- testName = "redis-sentinel-streams-test"
+ testName = "redis-sentinel-streams-pending-entries-test"
)
var (
diff --git a/tests/scalers/redis/redis_standalone_streams_lag/redis_standalone_streams_lag_test.go b/tests/scalers/redis/redis_standalone_streams_lag/redis_standalone_streams_lag_test.go
new file mode 100644
index 00000000000..a9dd3e7198a
--- /dev/null
+++ b/tests/scalers/redis/redis_standalone_streams_lag/redis_standalone_streams_lag_test.go
@@ -0,0 +1,250 @@
+//go:build e2e
+// +build e2e
+
+package redis_standalone_streams_lag_test
+
+import (
+ "encoding/base64"
+ "fmt"
+ "testing"
+
+ "github.com/joho/godotenv"
+ "github.com/stretchr/testify/assert"
+ "k8s.io/client-go/kubernetes"
+
+ . "github.com/kedacore/keda/v2/tests/helper"
+ redis "github.com/kedacore/keda/v2/tests/scalers/redis/helper"
+)
+
+// Load environment variables from .env file
+var _ = godotenv.Load("../../.env")
+
+const (
+ testName = "redis-standalone-streams-lag-test"
+)
+
+var (
+ testNamespace = fmt.Sprintf("%s-ns", testName)
+ redisNamespace = fmt.Sprintf("%s-redis-ns", testName)
+ deploymentName = fmt.Sprintf("%s-deployment", testName)
+ jobName = fmt.Sprintf("%s-job", testName)
+ scaledObjectName = fmt.Sprintf("%s-so", testName)
+ triggerAuthenticationName = fmt.Sprintf("%s-ta", testName)
+ secretName = fmt.Sprintf("%s-secret", testName)
+ redisPassword = "admin"
+ redisStreamName = "stream"
+ redisAddress = fmt.Sprintf("redis.%s.svc.cluster.local:6379", redisNamespace)
+ minReplicaCount = 0
+ maxReplicaCount = 2
+)
+
+type templateData struct {
+ TestNamespace string
+ RedisNamespace string
+ DeploymentName string
+ JobName string
+ ScaledObjectName string
+ TriggerAuthenticationName string
+ SecretName string
+ MinReplicaCount int
+ MaxReplicaCount int
+ RedisPassword string
+ RedisPasswordBase64 string
+ RedisStreamName string
+ RedisAddress string
+ ItemsToWrite int
+}
+
+const (
+ deploymentTemplate = `apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{.DeploymentName}}
+ namespace: {{.TestNamespace}}
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ app: {{.DeploymentName}}
+ template:
+ metadata:
+ labels:
+ app: {{.DeploymentName}}
+ spec:
+ containers:
+ - name: redis-worker
+ image: ghcr.io/kedacore/tests-redis-streams:latest
+ imagePullPolicy: IfNotPresent
+ command: ["./main"]
+ args: ["consumer"]
+ env:
+ - name: REDIS_MODE
+ value: STANDALONE
+ - name: REDIS_ADDRESS
+ value: {{.RedisAddress}}
+ - name: REDIS_STREAM_NAME
+ value: {{.RedisStreamName}}
+ - name: REDIS_PASSWORD
+ value: {{.RedisPassword}}
+ - name: REDIS_STREAM_CONSUMER_GROUP_NAME
+ value: "consumer-group-1"
+`
+
+ secretTemplate = `apiVersion: v1
+kind: Secret
+metadata:
+ name: {{.SecretName}}
+ namespace: {{.TestNamespace}}
+type: Opaque
+data:
+ password: {{.RedisPasswordBase64}}
+`
+
+ triggerAuthenticationTemplate = `apiVersion: keda.sh/v1alpha1
+kind: TriggerAuthentication
+metadata:
+ name: {{.TriggerAuthenticationName}}
+ namespace: {{.TestNamespace}}
+spec:
+ secretTargetRef:
+ - parameter: password
+ name: {{.SecretName}}
+ key: password
+`
+
+ scaledObjectTemplate = `apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+ name: {{.ScaledObjectName}}
+ namespace: {{.TestNamespace}}
+spec:
+ scaleTargetRef:
+ name: {{.DeploymentName}}
+ pollingInterval: 5
+ cooldownPeriod: 10
+ minReplicaCount: {{.MinReplicaCount}}
+ maxReplicaCount: {{.MaxReplicaCount}}
+ advanced:
+ horizontalPodAutoscalerConfig:
+ behavior:
+ scaleDown:
+ stabilizationWindowSeconds: 15
+ triggers:
+ - type: redis-streams
+ metadata:
+ addressFromEnv: REDIS_ADDRESS
+ stream: {{.RedisStreamName}}
+ consumerGroup: consumer-group-1
+ lagCount: "12"
+ activationLagCount: "10"
+ authenticationRef:
+ name: {{.TriggerAuthenticationName}}
+`
+
+ insertJobTemplate = `apiVersion: batch/v1
+kind: Job
+metadata:
+ name: {{.JobName}}
+ namespace: {{.TestNamespace}}
+spec:
+ ttlSecondsAfterFinished: 0
+ template:
+ spec:
+ containers:
+ - name: redis
+ image: ghcr.io/kedacore/tests-redis-streams:latest
+ imagePullPolicy: IfNotPresent
+ command: ["./main"]
+ args: ["producer"]
+ env:
+ - name: REDIS_MODE
+ value: STANDALONE
+ - name: REDIS_ADDRESS
+ value: {{.RedisAddress}}
+ - name: REDIS_PASSWORD
+ value: {{.RedisPassword}}
+ - name: REDIS_STREAM_NAME
+ value: {{.RedisStreamName}}
+ - name: NUM_MESSAGES
+ value: "{{.ItemsToWrite}}"
+ restartPolicy: Never
+ backoffLimit: 4
+`
+)
+
+func TestScaler(t *testing.T) {
+ // Create kubernetes resources for PostgreSQL server
+ kc := GetKubernetesClient(t)
+
+ // Create Redis Standalone
+ redis.InstallStandalone(t, kc, testName, redisNamespace, redisPassword)
+
+ // Create kubernetes resources for testing
+ data, templates := getTemplateData()
+ CreateKubernetesResources(t, kc, testNamespace, data, templates)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, 0, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicaCount)
+
+ t.Log("--- testing activation ---")
+ testActivationValue(t, kc, data, 10)
+
+ t.Log("--- testing scale out with one more than activation value ---")
+ testScaleOut(t, kc, data, 1, 1)
+
+ t.Log("--- testing scale out with many messages ---")
+ testScaleOut(t, kc, data, 100, maxReplicaCount)
+
+ t.Log("--- testing scale in ---")
+ testScaleIn(t, kc, minReplicaCount)
+
+ // cleanup
+ redis.RemoveStandalone(t, testName, redisNamespace)
+ DeleteKubernetesResources(t, testNamespace, data, templates)
+}
+
+func testScaleOut(t *testing.T, kc *kubernetes.Clientset, data templateData, numMessages int, maxReplicas int) {
+ data.ItemsToWrite = numMessages
+ KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate)
+
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicas, 60, 1),
+ "replica count should be %d after 3 minutes", maxReplicaCount)
+}
+
+func testScaleIn(t *testing.T, kc *kubernetes.Clientset, minReplicas int) {
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicas, 60, 1),
+ "replica count should be %d after 3 minutes", minReplicaCount)
+}
+
+func testActivationValue(t *testing.T, kc *kubernetes.Clientset, data templateData, numMessages int) {
+ data.ItemsToWrite = numMessages
+ KubectlApplyWithTemplate(t, data, "insertJobTemplate", insertJobTemplate)
+
+ AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, 0, 30)
+}
+
+var data = templateData{
+ TestNamespace: testNamespace,
+ RedisNamespace: redisNamespace,
+ DeploymentName: deploymentName,
+ ScaledObjectName: scaledObjectName,
+ MinReplicaCount: minReplicaCount,
+ MaxReplicaCount: maxReplicaCount,
+ TriggerAuthenticationName: triggerAuthenticationName,
+ SecretName: secretName,
+ JobName: jobName,
+ RedisPassword: redisPassword,
+ RedisPasswordBase64: base64.StdEncoding.EncodeToString([]byte(redisPassword)),
+ RedisStreamName: redisStreamName,
+ RedisAddress: redisAddress,
+ ItemsToWrite: 20,
+}
+
+func getTemplateData() (templateData, []Template) {
+ return data, []Template{
+ {Name: "secretTemplate", Config: secretTemplate},
+ {Name: "deploymentTemplate", Config: deploymentTemplate},
+ {Name: "triggerAuthenticationTemplate", Config: triggerAuthenticationTemplate},
+ {Name: "scaledObjectTemplate", Config: scaledObjectTemplate},
+ }
+}
diff --git a/tests/scalers/redis/redis_standalone_streams/redis_standalone_streams_test.go b/tests/scalers/redis/redis_standalone_streams_pending_entries/redis_standalone_streams_test_pending_entries_test.go
similarity index 98%
rename from tests/scalers/redis/redis_standalone_streams/redis_standalone_streams_test.go
rename to tests/scalers/redis/redis_standalone_streams_pending_entries/redis_standalone_streams_test_pending_entries_test.go
index 23d81e6b524..493dae78acf 100644
--- a/tests/scalers/redis/redis_standalone_streams/redis_standalone_streams_test.go
+++ b/tests/scalers/redis/redis_standalone_streams_pending_entries/redis_standalone_streams_test_pending_entries_test.go
@@ -1,7 +1,7 @@
//go:build e2e
// +build e2e
-package redis_standalone_streams_test
+package redis_standalone_streams_pending_entries_test
import (
"encoding/base64"
@@ -20,7 +20,7 @@ import (
var _ = godotenv.Load("../../.env")
const (
- testName = "redis-standalone-streams-test"
+ testName = "redis-standalone-streams-pending-entries-test"
)
var (
diff --git a/tests/scalers/solace/solace_test.go b/tests/scalers/solace/solace_test.go
index 0fb16c51240..d5d63529c00 100644
--- a/tests/scalers/solace/solace_test.go
+++ b/tests/scalers/solace/solace_test.go
@@ -154,6 +154,50 @@ spec:
messageSpoolUsageTarget: '1'
activationMessageCountTarget: '20'
activationMessageSpoolUsageTarget: '20'
+ activationMessageReceiveRateTarget: '100'
+ authenticationRef:
+ name: {{.TriggerAuthenticationName}}
+`
+
+ scaledObjectTemplateRate = `apiVersion: keda.sh/v1alpha1
+kind: ScaledObject
+metadata:
+ name: {{.ScaledObjectName}}
+ namespace: {{.TestNamespace}}
+spec:
+ scaleTargetRef:
+ name: {{.DeploymentName}}
+ minReplicaCount: {{.MinReplicaCount}}
+ maxReplicaCount: {{.MaxReplicaCount}}
+ pollingInterval: 3
+ cooldownPeriod: 5
+ advanced:
+ horizontalPodAutoscalerConfig:
+ behavior:
+ scaleDown:
+ stabilizationWindowSeconds: 0
+ policies:
+ - type: Percent
+ value: 100
+ periodSeconds: 10
+ scaleUp:
+ stabilizationWindowSeconds: 0
+ policies:
+ - type: Pods
+ value: 10
+ periodSeconds: 10
+ selectPolicy: Max
+ triggers:
+ - type: solace-event-queue
+ metadata:
+ solaceSempBaseURL: http://kedalab-pubsubplus-dev.{{.TestNamespace}}.svc.cluster.local:8080
+ messageVpn: keda_vpn
+ queueName: SCALED_CONSUMER_QUEUE1
+ messageReceiveRateTarget: '5'
+ # Will not activate on count or spool
+ activationMessageCountTarget: '1000'
+ activationMessageSpoolUsageTarget: '1000'
+ activationMessageReceiveRateTarget: '3'
authenticationRef:
name: {{.TriggerAuthenticationName}}
`
@@ -173,8 +217,14 @@ func TestStanScaler(t *testing.T) {
testScaleOut(t, kc)
testScaleIn(t, kc)
+ KubectlApplyWithTemplate(t, data, "scaledObjectTemplateRate", scaledObjectTemplateRate)
+
+ testActivationRate(t, kc)
+ testScaleOutRate(t, kc)
+ testScaleInRate(t, kc)
+
// cleanup
- KubectlDeleteWithTemplate(t, data, "scaledObjectTemplate", scaledObjectTemplate)
+ KubectlDeleteWithTemplate(t, data, "scaledObjectTemplateRate", scaledObjectTemplateRate)
uninstallSolace(t)
DeleteKubernetesResources(t, testNamespace, data, templates)
}
@@ -184,9 +234,11 @@ func installSolace(t *testing.T) {
assert.NoErrorf(t, err, "cannot execute command - %s", err)
_, err = ExecuteCommand("helm repo update")
assert.NoErrorf(t, err, "cannot execute command - %s", err)
- _, err = ExecuteCommand(fmt.Sprintf(`helm upgrade --install --set solace.usernameAdminPassword=KedaLabAdminPwd1 --set storage.persistent=false --namespace %s --wait --timeout 900s kedalab solacecharts/pubsubplus-dev`,
+ _, err = ExecuteCommand(fmt.Sprintf(`helm upgrade --install --set solace.usernameAdminPassword=KedaLabAdminPwd1 --set storage.persistent=false,solace.size=dev,nameOverride=pubsubplus-dev --namespace %s kedalab solacecharts/pubsubplus`,
testNamespace))
assert.NoErrorf(t, err, "cannot execute command - %s", err)
+ _, err = ExecuteCommand("sleep 60") // there is a bug in the solace helm chart where it is looking for the wrong number of replicas on --wait
+ assert.NoErrorf(t, err, "cannot execute command - %s", err)
// Create the pubsub broker
_, _, err = ExecCommandOnSpecificPod(t, helperName, testNamespace, "./config/config_solace.sh")
assert.NoErrorf(t, err, "cannot execute command - %s", err)
@@ -222,6 +274,27 @@ func testScaleIn(t *testing.T, kc *kubernetes.Clientset) {
"replica count should be %d after 3 minutes", minReplicaCount)
}
+func testActivationRate(t *testing.T, kc *kubernetes.Clientset) {
+ t.Log("--- testing activation activationMsgRxRateTarget ---")
+ // Next line is a delay -- Wait to smooth out msg receive rate to avoid false+
+ AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 30)
+ publishMessages(t, 1, 30, 256)
+ AssertReplicaCountNotChangeDuringTimePeriod(t, kc, deploymentName, testNamespace, minReplicaCount, 30)
+}
+
+func testScaleOutRate(t *testing.T, kc *kubernetes.Clientset) {
+ t.Log("--- testing scale out msgRxRateTarget---")
+ publishMessages(t, 30, 300, 256)
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, maxReplicaCount, 60, 3),
+ "replica count should be %d after 3 minutes", maxReplicaCount)
+}
+
+func testScaleInRate(t *testing.T, kc *kubernetes.Clientset) {
+ t.Log("--- testing scale in msgRxRateTarget ---")
+ assert.True(t, WaitForDeploymentReplicaReadyCount(t, kc, deploymentName, testNamespace, minReplicaCount, 60, 3),
+ "replica count should be %d after 3 minutes", minReplicaCount)
+}
+
func getTemplateData() (templateData, []Template) {
return templateData{
TestNamespace: testNamespace,
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/alert_policy_client.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/alert_policy_client.go
index b841f13a799..84496844a2d 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/alert_policy_client.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/alert_policy_client.go
@@ -61,6 +61,7 @@ func defaultAlertPolicyGRPCClientOptions() []option.ClientOption {
func defaultAlertPolicyCallOptions() *AlertPolicyCallOptions {
return &AlertPolicyCallOptions{
ListAlertPolicies: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -72,6 +73,7 @@ func defaultAlertPolicyCallOptions() *AlertPolicyCallOptions {
}),
},
GetAlertPolicy: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -82,8 +84,11 @@ func defaultAlertPolicyCallOptions() *AlertPolicyCallOptions {
})
}),
},
- CreateAlertPolicy: []gax.CallOption{},
+ CreateAlertPolicy: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
DeleteAlertPolicy: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -94,7 +99,9 @@ func defaultAlertPolicyCallOptions() *AlertPolicyCallOptions {
})
}),
},
- UpdateAlertPolicy: []gax.CallOption{},
+ UpdateAlertPolicy: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
}
}
@@ -188,9 +195,6 @@ type alertPolicyGRPCClient struct {
// Connection pool of gRPC connections to the service.
connPool gtransport.ConnPool
- // flag to opt out of default deadlines via GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE
- disableDeadlines bool
-
// Points back to the CallOptions field of the containing AlertPolicyClient
CallOptions **AlertPolicyCallOptions
@@ -223,11 +227,6 @@ func NewAlertPolicyClient(ctx context.Context, opts ...option.ClientOption) (*Al
clientOpts = append(clientOpts, hookOpts...)
}
- disableDeadlines, err := checkDisableDeadlines()
- if err != nil {
- return nil, err
- }
-
connPool, err := gtransport.DialPool(ctx, append(clientOpts, opts...)...)
if err != nil {
return nil, err
@@ -236,7 +235,6 @@ func NewAlertPolicyClient(ctx context.Context, opts ...option.ClientOption) (*Al
c := &alertPolicyGRPCClient{
connPool: connPool,
- disableDeadlines: disableDeadlines,
alertPolicyClient: monitoringpb.NewAlertPolicyServiceClient(connPool),
CallOptions: &client.CallOptions,
}
@@ -259,7 +257,7 @@ func (c *alertPolicyGRPCClient) Connection() *grpc.ClientConn {
// the `x-goog-api-client` header passed on each request. Intended for
// use by Google-written clients.
func (c *alertPolicyGRPCClient) setGoogleClientInfo(keyval ...string) {
- kv := append([]string{"gl-go", versionGo()}, keyval...)
+ kv := append([]string{"gl-go", gax.GoVersion}, keyval...)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}
@@ -316,11 +314,6 @@ func (c *alertPolicyGRPCClient) ListAlertPolicies(ctx context.Context, req *moni
}
func (c *alertPolicyGRPCClient) GetAlertPolicy(ctx context.Context, req *monitoringpb.GetAlertPolicyRequest, opts ...gax.CallOption) (*monitoringpb.AlertPolicy, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -338,11 +331,6 @@ func (c *alertPolicyGRPCClient) GetAlertPolicy(ctx context.Context, req *monitor
}
func (c *alertPolicyGRPCClient) CreateAlertPolicy(ctx context.Context, req *monitoringpb.CreateAlertPolicyRequest, opts ...gax.CallOption) (*monitoringpb.AlertPolicy, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -360,11 +348,6 @@ func (c *alertPolicyGRPCClient) CreateAlertPolicy(ctx context.Context, req *moni
}
func (c *alertPolicyGRPCClient) DeleteAlertPolicy(ctx context.Context, req *monitoringpb.DeleteAlertPolicyRequest, opts ...gax.CallOption) error {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -378,11 +361,6 @@ func (c *alertPolicyGRPCClient) DeleteAlertPolicy(ctx context.Context, req *moni
}
func (c *alertPolicyGRPCClient) UpdateAlertPolicy(ctx context.Context, req *monitoringpb.UpdateAlertPolicyRequest, opts ...gax.CallOption) (*monitoringpb.AlertPolicy, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "alert_policy.name", url.QueryEscape(req.GetAlertPolicy().GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/doc.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/doc.go
index 4633f5dabd2..63c5feb8bf2 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/doc.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/doc.go
@@ -77,6 +77,11 @@
// _ = resp
// }
//
+// # Inspecting errors
+//
+// To see examples of how to inspect errors returned by this package please reference
+// [Inspecting errors](https://pkg.go.dev/cloud.google.com/go#hdr-Inspecting_errors).
+//
// # Use of Context
//
// The ctx passed to NewAlertPolicyClient is used for authentication requests and
@@ -88,11 +93,6 @@ package monitoring // import "cloud.google.com/go/monitoring/apiv3/v2"
import (
"context"
- "os"
- "runtime"
- "strconv"
- "strings"
- "unicode"
"google.golang.org/api/option"
"google.golang.org/grpc/metadata"
@@ -123,16 +123,6 @@ func insertMetadata(ctx context.Context, mds ...metadata.MD) context.Context {
return metadata.NewOutgoingContext(ctx, out)
}
-func checkDisableDeadlines() (bool, error) {
- raw, ok := os.LookupEnv("GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE")
- if !ok {
- return false, nil
- }
-
- b, err := strconv.ParseBool(raw)
- return b, err
-}
-
// DefaultAuthScopes reports the default set of authentication scopes to use with this package.
func DefaultAuthScopes() []string {
return []string{
@@ -142,40 +132,3 @@ func DefaultAuthScopes() []string {
"https://www.googleapis.com/auth/monitoring.write",
}
}
-
-// versionGo returns the Go runtime version. The returned string
-// has no whitespace, suitable for reporting in header.
-func versionGo() string {
- const develPrefix = "devel +"
-
- s := runtime.Version()
- if strings.HasPrefix(s, develPrefix) {
- s = s[len(develPrefix):]
- if p := strings.IndexFunc(s, unicode.IsSpace); p >= 0 {
- s = s[:p]
- }
- return s
- }
-
- notSemverRune := func(r rune) bool {
- return !strings.ContainsRune("0123456789.", r)
- }
-
- if strings.HasPrefix(s, "go1") {
- s = s[2:]
- var prerelease string
- if p := strings.IndexFunc(s, notSemverRune); p >= 0 {
- s, prerelease = s[:p], s[p:]
- }
- if strings.HasSuffix(s, ".") {
- s += "0"
- } else if strings.Count(s, ".") < 2 {
- s += ".0"
- }
- if prerelease != "" {
- s += "-" + prerelease
- }
- return s
- }
- return "UNKNOWN"
-}
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/group_client.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/group_client.go
index f1e66ab498c..e754d57c7bb 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/group_client.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/group_client.go
@@ -63,6 +63,7 @@ func defaultGroupGRPCClientOptions() []option.ClientOption {
func defaultGroupCallOptions() *GroupCallOptions {
return &GroupCallOptions{
ListGroups: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -74,6 +75,7 @@ func defaultGroupCallOptions() *GroupCallOptions {
}),
},
GetGroup: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -84,8 +86,11 @@ func defaultGroupCallOptions() *GroupCallOptions {
})
}),
},
- CreateGroup: []gax.CallOption{},
+ CreateGroup: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
UpdateGroup: []gax.CallOption{
+ gax.WithTimeout(180000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -97,6 +102,7 @@ func defaultGroupCallOptions() *GroupCallOptions {
}),
},
DeleteGroup: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -108,6 +114,7 @@ func defaultGroupCallOptions() *GroupCallOptions {
}),
},
ListGroupMembers: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -218,9 +225,6 @@ type groupGRPCClient struct {
// Connection pool of gRPC connections to the service.
connPool gtransport.ConnPool
- // flag to opt out of default deadlines via GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE
- disableDeadlines bool
-
// Points back to the CallOptions field of the containing GroupClient
CallOptions **GroupCallOptions
@@ -256,11 +260,6 @@ func NewGroupClient(ctx context.Context, opts ...option.ClientOption) (*GroupCli
clientOpts = append(clientOpts, hookOpts...)
}
- disableDeadlines, err := checkDisableDeadlines()
- if err != nil {
- return nil, err
- }
-
connPool, err := gtransport.DialPool(ctx, append(clientOpts, opts...)...)
if err != nil {
return nil, err
@@ -268,10 +267,9 @@ func NewGroupClient(ctx context.Context, opts ...option.ClientOption) (*GroupCli
client := GroupClient{CallOptions: defaultGroupCallOptions()}
c := &groupGRPCClient{
- connPool: connPool,
- disableDeadlines: disableDeadlines,
- groupClient: monitoringpb.NewGroupServiceClient(connPool),
- CallOptions: &client.CallOptions,
+ connPool: connPool,
+ groupClient: monitoringpb.NewGroupServiceClient(connPool),
+ CallOptions: &client.CallOptions,
}
c.setGoogleClientInfo()
@@ -292,7 +290,7 @@ func (c *groupGRPCClient) Connection() *grpc.ClientConn {
// the `x-goog-api-client` header passed on each request. Intended for
// use by Google-written clients.
func (c *groupGRPCClient) setGoogleClientInfo(keyval ...string) {
- kv := append([]string{"gl-go", versionGo()}, keyval...)
+ kv := append([]string{"gl-go", gax.GoVersion}, keyval...)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}
@@ -349,11 +347,6 @@ func (c *groupGRPCClient) ListGroups(ctx context.Context, req *monitoringpb.List
}
func (c *groupGRPCClient) GetGroup(ctx context.Context, req *monitoringpb.GetGroupRequest, opts ...gax.CallOption) (*monitoringpb.Group, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -371,11 +364,6 @@ func (c *groupGRPCClient) GetGroup(ctx context.Context, req *monitoringpb.GetGro
}
func (c *groupGRPCClient) CreateGroup(ctx context.Context, req *monitoringpb.CreateGroupRequest, opts ...gax.CallOption) (*monitoringpb.Group, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -393,11 +381,6 @@ func (c *groupGRPCClient) CreateGroup(ctx context.Context, req *monitoringpb.Cre
}
func (c *groupGRPCClient) UpdateGroup(ctx context.Context, req *monitoringpb.UpdateGroupRequest, opts ...gax.CallOption) (*monitoringpb.Group, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 180000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "group.name", url.QueryEscape(req.GetGroup().GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -415,11 +398,6 @@ func (c *groupGRPCClient) UpdateGroup(ctx context.Context, req *monitoringpb.Upd
}
func (c *groupGRPCClient) DeleteGroup(ctx context.Context, req *monitoringpb.DeleteGroupRequest, opts ...gax.CallOption) error {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/metric_client.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/metric_client.go
index a2e8b3e92c1..e702afd25d8 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/metric_client.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/metric_client.go
@@ -67,6 +67,7 @@ func defaultMetricGRPCClientOptions() []option.ClientOption {
func defaultMetricCallOptions() *MetricCallOptions {
return &MetricCallOptions{
ListMonitoredResourceDescriptors: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -78,6 +79,7 @@ func defaultMetricCallOptions() *MetricCallOptions {
}),
},
GetMonitoredResourceDescriptor: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -89,6 +91,7 @@ func defaultMetricCallOptions() *MetricCallOptions {
}),
},
ListMetricDescriptors: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -100,6 +103,7 @@ func defaultMetricCallOptions() *MetricCallOptions {
}),
},
GetMetricDescriptor: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -110,8 +114,11 @@ func defaultMetricCallOptions() *MetricCallOptions {
})
}),
},
- CreateMetricDescriptor: []gax.CallOption{},
+ CreateMetricDescriptor: []gax.CallOption{
+ gax.WithTimeout(12000 * time.Millisecond),
+ },
DeleteMetricDescriptor: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -123,6 +130,7 @@ func defaultMetricCallOptions() *MetricCallOptions {
}),
},
ListTimeSeries: []gax.CallOption{
+ gax.WithTimeout(90000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -133,7 +141,9 @@ func defaultMetricCallOptions() *MetricCallOptions {
})
}),
},
- CreateTimeSeries: []gax.CallOption{},
+ CreateTimeSeries: []gax.CallOption{
+ gax.WithTimeout(12000 * time.Millisecond),
+ },
CreateServiceTimeSeries: []gax.CallOption{},
}
}
@@ -259,9 +269,6 @@ type metricGRPCClient struct {
// Connection pool of gRPC connections to the service.
connPool gtransport.ConnPool
- // flag to opt out of default deadlines via GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE
- disableDeadlines bool
-
// Points back to the CallOptions field of the containing MetricClient
CallOptions **MetricCallOptions
@@ -287,11 +294,6 @@ func NewMetricClient(ctx context.Context, opts ...option.ClientOption) (*MetricC
clientOpts = append(clientOpts, hookOpts...)
}
- disableDeadlines, err := checkDisableDeadlines()
- if err != nil {
- return nil, err
- }
-
connPool, err := gtransport.DialPool(ctx, append(clientOpts, opts...)...)
if err != nil {
return nil, err
@@ -299,10 +301,9 @@ func NewMetricClient(ctx context.Context, opts ...option.ClientOption) (*MetricC
client := MetricClient{CallOptions: defaultMetricCallOptions()}
c := &metricGRPCClient{
- connPool: connPool,
- disableDeadlines: disableDeadlines,
- metricClient: monitoringpb.NewMetricServiceClient(connPool),
- CallOptions: &client.CallOptions,
+ connPool: connPool,
+ metricClient: monitoringpb.NewMetricServiceClient(connPool),
+ CallOptions: &client.CallOptions,
}
c.setGoogleClientInfo()
@@ -323,7 +324,7 @@ func (c *metricGRPCClient) Connection() *grpc.ClientConn {
// the `x-goog-api-client` header passed on each request. Intended for
// use by Google-written clients.
func (c *metricGRPCClient) setGoogleClientInfo(keyval ...string) {
- kv := append([]string{"gl-go", versionGo()}, keyval...)
+ kv := append([]string{"gl-go", gax.GoVersion}, keyval...)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}
@@ -380,11 +381,6 @@ func (c *metricGRPCClient) ListMonitoredResourceDescriptors(ctx context.Context,
}
func (c *metricGRPCClient) GetMonitoredResourceDescriptor(ctx context.Context, req *monitoringpb.GetMonitoredResourceDescriptorRequest, opts ...gax.CallOption) (*monitoredrespb.MonitoredResourceDescriptor, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -447,11 +443,6 @@ func (c *metricGRPCClient) ListMetricDescriptors(ctx context.Context, req *monit
}
func (c *metricGRPCClient) GetMetricDescriptor(ctx context.Context, req *monitoringpb.GetMetricDescriptorRequest, opts ...gax.CallOption) (*metricpb.MetricDescriptor, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -469,11 +460,6 @@ func (c *metricGRPCClient) GetMetricDescriptor(ctx context.Context, req *monitor
}
func (c *metricGRPCClient) CreateMetricDescriptor(ctx context.Context, req *monitoringpb.CreateMetricDescriptorRequest, opts ...gax.CallOption) (*metricpb.MetricDescriptor, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 12000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -491,11 +477,6 @@ func (c *metricGRPCClient) CreateMetricDescriptor(ctx context.Context, req *moni
}
func (c *metricGRPCClient) DeleteMetricDescriptor(ctx context.Context, req *monitoringpb.DeleteMetricDescriptorRequest, opts ...gax.CallOption) error {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -554,11 +535,6 @@ func (c *metricGRPCClient) ListTimeSeries(ctx context.Context, req *monitoringpb
}
func (c *metricGRPCClient) CreateTimeSeries(ctx context.Context, req *monitoringpb.CreateTimeSeriesRequest, opts ...gax.CallOption) error {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 12000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/alert.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/alert.pb.go
index fb4d05510d0..845924be0f3 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/alert.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/alert.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/alert.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/alert_service.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/alert_service.pb.go
index 4c7d6ebabca..5a2718de868 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/alert_service.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/alert_service.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/alert_service.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/common.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/common.pb.go
index 7d0dea3b4b7..d4fd9cf19d4 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/common.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/common.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/common.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/dropped_labels.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/dropped_labels.pb.go
index 2235013c25e..f4a78f6a21d 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/dropped_labels.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/dropped_labels.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/dropped_labels.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/group.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/group.pb.go
index 9572773a648..f870b23a4dc 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/group.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/group.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/group.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/group_service.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/group_service.pb.go
index 20d1755c7b3..5d7745e9807 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/group_service.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/group_service.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/group_service.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/metric.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/metric.pb.go
index 3edbd7d5e5e..e414c4ab70a 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/metric.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/metric.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/metric.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/metric_service.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/metric_service.pb.go
index 591a56b8f7d..8008083f508 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/metric_service.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/metric_service.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/metric_service.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/mutation_record.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/mutation_record.pb.go
index fd0e177ffbc..fca8f5823bc 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/mutation_record.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/mutation_record.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/mutation_record.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/notification.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/notification.pb.go
index 55cb7faf932..67dde79c30a 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/notification.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/notification.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/notification.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/notification_service.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/notification_service.pb.go
index f8456508344..c0ce5de2d28 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/notification_service.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/notification_service.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/notification_service.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/query_service.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/query_service.pb.go
index ad412dd45e2..4e65aa33222 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/query_service.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/query_service.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/query_service.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/service.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/service.pb.go
index 88afc7cd196..12b275bb2d4 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/service.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/service.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/service.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/service_service.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/service_service.pb.go
index 21910afe2d7..2d4f9fd3bb1 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/service_service.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/service_service.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/service_service.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/snooze.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/snooze.pb.go
index a38038fe595..c619aff1f94 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/snooze.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/snooze.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/snooze.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/snooze_service.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/snooze_service.pb.go
index db720990a6d..9637989da12 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/snooze_service.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/snooze_service.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/snooze_service.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/span_context.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/span_context.pb.go
index 9950c03ad75..42e60c86de6 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/span_context.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/span_context.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/span_context.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/uptime.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/uptime.pb.go
index 1c1d4b49c72..ad3cc26e1d8 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/uptime.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/uptime.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/uptime.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/uptime_service.pb.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/uptime_service.pb.go
index 5d16aedfd48..838cec626d7 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/uptime_service.pb.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/monitoringpb/uptime_service.pb.go
@@ -15,7 +15,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.30.0
-// protoc v4.23.1
+// protoc v4.23.2
// source: google/monitoring/v3/uptime_service.proto
package monitoringpb
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/notification_channel_client.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/notification_channel_client.go
index 2c1439ea136..04836724bcb 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/notification_channel_client.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/notification_channel_client.go
@@ -66,6 +66,7 @@ func defaultNotificationChannelGRPCClientOptions() []option.ClientOption {
func defaultNotificationChannelCallOptions() *NotificationChannelCallOptions {
return &NotificationChannelCallOptions{
ListNotificationChannelDescriptors: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -77,6 +78,7 @@ func defaultNotificationChannelCallOptions() *NotificationChannelCallOptions {
}),
},
GetNotificationChannelDescriptor: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -88,6 +90,7 @@ func defaultNotificationChannelCallOptions() *NotificationChannelCallOptions {
}),
},
ListNotificationChannels: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -99,6 +102,7 @@ func defaultNotificationChannelCallOptions() *NotificationChannelCallOptions {
}),
},
GetNotificationChannel: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -109,9 +113,14 @@ func defaultNotificationChannelCallOptions() *NotificationChannelCallOptions {
})
}),
},
- CreateNotificationChannel: []gax.CallOption{},
- UpdateNotificationChannel: []gax.CallOption{},
+ CreateNotificationChannel: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
+ UpdateNotificationChannel: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
DeleteNotificationChannel: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -122,8 +131,11 @@ func defaultNotificationChannelCallOptions() *NotificationChannelCallOptions {
})
}),
},
- SendNotificationChannelVerificationCode: []gax.CallOption{},
+ SendNotificationChannelVerificationCode: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
GetNotificationChannelVerificationCode: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -135,6 +147,7 @@ func defaultNotificationChannelCallOptions() *NotificationChannelCallOptions {
}),
},
VerifyNotificationChannel: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -289,9 +302,6 @@ type notificationChannelGRPCClient struct {
// Connection pool of gRPC connections to the service.
connPool gtransport.ConnPool
- // flag to opt out of default deadlines via GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE
- disableDeadlines bool
-
// Points back to the CallOptions field of the containing NotificationChannelClient
CallOptions **NotificationChannelCallOptions
@@ -317,11 +327,6 @@ func NewNotificationChannelClient(ctx context.Context, opts ...option.ClientOpti
clientOpts = append(clientOpts, hookOpts...)
}
- disableDeadlines, err := checkDisableDeadlines()
- if err != nil {
- return nil, err
- }
-
connPool, err := gtransport.DialPool(ctx, append(clientOpts, opts...)...)
if err != nil {
return nil, err
@@ -330,7 +335,6 @@ func NewNotificationChannelClient(ctx context.Context, opts ...option.ClientOpti
c := ¬ificationChannelGRPCClient{
connPool: connPool,
- disableDeadlines: disableDeadlines,
notificationChannelClient: monitoringpb.NewNotificationChannelServiceClient(connPool),
CallOptions: &client.CallOptions,
}
@@ -353,7 +357,7 @@ func (c *notificationChannelGRPCClient) Connection() *grpc.ClientConn {
// the `x-goog-api-client` header passed on each request. Intended for
// use by Google-written clients.
func (c *notificationChannelGRPCClient) setGoogleClientInfo(keyval ...string) {
- kv := append([]string{"gl-go", versionGo()}, keyval...)
+ kv := append([]string{"gl-go", gax.GoVersion}, keyval...)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}
@@ -410,11 +414,6 @@ func (c *notificationChannelGRPCClient) ListNotificationChannelDescriptors(ctx c
}
func (c *notificationChannelGRPCClient) GetNotificationChannelDescriptor(ctx context.Context, req *monitoringpb.GetNotificationChannelDescriptorRequest, opts ...gax.CallOption) (*monitoringpb.NotificationChannelDescriptor, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -477,11 +476,6 @@ func (c *notificationChannelGRPCClient) ListNotificationChannels(ctx context.Con
}
func (c *notificationChannelGRPCClient) GetNotificationChannel(ctx context.Context, req *monitoringpb.GetNotificationChannelRequest, opts ...gax.CallOption) (*monitoringpb.NotificationChannel, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -499,11 +493,6 @@ func (c *notificationChannelGRPCClient) GetNotificationChannel(ctx context.Conte
}
func (c *notificationChannelGRPCClient) CreateNotificationChannel(ctx context.Context, req *monitoringpb.CreateNotificationChannelRequest, opts ...gax.CallOption) (*monitoringpb.NotificationChannel, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -521,11 +510,6 @@ func (c *notificationChannelGRPCClient) CreateNotificationChannel(ctx context.Co
}
func (c *notificationChannelGRPCClient) UpdateNotificationChannel(ctx context.Context, req *monitoringpb.UpdateNotificationChannelRequest, opts ...gax.CallOption) (*monitoringpb.NotificationChannel, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "notification_channel.name", url.QueryEscape(req.GetNotificationChannel().GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -543,11 +527,6 @@ func (c *notificationChannelGRPCClient) UpdateNotificationChannel(ctx context.Co
}
func (c *notificationChannelGRPCClient) DeleteNotificationChannel(ctx context.Context, req *monitoringpb.DeleteNotificationChannelRequest, opts ...gax.CallOption) error {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -561,11 +540,6 @@ func (c *notificationChannelGRPCClient) DeleteNotificationChannel(ctx context.Co
}
func (c *notificationChannelGRPCClient) SendNotificationChannelVerificationCode(ctx context.Context, req *monitoringpb.SendNotificationChannelVerificationCodeRequest, opts ...gax.CallOption) error {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -579,11 +553,6 @@ func (c *notificationChannelGRPCClient) SendNotificationChannelVerificationCode(
}
func (c *notificationChannelGRPCClient) GetNotificationChannelVerificationCode(ctx context.Context, req *monitoringpb.GetNotificationChannelVerificationCodeRequest, opts ...gax.CallOption) (*monitoringpb.GetNotificationChannelVerificationCodeResponse, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -601,11 +570,6 @@ func (c *notificationChannelGRPCClient) GetNotificationChannelVerificationCode(c
}
func (c *notificationChannelGRPCClient) VerifyNotificationChannel(ctx context.Context, req *monitoringpb.VerifyNotificationChannelRequest, opts ...gax.CallOption) (*monitoringpb.NotificationChannel, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/query_client.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/query_client.go
index 35cd76914ae..5dd3b8f16d5 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/query_client.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/query_client.go
@@ -115,9 +115,6 @@ type queryGRPCClient struct {
// Connection pool of gRPC connections to the service.
connPool gtransport.ConnPool
- // flag to opt out of default deadlines via GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE
- disableDeadlines bool
-
// Points back to the CallOptions field of the containing QueryClient
CallOptions **QueryCallOptions
@@ -144,11 +141,6 @@ func NewQueryClient(ctx context.Context, opts ...option.ClientOption) (*QueryCli
clientOpts = append(clientOpts, hookOpts...)
}
- disableDeadlines, err := checkDisableDeadlines()
- if err != nil {
- return nil, err
- }
-
connPool, err := gtransport.DialPool(ctx, append(clientOpts, opts...)...)
if err != nil {
return nil, err
@@ -156,10 +148,9 @@ func NewQueryClient(ctx context.Context, opts ...option.ClientOption) (*QueryCli
client := QueryClient{CallOptions: defaultQueryCallOptions()}
c := &queryGRPCClient{
- connPool: connPool,
- disableDeadlines: disableDeadlines,
- queryClient: monitoringpb.NewQueryServiceClient(connPool),
- CallOptions: &client.CallOptions,
+ connPool: connPool,
+ queryClient: monitoringpb.NewQueryServiceClient(connPool),
+ CallOptions: &client.CallOptions,
}
c.setGoogleClientInfo()
@@ -180,7 +171,7 @@ func (c *queryGRPCClient) Connection() *grpc.ClientConn {
// the `x-goog-api-client` header passed on each request. Intended for
// use by Google-written clients.
func (c *queryGRPCClient) setGoogleClientInfo(keyval ...string) {
- kv := append([]string{"gl-go", versionGo()}, keyval...)
+ kv := append([]string{"gl-go", gax.GoVersion}, keyval...)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/service_monitoring_client.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/service_monitoring_client.go
index 484acc53a2a..c371e993773 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/service_monitoring_client.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/service_monitoring_client.go
@@ -65,8 +65,11 @@ func defaultServiceMonitoringGRPCClientOptions() []option.ClientOption {
func defaultServiceMonitoringCallOptions() *ServiceMonitoringCallOptions {
return &ServiceMonitoringCallOptions{
- CreateService: []gax.CallOption{},
+ CreateService: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
GetService: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -78,6 +81,7 @@ func defaultServiceMonitoringCallOptions() *ServiceMonitoringCallOptions {
}),
},
ListServices: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -88,8 +92,11 @@ func defaultServiceMonitoringCallOptions() *ServiceMonitoringCallOptions {
})
}),
},
- UpdateService: []gax.CallOption{},
+ UpdateService: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
DeleteService: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -100,8 +107,11 @@ func defaultServiceMonitoringCallOptions() *ServiceMonitoringCallOptions {
})
}),
},
- CreateServiceLevelObjective: []gax.CallOption{},
+ CreateServiceLevelObjective: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
GetServiceLevelObjective: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -113,6 +123,7 @@ func defaultServiceMonitoringCallOptions() *ServiceMonitoringCallOptions {
}),
},
ListServiceLevelObjectives: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -123,8 +134,11 @@ func defaultServiceMonitoringCallOptions() *ServiceMonitoringCallOptions {
})
}),
},
- UpdateServiceLevelObjective: []gax.CallOption{},
+ UpdateServiceLevelObjective: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
DeleteServiceLevelObjective: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -250,9 +264,6 @@ type serviceMonitoringGRPCClient struct {
// Connection pool of gRPC connections to the service.
connPool gtransport.ConnPool
- // flag to opt out of default deadlines via GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE
- disableDeadlines bool
-
// Points back to the CallOptions field of the containing ServiceMonitoringClient
CallOptions **ServiceMonitoringCallOptions
@@ -280,11 +291,6 @@ func NewServiceMonitoringClient(ctx context.Context, opts ...option.ClientOption
clientOpts = append(clientOpts, hookOpts...)
}
- disableDeadlines, err := checkDisableDeadlines()
- if err != nil {
- return nil, err
- }
-
connPool, err := gtransport.DialPool(ctx, append(clientOpts, opts...)...)
if err != nil {
return nil, err
@@ -293,7 +299,6 @@ func NewServiceMonitoringClient(ctx context.Context, opts ...option.ClientOption
c := &serviceMonitoringGRPCClient{
connPool: connPool,
- disableDeadlines: disableDeadlines,
serviceMonitoringClient: monitoringpb.NewServiceMonitoringServiceClient(connPool),
CallOptions: &client.CallOptions,
}
@@ -316,7 +321,7 @@ func (c *serviceMonitoringGRPCClient) Connection() *grpc.ClientConn {
// the `x-goog-api-client` header passed on each request. Intended for
// use by Google-written clients.
func (c *serviceMonitoringGRPCClient) setGoogleClientInfo(keyval ...string) {
- kv := append([]string{"gl-go", versionGo()}, keyval...)
+ kv := append([]string{"gl-go", gax.GoVersion}, keyval...)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}
@@ -328,11 +333,6 @@ func (c *serviceMonitoringGRPCClient) Close() error {
}
func (c *serviceMonitoringGRPCClient) CreateService(ctx context.Context, req *monitoringpb.CreateServiceRequest, opts ...gax.CallOption) (*monitoringpb.Service, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "parent", url.QueryEscape(req.GetParent())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -350,11 +350,6 @@ func (c *serviceMonitoringGRPCClient) CreateService(ctx context.Context, req *mo
}
func (c *serviceMonitoringGRPCClient) GetService(ctx context.Context, req *monitoringpb.GetServiceRequest, opts ...gax.CallOption) (*monitoringpb.Service, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -417,11 +412,6 @@ func (c *serviceMonitoringGRPCClient) ListServices(ctx context.Context, req *mon
}
func (c *serviceMonitoringGRPCClient) UpdateService(ctx context.Context, req *monitoringpb.UpdateServiceRequest, opts ...gax.CallOption) (*monitoringpb.Service, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "service.name", url.QueryEscape(req.GetService().GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -439,11 +429,6 @@ func (c *serviceMonitoringGRPCClient) UpdateService(ctx context.Context, req *mo
}
func (c *serviceMonitoringGRPCClient) DeleteService(ctx context.Context, req *monitoringpb.DeleteServiceRequest, opts ...gax.CallOption) error {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -457,11 +442,6 @@ func (c *serviceMonitoringGRPCClient) DeleteService(ctx context.Context, req *mo
}
func (c *serviceMonitoringGRPCClient) CreateServiceLevelObjective(ctx context.Context, req *monitoringpb.CreateServiceLevelObjectiveRequest, opts ...gax.CallOption) (*monitoringpb.ServiceLevelObjective, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "parent", url.QueryEscape(req.GetParent())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -479,11 +459,6 @@ func (c *serviceMonitoringGRPCClient) CreateServiceLevelObjective(ctx context.Co
}
func (c *serviceMonitoringGRPCClient) GetServiceLevelObjective(ctx context.Context, req *monitoringpb.GetServiceLevelObjectiveRequest, opts ...gax.CallOption) (*monitoringpb.ServiceLevelObjective, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -546,11 +521,6 @@ func (c *serviceMonitoringGRPCClient) ListServiceLevelObjectives(ctx context.Con
}
func (c *serviceMonitoringGRPCClient) UpdateServiceLevelObjective(ctx context.Context, req *monitoringpb.UpdateServiceLevelObjectiveRequest, opts ...gax.CallOption) (*monitoringpb.ServiceLevelObjective, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "service_level_objective.name", url.QueryEscape(req.GetServiceLevelObjective().GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -568,11 +538,6 @@ func (c *serviceMonitoringGRPCClient) UpdateServiceLevelObjective(ctx context.Co
}
func (c *serviceMonitoringGRPCClient) DeleteServiceLevelObjective(ctx context.Context, req *monitoringpb.DeleteServiceLevelObjectiveRequest, opts ...gax.CallOption) error {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/snooze_client.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/snooze_client.go
index 3f8a70b68b2..6142e667156 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/snooze_client.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/snooze_client.go
@@ -59,8 +59,11 @@ func defaultSnoozeGRPCClientOptions() []option.ClientOption {
func defaultSnoozeCallOptions() *SnoozeCallOptions {
return &SnoozeCallOptions{
- CreateSnooze: []gax.CallOption{},
+ CreateSnooze: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
ListSnoozes: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -72,6 +75,7 @@ func defaultSnoozeCallOptions() *SnoozeCallOptions {
}),
},
GetSnooze: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -82,7 +86,9 @@ func defaultSnoozeCallOptions() *SnoozeCallOptions {
})
}),
},
- UpdateSnooze: []gax.CallOption{},
+ UpdateSnooze: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
}
}
@@ -165,9 +171,6 @@ type snoozeGRPCClient struct {
// Connection pool of gRPC connections to the service.
connPool gtransport.ConnPool
- // flag to opt out of default deadlines via GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE
- disableDeadlines bool
-
// Points back to the CallOptions field of the containing SnoozeClient
CallOptions **SnoozeCallOptions
@@ -194,11 +197,6 @@ func NewSnoozeClient(ctx context.Context, opts ...option.ClientOption) (*SnoozeC
clientOpts = append(clientOpts, hookOpts...)
}
- disableDeadlines, err := checkDisableDeadlines()
- if err != nil {
- return nil, err
- }
-
connPool, err := gtransport.DialPool(ctx, append(clientOpts, opts...)...)
if err != nil {
return nil, err
@@ -206,10 +204,9 @@ func NewSnoozeClient(ctx context.Context, opts ...option.ClientOption) (*SnoozeC
client := SnoozeClient{CallOptions: defaultSnoozeCallOptions()}
c := &snoozeGRPCClient{
- connPool: connPool,
- disableDeadlines: disableDeadlines,
- snoozeClient: monitoringpb.NewSnoozeServiceClient(connPool),
- CallOptions: &client.CallOptions,
+ connPool: connPool,
+ snoozeClient: monitoringpb.NewSnoozeServiceClient(connPool),
+ CallOptions: &client.CallOptions,
}
c.setGoogleClientInfo()
@@ -230,7 +227,7 @@ func (c *snoozeGRPCClient) Connection() *grpc.ClientConn {
// the `x-goog-api-client` header passed on each request. Intended for
// use by Google-written clients.
func (c *snoozeGRPCClient) setGoogleClientInfo(keyval ...string) {
- kv := append([]string{"gl-go", versionGo()}, keyval...)
+ kv := append([]string{"gl-go", gax.GoVersion}, keyval...)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}
@@ -242,11 +239,6 @@ func (c *snoozeGRPCClient) Close() error {
}
func (c *snoozeGRPCClient) CreateSnooze(ctx context.Context, req *monitoringpb.CreateSnoozeRequest, opts ...gax.CallOption) (*monitoringpb.Snooze, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "parent", url.QueryEscape(req.GetParent())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -309,11 +301,6 @@ func (c *snoozeGRPCClient) ListSnoozes(ctx context.Context, req *monitoringpb.Li
}
func (c *snoozeGRPCClient) GetSnooze(ctx context.Context, req *monitoringpb.GetSnoozeRequest, opts ...gax.CallOption) (*monitoringpb.Snooze, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -331,11 +318,6 @@ func (c *snoozeGRPCClient) GetSnooze(ctx context.Context, req *monitoringpb.GetS
}
func (c *snoozeGRPCClient) UpdateSnooze(ctx context.Context, req *monitoringpb.UpdateSnoozeRequest, opts ...gax.CallOption) (*monitoringpb.Snooze, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "snooze.name", url.QueryEscape(req.GetSnooze().GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
diff --git a/vendor/cloud.google.com/go/monitoring/apiv3/v2/uptime_check_client.go b/vendor/cloud.google.com/go/monitoring/apiv3/v2/uptime_check_client.go
index b968c5c07d2..6d8f6feddb9 100644
--- a/vendor/cloud.google.com/go/monitoring/apiv3/v2/uptime_check_client.go
+++ b/vendor/cloud.google.com/go/monitoring/apiv3/v2/uptime_check_client.go
@@ -62,6 +62,7 @@ func defaultUptimeCheckGRPCClientOptions() []option.ClientOption {
func defaultUptimeCheckCallOptions() *UptimeCheckCallOptions {
return &UptimeCheckCallOptions{
ListUptimeCheckConfigs: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -73,6 +74,7 @@ func defaultUptimeCheckCallOptions() *UptimeCheckCallOptions {
}),
},
GetUptimeCheckConfig: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -83,9 +85,14 @@ func defaultUptimeCheckCallOptions() *UptimeCheckCallOptions {
})
}),
},
- CreateUptimeCheckConfig: []gax.CallOption{},
- UpdateUptimeCheckConfig: []gax.CallOption{},
+ CreateUptimeCheckConfig: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
+ UpdateUptimeCheckConfig: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
+ },
DeleteUptimeCheckConfig: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -97,6 +104,7 @@ func defaultUptimeCheckCallOptions() *UptimeCheckCallOptions {
}),
},
ListUptimeCheckIps: []gax.CallOption{
+ gax.WithTimeout(30000 * time.Millisecond),
gax.WithRetry(func() gax.Retryer {
return gax.OnCodes([]codes.Code{
codes.Unavailable,
@@ -208,9 +216,6 @@ type uptimeCheckGRPCClient struct {
// Connection pool of gRPC connections to the service.
connPool gtransport.ConnPool
- // flag to opt out of default deadlines via GOOGLE_API_GO_EXPERIMENTAL_DISABLE_DEFAULT_DEADLINE
- disableDeadlines bool
-
// Points back to the CallOptions field of the containing UptimeCheckClient
CallOptions **UptimeCheckCallOptions
@@ -242,11 +247,6 @@ func NewUptimeCheckClient(ctx context.Context, opts ...option.ClientOption) (*Up
clientOpts = append(clientOpts, hookOpts...)
}
- disableDeadlines, err := checkDisableDeadlines()
- if err != nil {
- return nil, err
- }
-
connPool, err := gtransport.DialPool(ctx, append(clientOpts, opts...)...)
if err != nil {
return nil, err
@@ -255,7 +255,6 @@ func NewUptimeCheckClient(ctx context.Context, opts ...option.ClientOption) (*Up
c := &uptimeCheckGRPCClient{
connPool: connPool,
- disableDeadlines: disableDeadlines,
uptimeCheckClient: monitoringpb.NewUptimeCheckServiceClient(connPool),
CallOptions: &client.CallOptions,
}
@@ -278,7 +277,7 @@ func (c *uptimeCheckGRPCClient) Connection() *grpc.ClientConn {
// the `x-goog-api-client` header passed on each request. Intended for
// use by Google-written clients.
func (c *uptimeCheckGRPCClient) setGoogleClientInfo(keyval ...string) {
- kv := append([]string{"gl-go", versionGo()}, keyval...)
+ kv := append([]string{"gl-go", gax.GoVersion}, keyval...)
kv = append(kv, "gapic", getVersionClient(), "gax", gax.Version, "grpc", grpc.Version)
c.xGoogMetadata = metadata.Pairs("x-goog-api-client", gax.XGoogHeader(kv...))
}
@@ -335,11 +334,6 @@ func (c *uptimeCheckGRPCClient) ListUptimeCheckConfigs(ctx context.Context, req
}
func (c *uptimeCheckGRPCClient) GetUptimeCheckConfig(ctx context.Context, req *monitoringpb.GetUptimeCheckConfigRequest, opts ...gax.CallOption) (*monitoringpb.UptimeCheckConfig, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -357,11 +351,6 @@ func (c *uptimeCheckGRPCClient) GetUptimeCheckConfig(ctx context.Context, req *m
}
func (c *uptimeCheckGRPCClient) CreateUptimeCheckConfig(ctx context.Context, req *monitoringpb.CreateUptimeCheckConfigRequest, opts ...gax.CallOption) (*monitoringpb.UptimeCheckConfig, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "parent", url.QueryEscape(req.GetParent())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -379,11 +368,6 @@ func (c *uptimeCheckGRPCClient) CreateUptimeCheckConfig(ctx context.Context, req
}
func (c *uptimeCheckGRPCClient) UpdateUptimeCheckConfig(ctx context.Context, req *monitoringpb.UpdateUptimeCheckConfigRequest, opts ...gax.CallOption) (*monitoringpb.UptimeCheckConfig, error) {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "uptime_check_config.name", url.QueryEscape(req.GetUptimeCheckConfig().GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
@@ -401,11 +385,6 @@ func (c *uptimeCheckGRPCClient) UpdateUptimeCheckConfig(ctx context.Context, req
}
func (c *uptimeCheckGRPCClient) DeleteUptimeCheckConfig(ctx context.Context, req *monitoringpb.DeleteUptimeCheckConfigRequest, opts ...gax.CallOption) error {
- if _, ok := ctx.Deadline(); !ok && !c.disableDeadlines {
- cctx, cancel := context.WithTimeout(ctx, 30000*time.Millisecond)
- defer cancel()
- ctx = cctx
- }
md := metadata.Pairs("x-goog-request-params", fmt.Sprintf("%s=%v", "name", url.QueryEscape(req.GetName())))
ctx = insertMetadata(ctx, c.xGoogMetadata, md)
diff --git a/vendor/cloud.google.com/go/monitoring/internal/version.go b/vendor/cloud.google.com/go/monitoring/internal/version.go
index 43a2a84ef8e..7dd6a0aa86f 100644
--- a/vendor/cloud.google.com/go/monitoring/internal/version.go
+++ b/vendor/cloud.google.com/go/monitoring/internal/version.go
@@ -15,4 +15,4 @@
package internal
// Version is the current tagged release of the library.
-const Version = "1.15.0"
+const Version = "1.15.1"
diff --git a/vendor/dario.cat/mergo/.deepsource.toml b/vendor/dario.cat/mergo/.deepsource.toml
new file mode 100644
index 00000000000..a8bc979e02e
--- /dev/null
+++ b/vendor/dario.cat/mergo/.deepsource.toml
@@ -0,0 +1,12 @@
+version = 1
+
+test_patterns = [
+ "*_test.go"
+]
+
+[[analyzers]]
+name = "go"
+enabled = true
+
+ [analyzers.meta]
+ import_path = "dario.cat/mergo"
\ No newline at end of file
diff --git a/vendor/dario.cat/mergo/.gitignore b/vendor/dario.cat/mergo/.gitignore
new file mode 100644
index 00000000000..529c3412ba9
--- /dev/null
+++ b/vendor/dario.cat/mergo/.gitignore
@@ -0,0 +1,33 @@
+#### joe made this: http://goel.io/joe
+
+#### go ####
+# Binaries for programs and plugins
+*.exe
+*.dll
+*.so
+*.dylib
+
+# Test binary, build with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
+.glide/
+
+#### vim ####
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+*~
+# Auto-generated tag files
+tags
diff --git a/vendor/dario.cat/mergo/.travis.yml b/vendor/dario.cat/mergo/.travis.yml
new file mode 100644
index 00000000000..d324c43ba4d
--- /dev/null
+++ b/vendor/dario.cat/mergo/.travis.yml
@@ -0,0 +1,12 @@
+language: go
+arch:
+ - amd64
+ - ppc64le
+install:
+ - go get -t
+ - go get golang.org/x/tools/cmd/cover
+ - go get github.com/mattn/goveralls
+script:
+ - go test -race -v ./...
+after_script:
+ - $HOME/gopath/bin/goveralls -service=travis-ci -repotoken $COVERALLS_TOKEN
diff --git a/vendor/dario.cat/mergo/CODE_OF_CONDUCT.md b/vendor/dario.cat/mergo/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000000..469b44907a0
--- /dev/null
+++ b/vendor/dario.cat/mergo/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at i@dario.im. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/vendor/github.com/imdario/mergo/CONTRIBUTING.md b/vendor/dario.cat/mergo/CONTRIBUTING.md
similarity index 100%
rename from vendor/github.com/imdario/mergo/CONTRIBUTING.md
rename to vendor/dario.cat/mergo/CONTRIBUTING.md
diff --git a/vendor/dario.cat/mergo/LICENSE b/vendor/dario.cat/mergo/LICENSE
new file mode 100644
index 00000000000..686680298da
--- /dev/null
+++ b/vendor/dario.cat/mergo/LICENSE
@@ -0,0 +1,28 @@
+Copyright (c) 2013 Dario Castañé. All rights reserved.
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/dario.cat/mergo/README.md b/vendor/dario.cat/mergo/README.md
new file mode 100644
index 00000000000..7d0cf9f32af
--- /dev/null
+++ b/vendor/dario.cat/mergo/README.md
@@ -0,0 +1,248 @@
+# Mergo
+
+[![GitHub release][5]][6]
+[![GoCard][7]][8]
+[![Test status][1]][2]
+[![OpenSSF Scorecard][21]][22]
+[![OpenSSF Best Practices][19]][20]
+[![Coverage status][9]][10]
+[![Sourcegraph][11]][12]
+[![FOSSA status][13]][14]
+
+[![GoDoc][3]][4]
+[![Become my sponsor][15]][16]
+[![Tidelift][17]][18]
+
+[1]: https://github.com/imdario/mergo/workflows/tests/badge.svg?branch=master
+[2]: https://github.com/imdario/mergo/actions/workflows/tests.yml
+[3]: https://godoc.org/github.com/imdario/mergo?status.svg
+[4]: https://godoc.org/github.com/imdario/mergo
+[5]: https://img.shields.io/github/release/imdario/mergo.svg
+[6]: https://github.com/imdario/mergo/releases
+[7]: https://goreportcard.com/badge/imdario/mergo
+[8]: https://goreportcard.com/report/github.com/imdario/mergo
+[9]: https://coveralls.io/repos/github/imdario/mergo/badge.svg?branch=master
+[10]: https://coveralls.io/github/imdario/mergo?branch=master
+[11]: https://sourcegraph.com/github.com/imdario/mergo/-/badge.svg
+[12]: https://sourcegraph.com/github.com/imdario/mergo?badge
+[13]: https://app.fossa.io/api/projects/git%2Bgithub.com%2Fimdario%2Fmergo.svg?type=shield
+[14]: https://app.fossa.io/projects/git%2Bgithub.com%2Fimdario%2Fmergo?ref=badge_shield
+[15]: https://img.shields.io/github/sponsors/imdario
+[16]: https://github.com/sponsors/imdario
+[17]: https://tidelift.com/badges/package/go/github.com%2Fimdario%2Fmergo
+[18]: https://tidelift.com/subscription/pkg/go-github.com-imdario-mergo
+[19]: https://bestpractices.coreinfrastructure.org/projects/7177/badge
+[20]: https://bestpractices.coreinfrastructure.org/projects/7177
+[21]: https://api.securityscorecards.dev/projects/github.com/imdario/mergo/badge
+[22]: https://api.securityscorecards.dev/projects/github.com/imdario/mergo
+
+A helper to merge structs and maps in Golang. Useful for configuration default values, avoiding messy if-statements.
+
+Mergo merges same-type structs and maps by setting default values in zero-value fields. Mergo won't merge unexported (private) fields. It will do recursively any exported one. It also won't merge structs inside maps (because they are not addressable using Go reflection).
+
+Also a lovely [comune](http://en.wikipedia.org/wiki/Mergo) (municipality) in the Province of Ancona in the Italian region of Marche.
+
+## Status
+
+It is ready for production use. [It is used in several projects by Docker, Google, The Linux Foundation, VMWare, Shopify, Microsoft, etc](https://github.com/imdario/mergo#mergo-in-the-wild).
+
+### Important notes
+
+#### 1.0.0
+
+In [1.0.0](//github.com/imdario/mergo/releases/tag/1.0.0) Mergo moves to a vanity URL `dario.cat/mergo`.
+
+#### 0.3.9
+
+Please keep in mind that a problematic PR broke [0.3.9](//github.com/imdario/mergo/releases/tag/0.3.9). I reverted it in [0.3.10](//github.com/imdario/mergo/releases/tag/0.3.10), and I consider it stable but not bug-free. Also, this version adds support for go modules.
+
+Keep in mind that in [0.3.2](//github.com/imdario/mergo/releases/tag/0.3.2), Mergo changed `Merge()`and `Map()` signatures to support [transformers](#transformers). I added an optional/variadic argument so that it won't break the existing code.
+
+If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with ```go get -u dario.cat/mergo```. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
+
+### Donations
+
+If Mergo is useful to you, consider buying me a coffee, a beer, or making a monthly donation to allow me to keep building great free software. :heart_eyes:
+
+
+
+
+
+### Mergo in the wild
+
+- [moby/moby](https://github.com/moby/moby)
+- [kubernetes/kubernetes](https://github.com/kubernetes/kubernetes)
+- [vmware/dispatch](https://github.com/vmware/dispatch)
+- [Shopify/themekit](https://github.com/Shopify/themekit)
+- [imdario/zas](https://github.com/imdario/zas)
+- [matcornic/hermes](https://github.com/matcornic/hermes)
+- [OpenBazaar/openbazaar-go](https://github.com/OpenBazaar/openbazaar-go)
+- [kataras/iris](https://github.com/kataras/iris)
+- [michaelsauter/crane](https://github.com/michaelsauter/crane)
+- [go-task/task](https://github.com/go-task/task)
+- [sensu/uchiwa](https://github.com/sensu/uchiwa)
+- [ory/hydra](https://github.com/ory/hydra)
+- [sisatech/vcli](https://github.com/sisatech/vcli)
+- [dairycart/dairycart](https://github.com/dairycart/dairycart)
+- [projectcalico/felix](https://github.com/projectcalico/felix)
+- [resin-os/balena](https://github.com/resin-os/balena)
+- [go-kivik/kivik](https://github.com/go-kivik/kivik)
+- [Telefonica/govice](https://github.com/Telefonica/govice)
+- [supergiant/supergiant](supergiant/supergiant)
+- [SergeyTsalkov/brooce](https://github.com/SergeyTsalkov/brooce)
+- [soniah/dnsmadeeasy](https://github.com/soniah/dnsmadeeasy)
+- [ohsu-comp-bio/funnel](https://github.com/ohsu-comp-bio/funnel)
+- [EagerIO/Stout](https://github.com/EagerIO/Stout)
+- [lynndylanhurley/defsynth-api](https://github.com/lynndylanhurley/defsynth-api)
+- [russross/canvasassignments](https://github.com/russross/canvasassignments)
+- [rdegges/cryptly-api](https://github.com/rdegges/cryptly-api)
+- [casualjim/exeggutor](https://github.com/casualjim/exeggutor)
+- [divshot/gitling](https://github.com/divshot/gitling)
+- [RWJMurphy/gorl](https://github.com/RWJMurphy/gorl)
+- [andrerocker/deploy42](https://github.com/andrerocker/deploy42)
+- [elwinar/rambler](https://github.com/elwinar/rambler)
+- [tmaiaroto/gopartman](https://github.com/tmaiaroto/gopartman)
+- [jfbus/impressionist](https://github.com/jfbus/impressionist)
+- [Jmeyering/zealot](https://github.com/Jmeyering/zealot)
+- [godep-migrator/rigger-host](https://github.com/godep-migrator/rigger-host)
+- [Dronevery/MultiwaySwitch-Go](https://github.com/Dronevery/MultiwaySwitch-Go)
+- [thoas/picfit](https://github.com/thoas/picfit)
+- [mantasmatelis/whooplist-server](https://github.com/mantasmatelis/whooplist-server)
+- [jnuthong/item_search](https://github.com/jnuthong/item_search)
+- [bukalapak/snowboard](https://github.com/bukalapak/snowboard)
+- [containerssh/containerssh](https://github.com/containerssh/containerssh)
+- [goreleaser/goreleaser](https://github.com/goreleaser/goreleaser)
+- [tjpnz/structbot](https://github.com/tjpnz/structbot)
+
+## Install
+
+ go get dario.cat/mergo
+
+ // use in your .go code
+ import (
+ "dario.cat/mergo"
+ )
+
+## Usage
+
+You can only merge same-type structs with exported fields initialized as zero value of their type and same-types maps. Mergo won't merge unexported (private) fields but will do recursively any exported one. It won't merge empty structs value as [they are zero values](https://golang.org/ref/spec#The_zero_value) too. Also, maps will be merged recursively except for structs inside maps (because they are not addressable using Go reflection).
+
+```go
+if err := mergo.Merge(&dst, src); err != nil {
+ // ...
+}
+```
+
+Also, you can merge overwriting values using the transformer `WithOverride`.
+
+```go
+if err := mergo.Merge(&dst, src, mergo.WithOverride); err != nil {
+ // ...
+}
+```
+
+Additionally, you can map a `map[string]interface{}` to a struct (and otherwise, from struct to map), following the same restrictions as in `Merge()`. Keys are capitalized to find each corresponding exported field.
+
+```go
+if err := mergo.Map(&dst, srcMap); err != nil {
+ // ...
+}
+```
+
+Warning: if you map a struct to map, it won't do it recursively. Don't expect Mergo to map struct members of your struct as `map[string]interface{}`. They will be just assigned as values.
+
+Here is a nice example:
+
+```go
+package main
+
+import (
+ "fmt"
+ "dario.cat/mergo"
+)
+
+type Foo struct {
+ A string
+ B int64
+}
+
+func main() {
+ src := Foo{
+ A: "one",
+ B: 2,
+ }
+ dest := Foo{
+ A: "two",
+ }
+ mergo.Merge(&dest, src)
+ fmt.Println(dest)
+ // Will print
+ // {two 2}
+}
+```
+
+Note: if test are failing due missing package, please execute:
+
+ go get gopkg.in/yaml.v3
+
+### Transformers
+
+Transformers allow to merge specific types differently than in the default behavior. In other words, now you can customize how some types are merged. For example, `time.Time` is a struct; it doesn't have zero value but IsZero can return true because it has fields with zero value. How can we merge a non-zero `time.Time`?
+
+```go
+package main
+
+import (
+ "fmt"
+ "dario.cat/mergo"
+ "reflect"
+ "time"
+)
+
+type timeTransformer struct {
+}
+
+func (t timeTransformer) Transformer(typ reflect.Type) func(dst, src reflect.Value) error {
+ if typ == reflect.TypeOf(time.Time{}) {
+ return func(dst, src reflect.Value) error {
+ if dst.CanSet() {
+ isZero := dst.MethodByName("IsZero")
+ result := isZero.Call([]reflect.Value{})
+ if result[0].Bool() {
+ dst.Set(src)
+ }
+ }
+ return nil
+ }
+ }
+ return nil
+}
+
+type Snapshot struct {
+ Time time.Time
+ // ...
+}
+
+func main() {
+ src := Snapshot{time.Now()}
+ dest := Snapshot{}
+ mergo.Merge(&dest, src, mergo.WithTransformers(timeTransformer{}))
+ fmt.Println(dest)
+ // Will print
+ // { 2018-01-12 01:15:00 +0000 UTC m=+0.000000001 }
+}
+```
+
+## Contact me
+
+If I can help you, you have an idea or you are using Mergo in your projects, don't hesitate to drop me a line (or a pull request): [@im_dario](https://twitter.com/im_dario)
+
+## About
+
+Written by [Dario Castañé](http://dario.im).
+
+## License
+
+[BSD 3-Clause](http://opensource.org/licenses/BSD-3-Clause) license, as [Go language](http://golang.org/LICENSE).
+
+[](https://app.fossa.io/projects/git%2Bgithub.com%2Fimdario%2Fmergo?ref=badge_large)
diff --git a/vendor/github.com/imdario/mergo/SECURITY.md b/vendor/dario.cat/mergo/SECURITY.md
similarity index 100%
rename from vendor/github.com/imdario/mergo/SECURITY.md
rename to vendor/dario.cat/mergo/SECURITY.md
diff --git a/vendor/dario.cat/mergo/doc.go b/vendor/dario.cat/mergo/doc.go
new file mode 100644
index 00000000000..7d96ec0546d
--- /dev/null
+++ b/vendor/dario.cat/mergo/doc.go
@@ -0,0 +1,148 @@
+// Copyright 2013 Dario Castañé. All rights reserved.
+// Copyright 2009 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.
+
+/*
+A helper to merge structs and maps in Golang. Useful for configuration default values, avoiding messy if-statements.
+
+Mergo merges same-type structs and maps by setting default values in zero-value fields. Mergo won't merge unexported (private) fields. It will do recursively any exported one. It also won't merge structs inside maps (because they are not addressable using Go reflection).
+
+# Status
+
+It is ready for production use. It is used in several projects by Docker, Google, The Linux Foundation, VMWare, Shopify, etc.
+
+# Important notes
+
+1.0.0
+
+In 1.0.0 Mergo moves to a vanity URL `dario.cat/mergo`.
+
+0.3.9
+
+Please keep in mind that a problematic PR broke 0.3.9. We reverted it in 0.3.10. We consider 0.3.10 as stable but not bug-free. . Also, this version adds suppot for go modules.
+
+Keep in mind that in 0.3.2, Mergo changed Merge() and Map() signatures to support transformers. We added an optional/variadic argument so that it won't break the existing code.
+
+If you were using Mergo before April 6th, 2015, please check your project works as intended after updating your local copy with go get -u dario.cat/mergo. I apologize for any issue caused by its previous behavior and any future bug that Mergo could cause in existing projects after the change (release 0.2.0).
+
+# Install
+
+Do your usual installation procedure:
+
+ go get dario.cat/mergo
+
+ // use in your .go code
+ import (
+ "dario.cat/mergo"
+ )
+
+# Usage
+
+You can only merge same-type structs with exported fields initialized as zero value of their type and same-types maps. Mergo won't merge unexported (private) fields but will do recursively any exported one. It won't merge empty structs value as they are zero values too. Also, maps will be merged recursively except for structs inside maps (because they are not addressable using Go reflection).
+
+ if err := mergo.Merge(&dst, src); err != nil {
+ // ...
+ }
+
+Also, you can merge overwriting values using the transformer WithOverride.
+
+ if err := mergo.Merge(&dst, src, mergo.WithOverride); err != nil {
+ // ...
+ }
+
+Additionally, you can map a map[string]interface{} to a struct (and otherwise, from struct to map), following the same restrictions as in Merge(). Keys are capitalized to find each corresponding exported field.
+
+ if err := mergo.Map(&dst, srcMap); err != nil {
+ // ...
+ }
+
+Warning: if you map a struct to map, it won't do it recursively. Don't expect Mergo to map struct members of your struct as map[string]interface{}. They will be just assigned as values.
+
+Here is a nice example:
+
+ package main
+
+ import (
+ "fmt"
+ "dario.cat/mergo"
+ )
+
+ type Foo struct {
+ A string
+ B int64
+ }
+
+ func main() {
+ src := Foo{
+ A: "one",
+ B: 2,
+ }
+ dest := Foo{
+ A: "two",
+ }
+ mergo.Merge(&dest, src)
+ fmt.Println(dest)
+ // Will print
+ // {two 2}
+ }
+
+# Transformers
+
+Transformers allow to merge specific types differently than in the default behavior. In other words, now you can customize how some types are merged. For example, time.Time is a struct; it doesn't have zero value but IsZero can return true because it has fields with zero value. How can we merge a non-zero time.Time?
+
+ package main
+
+ import (
+ "fmt"
+ "dario.cat/mergo"
+ "reflect"
+ "time"
+ )
+
+ type timeTransformer struct {
+ }
+
+ func (t timeTransformer) Transformer(typ reflect.Type) func(dst, src reflect.Value) error {
+ if typ == reflect.TypeOf(time.Time{}) {
+ return func(dst, src reflect.Value) error {
+ if dst.CanSet() {
+ isZero := dst.MethodByName("IsZero")
+ result := isZero.Call([]reflect.Value{})
+ if result[0].Bool() {
+ dst.Set(src)
+ }
+ }
+ return nil
+ }
+ }
+ return nil
+ }
+
+ type Snapshot struct {
+ Time time.Time
+ // ...
+ }
+
+ func main() {
+ src := Snapshot{time.Now()}
+ dest := Snapshot{}
+ mergo.Merge(&dest, src, mergo.WithTransformers(timeTransformer{}))
+ fmt.Println(dest)
+ // Will print
+ // { 2018-01-12 01:15:00 +0000 UTC m=+0.000000001 }
+ }
+
+# Contact me
+
+If I can help you, you have an idea or you are using Mergo in your projects, don't hesitate to drop me a line (or a pull request): https://twitter.com/im_dario
+
+# About
+
+Written by Dario Castañé: https://da.rio.hn
+
+# License
+
+BSD 3-Clause license, as Go language.
+*/
+package mergo
diff --git a/vendor/dario.cat/mergo/map.go b/vendor/dario.cat/mergo/map.go
new file mode 100644
index 00000000000..b50d5c2a4e7
--- /dev/null
+++ b/vendor/dario.cat/mergo/map.go
@@ -0,0 +1,178 @@
+// Copyright 2014 Dario Castañé. All rights reserved.
+// Copyright 2009 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.
+
+// Based on src/pkg/reflect/deepequal.go from official
+// golang's stdlib.
+
+package mergo
+
+import (
+ "fmt"
+ "reflect"
+ "unicode"
+ "unicode/utf8"
+)
+
+func changeInitialCase(s string, mapper func(rune) rune) string {
+ if s == "" {
+ return s
+ }
+ r, n := utf8.DecodeRuneInString(s)
+ return string(mapper(r)) + s[n:]
+}
+
+func isExported(field reflect.StructField) bool {
+ r, _ := utf8.DecodeRuneInString(field.Name)
+ return r >= 'A' && r <= 'Z'
+}
+
+// Traverses recursively both values, assigning src's fields values to dst.
+// The map argument tracks comparisons that have already been seen, which allows
+// short circuiting on recursive types.
+func deepMap(dst, src reflect.Value, visited map[uintptr]*visit, depth int, config *Config) (err error) {
+ overwrite := config.Overwrite
+ if dst.CanAddr() {
+ addr := dst.UnsafeAddr()
+ h := 17 * addr
+ seen := visited[h]
+ typ := dst.Type()
+ for p := seen; p != nil; p = p.next {
+ if p.ptr == addr && p.typ == typ {
+ return nil
+ }
+ }
+ // Remember, remember...
+ visited[h] = &visit{typ, seen, addr}
+ }
+ zeroValue := reflect.Value{}
+ switch dst.Kind() {
+ case reflect.Map:
+ dstMap := dst.Interface().(map[string]interface{})
+ for i, n := 0, src.NumField(); i < n; i++ {
+ srcType := src.Type()
+ field := srcType.Field(i)
+ if !isExported(field) {
+ continue
+ }
+ fieldName := field.Name
+ fieldName = changeInitialCase(fieldName, unicode.ToLower)
+ if v, ok := dstMap[fieldName]; !ok || (isEmptyValue(reflect.ValueOf(v), !config.ShouldNotDereference) || overwrite) {
+ dstMap[fieldName] = src.Field(i).Interface()
+ }
+ }
+ case reflect.Ptr:
+ if dst.IsNil() {
+ v := reflect.New(dst.Type().Elem())
+ dst.Set(v)
+ }
+ dst = dst.Elem()
+ fallthrough
+ case reflect.Struct:
+ srcMap := src.Interface().(map[string]interface{})
+ for key := range srcMap {
+ config.overwriteWithEmptyValue = true
+ srcValue := srcMap[key]
+ fieldName := changeInitialCase(key, unicode.ToUpper)
+ dstElement := dst.FieldByName(fieldName)
+ if dstElement == zeroValue {
+ // We discard it because the field doesn't exist.
+ continue
+ }
+ srcElement := reflect.ValueOf(srcValue)
+ dstKind := dstElement.Kind()
+ srcKind := srcElement.Kind()
+ if srcKind == reflect.Ptr && dstKind != reflect.Ptr {
+ srcElement = srcElement.Elem()
+ srcKind = reflect.TypeOf(srcElement.Interface()).Kind()
+ } else if dstKind == reflect.Ptr {
+ // Can this work? I guess it can't.
+ if srcKind != reflect.Ptr && srcElement.CanAddr() {
+ srcPtr := srcElement.Addr()
+ srcElement = reflect.ValueOf(srcPtr)
+ srcKind = reflect.Ptr
+ }
+ }
+
+ if !srcElement.IsValid() {
+ continue
+ }
+ if srcKind == dstKind {
+ if err = deepMerge(dstElement, srcElement, visited, depth+1, config); err != nil {
+ return
+ }
+ } else if dstKind == reflect.Interface && dstElement.Kind() == reflect.Interface {
+ if err = deepMerge(dstElement, srcElement, visited, depth+1, config); err != nil {
+ return
+ }
+ } else if srcKind == reflect.Map {
+ if err = deepMap(dstElement, srcElement, visited, depth+1, config); err != nil {
+ return
+ }
+ } else {
+ return fmt.Errorf("type mismatch on %s field: found %v, expected %v", fieldName, srcKind, dstKind)
+ }
+ }
+ }
+ return
+}
+
+// Map sets fields' values in dst from src.
+// src can be a map with string keys or a struct. dst must be the opposite:
+// if src is a map, dst must be a valid pointer to struct. If src is a struct,
+// dst must be map[string]interface{}.
+// It won't merge unexported (private) fields and will do recursively
+// any exported field.
+// If dst is a map, keys will be src fields' names in lower camel case.
+// Missing key in src that doesn't match a field in dst will be skipped. This
+// doesn't apply if dst is a map.
+// This is separated method from Merge because it is cleaner and it keeps sane
+// semantics: merging equal types, mapping different (restricted) types.
+func Map(dst, src interface{}, opts ...func(*Config)) error {
+ return _map(dst, src, opts...)
+}
+
+// MapWithOverwrite will do the same as Map except that non-empty dst attributes will be overridden by
+// non-empty src attribute values.
+// Deprecated: Use Map(…) with WithOverride
+func MapWithOverwrite(dst, src interface{}, opts ...func(*Config)) error {
+ return _map(dst, src, append(opts, WithOverride)...)
+}
+
+func _map(dst, src interface{}, opts ...func(*Config)) error {
+ if dst != nil && reflect.ValueOf(dst).Kind() != reflect.Ptr {
+ return ErrNonPointerArgument
+ }
+ var (
+ vDst, vSrc reflect.Value
+ err error
+ )
+ config := &Config{}
+
+ for _, opt := range opts {
+ opt(config)
+ }
+
+ if vDst, vSrc, err = resolveValues(dst, src); err != nil {
+ return err
+ }
+ // To be friction-less, we redirect equal-type arguments
+ // to deepMerge. Only because arguments can be anything.
+ if vSrc.Kind() == vDst.Kind() {
+ return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0, config)
+ }
+ switch vSrc.Kind() {
+ case reflect.Struct:
+ if vDst.Kind() != reflect.Map {
+ return ErrExpectedMapAsDestination
+ }
+ case reflect.Map:
+ if vDst.Kind() != reflect.Struct {
+ return ErrExpectedStructAsDestination
+ }
+ default:
+ return ErrNotSupported
+ }
+ return deepMap(vDst, vSrc, make(map[uintptr]*visit), 0, config)
+}
diff --git a/vendor/dario.cat/mergo/merge.go b/vendor/dario.cat/mergo/merge.go
new file mode 100644
index 00000000000..0ef9b2138c1
--- /dev/null
+++ b/vendor/dario.cat/mergo/merge.go
@@ -0,0 +1,409 @@
+// Copyright 2013 Dario Castañé. All rights reserved.
+// Copyright 2009 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.
+
+// Based on src/pkg/reflect/deepequal.go from official
+// golang's stdlib.
+
+package mergo
+
+import (
+ "fmt"
+ "reflect"
+)
+
+func hasMergeableFields(dst reflect.Value) (exported bool) {
+ for i, n := 0, dst.NumField(); i < n; i++ {
+ field := dst.Type().Field(i)
+ if field.Anonymous && dst.Field(i).Kind() == reflect.Struct {
+ exported = exported || hasMergeableFields(dst.Field(i))
+ } else if isExportedComponent(&field) {
+ exported = exported || len(field.PkgPath) == 0
+ }
+ }
+ return
+}
+
+func isExportedComponent(field *reflect.StructField) bool {
+ pkgPath := field.PkgPath
+ if len(pkgPath) > 0 {
+ return false
+ }
+ c := field.Name[0]
+ if 'a' <= c && c <= 'z' || c == '_' {
+ return false
+ }
+ return true
+}
+
+type Config struct {
+ Transformers Transformers
+ Overwrite bool
+ ShouldNotDereference bool
+ AppendSlice bool
+ TypeCheck bool
+ overwriteWithEmptyValue bool
+ overwriteSliceWithEmptyValue bool
+ sliceDeepCopy bool
+ debug bool
+}
+
+type Transformers interface {
+ Transformer(reflect.Type) func(dst, src reflect.Value) error
+}
+
+// Traverses recursively both values, assigning src's fields values to dst.
+// The map argument tracks comparisons that have already been seen, which allows
+// short circuiting on recursive types.
+func deepMerge(dst, src reflect.Value, visited map[uintptr]*visit, depth int, config *Config) (err error) {
+ overwrite := config.Overwrite
+ typeCheck := config.TypeCheck
+ overwriteWithEmptySrc := config.overwriteWithEmptyValue
+ overwriteSliceWithEmptySrc := config.overwriteSliceWithEmptyValue
+ sliceDeepCopy := config.sliceDeepCopy
+
+ if !src.IsValid() {
+ return
+ }
+ if dst.CanAddr() {
+ addr := dst.UnsafeAddr()
+ h := 17 * addr
+ seen := visited[h]
+ typ := dst.Type()
+ for p := seen; p != nil; p = p.next {
+ if p.ptr == addr && p.typ == typ {
+ return nil
+ }
+ }
+ // Remember, remember...
+ visited[h] = &visit{typ, seen, addr}
+ }
+
+ if config.Transformers != nil && !isReflectNil(dst) && dst.IsValid() {
+ if fn := config.Transformers.Transformer(dst.Type()); fn != nil {
+ err = fn(dst, src)
+ return
+ }
+ }
+
+ switch dst.Kind() {
+ case reflect.Struct:
+ if hasMergeableFields(dst) {
+ for i, n := 0, dst.NumField(); i < n; i++ {
+ if err = deepMerge(dst.Field(i), src.Field(i), visited, depth+1, config); err != nil {
+ return
+ }
+ }
+ } else {
+ if dst.CanSet() && (isReflectNil(dst) || overwrite) && (!isEmptyValue(src, !config.ShouldNotDereference) || overwriteWithEmptySrc) {
+ dst.Set(src)
+ }
+ }
+ case reflect.Map:
+ if dst.IsNil() && !src.IsNil() {
+ if dst.CanSet() {
+ dst.Set(reflect.MakeMap(dst.Type()))
+ } else {
+ dst = src
+ return
+ }
+ }
+
+ if src.Kind() != reflect.Map {
+ if overwrite && dst.CanSet() {
+ dst.Set(src)
+ }
+ return
+ }
+
+ for _, key := range src.MapKeys() {
+ srcElement := src.MapIndex(key)
+ if !srcElement.IsValid() {
+ continue
+ }
+ dstElement := dst.MapIndex(key)
+ switch srcElement.Kind() {
+ case reflect.Chan, reflect.Func, reflect.Map, reflect.Interface, reflect.Slice:
+ if srcElement.IsNil() {
+ if overwrite {
+ dst.SetMapIndex(key, srcElement)
+ }
+ continue
+ }
+ fallthrough
+ default:
+ if !srcElement.CanInterface() {
+ continue
+ }
+ switch reflect.TypeOf(srcElement.Interface()).Kind() {
+ case reflect.Struct:
+ fallthrough
+ case reflect.Ptr:
+ fallthrough
+ case reflect.Map:
+ srcMapElm := srcElement
+ dstMapElm := dstElement
+ if srcMapElm.CanInterface() {
+ srcMapElm = reflect.ValueOf(srcMapElm.Interface())
+ if dstMapElm.IsValid() {
+ dstMapElm = reflect.ValueOf(dstMapElm.Interface())
+ }
+ }
+ if err = deepMerge(dstMapElm, srcMapElm, visited, depth+1, config); err != nil {
+ return
+ }
+ case reflect.Slice:
+ srcSlice := reflect.ValueOf(srcElement.Interface())
+
+ var dstSlice reflect.Value
+ if !dstElement.IsValid() || dstElement.IsNil() {
+ dstSlice = reflect.MakeSlice(srcSlice.Type(), 0, srcSlice.Len())
+ } else {
+ dstSlice = reflect.ValueOf(dstElement.Interface())
+ }
+
+ if (!isEmptyValue(src, !config.ShouldNotDereference) || overwriteWithEmptySrc || overwriteSliceWithEmptySrc) && (overwrite || isEmptyValue(dst, !config.ShouldNotDereference)) && !config.AppendSlice && !sliceDeepCopy {
+ if typeCheck && srcSlice.Type() != dstSlice.Type() {
+ return fmt.Errorf("cannot override two slices with different type (%s, %s)", srcSlice.Type(), dstSlice.Type())
+ }
+ dstSlice = srcSlice
+ } else if config.AppendSlice {
+ if srcSlice.Type() != dstSlice.Type() {
+ return fmt.Errorf("cannot append two slices with different type (%s, %s)", srcSlice.Type(), dstSlice.Type())
+ }
+ dstSlice = reflect.AppendSlice(dstSlice, srcSlice)
+ } else if sliceDeepCopy {
+ i := 0
+ for ; i < srcSlice.Len() && i < dstSlice.Len(); i++ {
+ srcElement := srcSlice.Index(i)
+ dstElement := dstSlice.Index(i)
+
+ if srcElement.CanInterface() {
+ srcElement = reflect.ValueOf(srcElement.Interface())
+ }
+ if dstElement.CanInterface() {
+ dstElement = reflect.ValueOf(dstElement.Interface())
+ }
+
+ if err = deepMerge(dstElement, srcElement, visited, depth+1, config); err != nil {
+ return
+ }
+ }
+
+ }
+ dst.SetMapIndex(key, dstSlice)
+ }
+ }
+
+ if dstElement.IsValid() && !isEmptyValue(dstElement, !config.ShouldNotDereference) {
+ if reflect.TypeOf(srcElement.Interface()).Kind() == reflect.Slice {
+ continue
+ }
+ if reflect.TypeOf(srcElement.Interface()).Kind() == reflect.Map && reflect.TypeOf(dstElement.Interface()).Kind() == reflect.Map {
+ continue
+ }
+ }
+
+ if srcElement.IsValid() && ((srcElement.Kind() != reflect.Ptr && overwrite) || !dstElement.IsValid() || isEmptyValue(dstElement, !config.ShouldNotDereference)) {
+ if dst.IsNil() {
+ dst.Set(reflect.MakeMap(dst.Type()))
+ }
+ dst.SetMapIndex(key, srcElement)
+ }
+ }
+
+ // Ensure that all keys in dst are deleted if they are not in src.
+ if overwriteWithEmptySrc {
+ for _, key := range dst.MapKeys() {
+ srcElement := src.MapIndex(key)
+ if !srcElement.IsValid() {
+ dst.SetMapIndex(key, reflect.Value{})
+ }
+ }
+ }
+ case reflect.Slice:
+ if !dst.CanSet() {
+ break
+ }
+ if (!isEmptyValue(src, !config.ShouldNotDereference) || overwriteWithEmptySrc || overwriteSliceWithEmptySrc) && (overwrite || isEmptyValue(dst, !config.ShouldNotDereference)) && !config.AppendSlice && !sliceDeepCopy {
+ dst.Set(src)
+ } else if config.AppendSlice {
+ if src.Type() != dst.Type() {
+ return fmt.Errorf("cannot append two slice with different type (%s, %s)", src.Type(), dst.Type())
+ }
+ dst.Set(reflect.AppendSlice(dst, src))
+ } else if sliceDeepCopy {
+ for i := 0; i < src.Len() && i < dst.Len(); i++ {
+ srcElement := src.Index(i)
+ dstElement := dst.Index(i)
+ if srcElement.CanInterface() {
+ srcElement = reflect.ValueOf(srcElement.Interface())
+ }
+ if dstElement.CanInterface() {
+ dstElement = reflect.ValueOf(dstElement.Interface())
+ }
+
+ if err = deepMerge(dstElement, srcElement, visited, depth+1, config); err != nil {
+ return
+ }
+ }
+ }
+ case reflect.Ptr:
+ fallthrough
+ case reflect.Interface:
+ if isReflectNil(src) {
+ if overwriteWithEmptySrc && dst.CanSet() && src.Type().AssignableTo(dst.Type()) {
+ dst.Set(src)
+ }
+ break
+ }
+
+ if src.Kind() != reflect.Interface {
+ if dst.IsNil() || (src.Kind() != reflect.Ptr && overwrite) {
+ if dst.CanSet() && (overwrite || isEmptyValue(dst, !config.ShouldNotDereference)) {
+ dst.Set(src)
+ }
+ } else if src.Kind() == reflect.Ptr {
+ if !config.ShouldNotDereference {
+ if err = deepMerge(dst.Elem(), src.Elem(), visited, depth+1, config); err != nil {
+ return
+ }
+ } else {
+ if overwriteWithEmptySrc || (overwrite && !src.IsNil()) || dst.IsNil() {
+ dst.Set(src)
+ }
+ }
+ } else if dst.Elem().Type() == src.Type() {
+ if err = deepMerge(dst.Elem(), src, visited, depth+1, config); err != nil {
+ return
+ }
+ } else {
+ return ErrDifferentArgumentsTypes
+ }
+ break
+ }
+
+ if dst.IsNil() || overwrite {
+ if dst.CanSet() && (overwrite || isEmptyValue(dst, !config.ShouldNotDereference)) {
+ dst.Set(src)
+ }
+ break
+ }
+
+ if dst.Elem().Kind() == src.Elem().Kind() {
+ if err = deepMerge(dst.Elem(), src.Elem(), visited, depth+1, config); err != nil {
+ return
+ }
+ break
+ }
+ default:
+ mustSet := (isEmptyValue(dst, !config.ShouldNotDereference) || overwrite) && (!isEmptyValue(src, !config.ShouldNotDereference) || overwriteWithEmptySrc)
+ if mustSet {
+ if dst.CanSet() {
+ dst.Set(src)
+ } else {
+ dst = src
+ }
+ }
+ }
+
+ return
+}
+
+// Merge will fill any empty for value type attributes on the dst struct using corresponding
+// src attributes if they themselves are not empty. dst and src must be valid same-type structs
+// and dst must be a pointer to struct.
+// It won't merge unexported (private) fields and will do recursively any exported field.
+func Merge(dst, src interface{}, opts ...func(*Config)) error {
+ return merge(dst, src, opts...)
+}
+
+// MergeWithOverwrite will do the same as Merge except that non-empty dst attributes will be overridden by
+// non-empty src attribute values.
+// Deprecated: use Merge(…) with WithOverride
+func MergeWithOverwrite(dst, src interface{}, opts ...func(*Config)) error {
+ return merge(dst, src, append(opts, WithOverride)...)
+}
+
+// WithTransformers adds transformers to merge, allowing to customize the merging of some types.
+func WithTransformers(transformers Transformers) func(*Config) {
+ return func(config *Config) {
+ config.Transformers = transformers
+ }
+}
+
+// WithOverride will make merge override non-empty dst attributes with non-empty src attributes values.
+func WithOverride(config *Config) {
+ config.Overwrite = true
+}
+
+// WithOverwriteWithEmptyValue will make merge override non empty dst attributes with empty src attributes values.
+func WithOverwriteWithEmptyValue(config *Config) {
+ config.Overwrite = true
+ config.overwriteWithEmptyValue = true
+}
+
+// WithOverrideEmptySlice will make merge override empty dst slice with empty src slice.
+func WithOverrideEmptySlice(config *Config) {
+ config.overwriteSliceWithEmptyValue = true
+}
+
+// WithoutDereference prevents dereferencing pointers when evaluating whether they are empty
+// (i.e. a non-nil pointer is never considered empty).
+func WithoutDereference(config *Config) {
+ config.ShouldNotDereference = true
+}
+
+// WithAppendSlice will make merge append slices instead of overwriting it.
+func WithAppendSlice(config *Config) {
+ config.AppendSlice = true
+}
+
+// WithTypeCheck will make merge check types while overwriting it (must be used with WithOverride).
+func WithTypeCheck(config *Config) {
+ config.TypeCheck = true
+}
+
+// WithSliceDeepCopy will merge slice element one by one with Overwrite flag.
+func WithSliceDeepCopy(config *Config) {
+ config.sliceDeepCopy = true
+ config.Overwrite = true
+}
+
+func merge(dst, src interface{}, opts ...func(*Config)) error {
+ if dst != nil && reflect.ValueOf(dst).Kind() != reflect.Ptr {
+ return ErrNonPointerArgument
+ }
+ var (
+ vDst, vSrc reflect.Value
+ err error
+ )
+
+ config := &Config{}
+
+ for _, opt := range opts {
+ opt(config)
+ }
+
+ if vDst, vSrc, err = resolveValues(dst, src); err != nil {
+ return err
+ }
+ if vDst.Type() != vSrc.Type() {
+ return ErrDifferentArgumentsTypes
+ }
+ return deepMerge(vDst, vSrc, make(map[uintptr]*visit), 0, config)
+}
+
+// IsReflectNil is the reflect value provided nil
+func isReflectNil(v reflect.Value) bool {
+ k := v.Kind()
+ switch k {
+ case reflect.Interface, reflect.Slice, reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr:
+ // Both interface and slice are nil if first word is 0.
+ // Both are always bigger than a word; assume flagIndir.
+ return v.IsNil()
+ default:
+ return false
+ }
+}
diff --git a/vendor/dario.cat/mergo/mergo.go b/vendor/dario.cat/mergo/mergo.go
new file mode 100644
index 00000000000..0a721e2d858
--- /dev/null
+++ b/vendor/dario.cat/mergo/mergo.go
@@ -0,0 +1,81 @@
+// Copyright 2013 Dario Castañé. All rights reserved.
+// Copyright 2009 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.
+
+// Based on src/pkg/reflect/deepequal.go from official
+// golang's stdlib.
+
+package mergo
+
+import (
+ "errors"
+ "reflect"
+)
+
+// Errors reported by Mergo when it finds invalid arguments.
+var (
+ ErrNilArguments = errors.New("src and dst must not be nil")
+ ErrDifferentArgumentsTypes = errors.New("src and dst must be of same type")
+ ErrNotSupported = errors.New("only structs, maps, and slices are supported")
+ ErrExpectedMapAsDestination = errors.New("dst was expected to be a map")
+ ErrExpectedStructAsDestination = errors.New("dst was expected to be a struct")
+ ErrNonPointerArgument = errors.New("dst must be a pointer")
+)
+
+// During deepMerge, must keep track of checks that are
+// in progress. The comparison algorithm assumes that all
+// checks in progress are true when it reencounters them.
+// Visited are stored in a map indexed by 17 * a1 + a2;
+type visit struct {
+ typ reflect.Type
+ next *visit
+ ptr uintptr
+}
+
+// From src/pkg/encoding/json/encode.go.
+func isEmptyValue(v reflect.Value, shouldDereference bool) bool {
+ switch v.Kind() {
+ case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
+ return v.Len() == 0
+ case reflect.Bool:
+ return !v.Bool()
+ case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+ return v.Int() == 0
+ case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+ return v.Uint() == 0
+ case reflect.Float32, reflect.Float64:
+ return v.Float() == 0
+ case reflect.Interface, reflect.Ptr:
+ if v.IsNil() {
+ return true
+ }
+ if shouldDereference {
+ return isEmptyValue(v.Elem(), shouldDereference)
+ }
+ return false
+ case reflect.Func:
+ return v.IsNil()
+ case reflect.Invalid:
+ return true
+ }
+ return false
+}
+
+func resolveValues(dst, src interface{}) (vDst, vSrc reflect.Value, err error) {
+ if dst == nil || src == nil {
+ err = ErrNilArguments
+ return
+ }
+ vDst = reflect.ValueOf(dst).Elem()
+ if vDst.Kind() != reflect.Struct && vDst.Kind() != reflect.Map && vDst.Kind() != reflect.Slice {
+ err = ErrNotSupported
+ return
+ }
+ vSrc = reflect.ValueOf(src)
+ // We check if vSrc is a pointer to dereference it.
+ if vSrc.Kind() == reflect.Ptr {
+ vSrc = vSrc.Elem()
+ }
+ return
+}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/CHANGELOG.md b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/CHANGELOG.md
index 7ecc8f2a967..c4da5d78f1d 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/CHANGELOG.md
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/CHANGELOG.md
@@ -1,5 +1,12 @@
# Release History
+## 1.6.1 (2023-06-06)
+
+### Bugs Fixed
+* Retry policy always clones the underlying `*http.Request` before invoking the next policy.
+* Added some non-standard error codes to the list of error codes for unregistered resource providers.
+* Fixed an issue in `azcore.NewClient()` and `arm.NewClient()` that could cause an incorrect module name to be used in telemetry.
+
## 1.6.0 (2023-05-04)
### Features Added
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/core.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/core.go
index 72c2cf21eef..27231ad920d 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/core.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/core.go
@@ -76,12 +76,13 @@ type Client struct {
}
// NewClient creates a new Client instance with the provided values.
-// - clientName - the fully qualified name of the client ("package.Client"); this is used by the tracing provider when creating spans
+// - clientName - the fully qualified name of the client ("module/package.Client"); this is used by the telemetry policy and tracing provider.
+// if module and package are the same value, the "module/" prefix can be omitted.
// - moduleVersion - the semantic version of the containing module; used by the telemetry policy
// - plOpts - pipeline configuration options; can be the zero-value
// - options - optional client configurations; pass nil to accept the default values
func NewClient(clientName, moduleVersion string, plOpts runtime.PipelineOptions, options *ClientOptions) (*Client, error) {
- pkg, err := shared.ExtractPackageName(clientName)
+ mod, client, err := shared.ExtractModuleName(clientName)
if err != nil {
return nil, err
}
@@ -96,9 +97,9 @@ func NewClient(clientName, moduleVersion string, plOpts runtime.PipelineOptions,
}
}
- pl := runtime.NewPipeline(pkg, moduleVersion, plOpts, options)
+ pl := runtime.NewPipeline(mod, moduleVersion, plOpts, options)
- tr := options.TracingProvider.NewTracer(clientName, moduleVersion)
+ tr := options.TracingProvider.NewTracer(client, moduleVersion)
return &Client{pl: pl, tr: tr}, nil
}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/constants.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/constants.go
index 681167bcba5..269a831ed17 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/constants.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/constants.go
@@ -32,5 +32,5 @@ const (
Module = "azcore"
// Version is the semantic version (see http://semver.org) of this module.
- Version = "v1.6.0"
+ Version = "v1.6.1"
)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/shared.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/shared.go
index 930ab8c8399..db0aaa7cb95 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/shared.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/shared.go
@@ -13,7 +13,6 @@ import (
"reflect"
"regexp"
"strconv"
- "strings"
"time"
)
@@ -79,14 +78,26 @@ func ValidateModVer(moduleVersion string) error {
return nil
}
-// ExtractPackageName returns "package" from "package.Client".
+// ExtractModuleName returns "module", "package.Client" from "module/package.Client" or
+// "package", "package.Client" from "package.Client" when there's no "module/" prefix.
// If clientName is malformed, an error is returned.
-func ExtractPackageName(clientName string) (string, error) {
- pkg, client, ok := strings.Cut(clientName, ".")
- if !ok {
- return "", fmt.Errorf("missing . in clientName %s", clientName)
- } else if pkg == "" || client == "" {
- return "", fmt.Errorf("malformed clientName %s", clientName)
+func ExtractModuleName(clientName string) (string, string, error) {
+ // uses unnamed capturing for "module", "package.Client", and "package"
+ regex, err := regexp.Compile(`^(?:([a-z0-9]+)/)?(([a-z0-9]+)\.(?:[A-Za-z0-9]+))$`)
+ if err != nil {
+ return "", "", err
}
- return pkg, nil
+
+ matches := regex.FindStringSubmatch(clientName)
+ if len(matches) < 4 {
+ return "", "", fmt.Errorf("malformed clientName %s", clientName)
+ }
+
+ // the first match is the entire string, the second is "module", the third is
+ // "package.Client" and the fourth is "package".
+ // if there was no "module/" prefix, the second match will be the empty string
+ if matches[1] != "" {
+ return matches[1], matches[2], nil
+ }
+ return matches[3], matches[2], nil
}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_retry.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_retry.go
index 5f52ba75b45..e0c5929f3b7 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_retry.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime/policy_retry.go
@@ -125,7 +125,8 @@ func (p *retryPolicy) Do(req *policy.Request) (resp *http.Response, err error) {
}
if options.TryTimeout == 0 {
- resp, err = req.Next()
+ clone := req.Clone(req.Raw().Context())
+ resp, err = clone.Next()
} else {
// Set the per-try time for this particular retry operation and then Do the operation.
tryCtx, tryCancel := context.WithTimeout(req.Raw().Context(), options.TryTimeout)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/CHANGELOG.md b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/CHANGELOG.md
index d7af17b754f..e9b36eada05 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/CHANGELOG.md
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/CHANGELOG.md
@@ -1,5 +1,12 @@
# Release History
+## 1.4.0 (2023-06-06)
+
+### Features Added
+
+- `admin.SubscriptionProperties` now allow for a `DefaultRule` to be set. This allows Subscriptions to be created with an immediate filter/action.
+ Contributed by @StrawbrryFlurry. (PR#20888)
+
## 1.3.0 (2023-05-09)
### Features Added
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/admin/admin_client_rules.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/admin/admin_client_rules.go
index 7ddb3d87a01..c19fcf9144d 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/admin/admin_client_rules.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/admin/admin_client_rules.go
@@ -208,7 +208,7 @@ func (ac *Client) GetRule(ctx context.Context, topicName string, subscriptionNam
return mapATOMError[GetRuleResponse](err)
}
- props, err := ac.newRuleProperties(ruleEnv)
+ props, err := ac.newRulePropertiesFromEnvelope(ruleEnv)
if err != nil {
return nil, err
@@ -240,7 +240,7 @@ func (ac *Client) NewListRulesPager(topicName string, subscriptionName string, o
}
ep := &entityPager[atom.RuleFeed, atom.RuleEnvelope, RuleProperties]{
- convertFn: ac.newRuleProperties,
+ convertFn: ac.newRulePropertiesFromEnvelope,
baseFragment: fmt.Sprintf("/%s/Subscriptions/%s/Rules/", topicName, subscriptionName),
maxPageSize: pageSize,
em: ac.em,
@@ -304,107 +304,25 @@ func (ac *Client) DeleteRule(ctx context.Context, topicName string, subscription
}
func (ac *Client) createOrUpdateRule(ctx context.Context, topicName string, subscriptionName string, putProps RuleProperties, creating bool) (*RuleProperties, *http.Response, error) {
- ruleDesc := atom.RuleDescription{}
-
- theirFilter := putProps.Filter
-
- if theirFilter != nil {
- switch actualFilter := theirFilter.(type) {
- case *FalseFilter:
- ruleDesc.Filter = &atom.FilterDescription{
- Type: "FalseFilter",
- SQLExpression: to.Ptr("1=0"),
- }
- case *TrueFilter:
- ruleDesc.Filter = &atom.FilterDescription{
- Type: "TrueFilter",
- SQLExpression: to.Ptr("1=1"),
- }
- case *SQLFilter:
- params, err := publicSQLParametersToInternal(actualFilter.Parameters)
-
- if err != nil {
- return nil, nil, err
- }
-
- ruleDesc.Filter = &atom.FilterDescription{
- Type: "SqlFilter",
- SQLExpression: &actualFilter.Expression,
- Parameters: params,
- }
- case *CorrelationFilter:
- appProps, err := publicSQLParametersToInternal(actualFilter.ApplicationProperties)
-
- if err != nil {
- return nil, nil, err
- }
-
- ruleDesc.Filter = &atom.FilterDescription{
- Type: "CorrelationFilter",
- CorrelationFilter: atom.CorrelationFilter{
- ContentType: actualFilter.ContentType,
- CorrelationID: actualFilter.CorrelationID,
- MessageID: actualFilter.MessageID,
- ReplyTo: actualFilter.ReplyTo,
- ReplyToSessionID: actualFilter.ReplyToSessionID,
- SessionID: actualFilter.SessionID,
- Label: actualFilter.Subject,
- To: actualFilter.To,
- Properties: appProps,
- },
- }
- case *UnknownRuleFilter:
- fd, err := convertUnknownRuleFilterToFilterDescription(actualFilter)
-
- if err != nil {
- return nil, nil, err
- }
-
- ruleDesc.Filter = fd
- default:
- return nil, nil, fmt.Errorf("invalid type ('%T') for Rule.Filter", theirFilter)
- }
- } else {
- ruleDesc.Filter = &atom.FilterDescription{
- Type: "TrueFilter",
- SQLExpression: to.Ptr("1=1"),
- }
+ ruleDesc := atom.RuleDescription{
+ Name: makeRuleNameForProperties(&putProps),
}
- theirAction := putProps.Action
-
- if theirAction != nil {
- switch actualAction := theirAction.(type) {
- case *SQLAction:
- params, err := publicSQLParametersToInternal(actualAction.Parameters)
+ filter, err := convertRuleFilterToFilterDescription(&putProps.Filter)
- if err != nil {
- return nil, nil, err
- }
+ if err != nil {
+ return nil, nil, err
+ }
- ruleDesc.Action = &atom.ActionDescription{
- Type: "SqlRuleAction",
- SQLExpression: actualAction.Expression,
- Parameters: params,
- }
- case *UnknownRuleAction:
- ad, err := convertUnknownRuleActionToActionDescription(actualAction)
+ ruleDesc.Filter = filter
- if err != nil {
- return nil, nil, err
- }
+ action, err := convertRuleActionToActionDescription(&putProps.Action)
- ruleDesc.Action = ad
- default:
- return nil, nil, fmt.Errorf("invalid type ('%T') for Rule.Action", theirAction)
- }
+ if err != nil {
+ return nil, nil, err
}
- ruleDesc.Name = "$Default"
-
- if putProps.Name != "" {
- ruleDesc.Name = putProps.Name
- }
+ ruleDesc.Action = action
if !creating {
ctx = runtime.WithHTTPHeader(ctx, http.Header{
@@ -422,16 +340,120 @@ func (ac *Client) createOrUpdateRule(ctx context.Context, topicName string, subs
return nil, nil, err
}
- respProps, err := ac.newRuleProperties(respEnv)
+ respProps, err := ac.newRulePropertiesFromEnvelope(respEnv)
return respProps, httpResp, err
}
-func (ac *Client) newRuleProperties(env *atom.RuleEnvelope) (*RuleProperties, error) {
+func makeRuleNameForProperties(properties *RuleProperties) string {
+ if properties.Name != "" {
+ return properties.Name
+ }
+
+ return "$Default"
+}
+
+func convertRuleFilterToFilterDescription(filter *RuleFilter) (*atom.FilterDescription, error) {
+ if *filter == nil {
+ return &atom.FilterDescription{
+ Type: "TrueFilter",
+ SQLExpression: to.Ptr("1=1"),
+ }, nil
+ }
+
+ switch actualFilter := (*filter).(type) {
+ case *FalseFilter:
+ return &atom.FilterDescription{
+ Type: "FalseFilter",
+ SQLExpression: to.Ptr("1=0"),
+ }, nil
+ case *TrueFilter:
+ return &atom.FilterDescription{
+ Type: "TrueFilter",
+ SQLExpression: to.Ptr("1=1"),
+ }, nil
+ case *SQLFilter:
+ params, err := publicSQLParametersToInternal(actualFilter.Parameters)
+
+ if err != nil {
+ return nil, err
+ }
+
+ return &atom.FilterDescription{
+ Type: "SqlFilter",
+ SQLExpression: &actualFilter.Expression,
+ Parameters: params,
+ }, nil
+ case *CorrelationFilter:
+ appProps, err := publicSQLParametersToInternal(actualFilter.ApplicationProperties)
+
+ if err != nil {
+ return nil, err
+ }
+
+ return &atom.FilterDescription{
+ Type: "CorrelationFilter",
+ CorrelationFilter: atom.CorrelationFilter{
+ ContentType: actualFilter.ContentType,
+ CorrelationID: actualFilter.CorrelationID,
+ MessageID: actualFilter.MessageID,
+ ReplyTo: actualFilter.ReplyTo,
+ ReplyToSessionID: actualFilter.ReplyToSessionID,
+ SessionID: actualFilter.SessionID,
+ Label: actualFilter.Subject,
+ To: actualFilter.To,
+ Properties: appProps,
+ },
+ }, nil
+ case *UnknownRuleFilter:
+ filterDefinition, err := convertUnknownRuleFilterToFilterDescription(actualFilter)
+
+ if err != nil {
+ return nil, err
+ }
+
+ return filterDefinition, nil
+ default:
+ return nil, fmt.Errorf("invalid type ('%T') for Rule.Filter", filter)
+ }
+}
+
+func convertRuleActionToActionDescription(action *RuleAction) (*atom.ActionDescription, error) {
+ if *action == nil {
+ return nil, nil
+ }
+
+ switch actualAction := (*action).(type) {
+ case *SQLAction:
+ params, err := publicSQLParametersToInternal(actualAction.Parameters)
+
+ if err != nil {
+ return nil, err
+ }
+
+ return &atom.ActionDescription{
+ Type: "SqlRuleAction",
+ SQLExpression: actualAction.Expression,
+ Parameters: params,
+ }, nil
+ case *UnknownRuleAction:
+ ad, err := convertUnknownRuleActionToActionDescription(actualAction)
+
+ if err != nil {
+ return nil, err
+ }
+
+ return ad, nil
+ default:
+ return nil, fmt.Errorf("invalid type ('%T') for Rule.Action", &action)
+ }
+}
+
+func (ac *Client) newRulePropertiesFromEnvelope(env *atom.RuleEnvelope) (*RuleProperties, error) {
desc := env.Content.RuleDescription
props := RuleProperties{
- Name: env.Title,
+ Name: desc.Name,
}
switch desc.Filter.Type {
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/admin/admin_client_subscription.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/admin/admin_client_subscription.go
index 33725130a35..02e647be3df 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/admin/admin_client_subscription.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/admin/admin_client_subscription.go
@@ -62,6 +62,9 @@ type SubscriptionProperties struct {
// UserMetadata is custom metadata that user can associate with the subscription.
UserMetadata *string
+
+ // DefaultRule is a rule that is added to the subscription as soon as it is created.
+ DefaultRule *RuleProperties
}
// SubscriptionRuntimeProperties represent dynamic properties of a subscription, such as the ActiveMessageCount.
@@ -338,7 +341,11 @@ func (ac *Client) createOrUpdateSubscriptionImpl(ctx context.Context, topicName
props = &SubscriptionProperties{}
}
- env := newSubscriptionEnvelope(props, ac.em.TokenProvider())
+ env, err := newSubscriptionEnvelope(props, ac.em.TokenProvider())
+
+ if err != nil {
+ return nil, nil, err
+ }
if !creating {
ctx = runtime.WithHTTPHeader(ctx, http.Header{
@@ -367,7 +374,13 @@ func (ac *Client) createOrUpdateSubscriptionImpl(ctx context.Context, topicName
return &item.SubscriptionProperties, resp, nil
}
-func newSubscriptionEnvelope(props *SubscriptionProperties, tokenProvider auth.TokenProvider) *atom.SubscriptionEnvelope {
+func newSubscriptionEnvelope(props *SubscriptionProperties, tokenProvider auth.TokenProvider) (*atom.SubscriptionEnvelope, error) {
+ defaultRuleDescription, err := newDefaultRuleDescription(props.DefaultRule)
+
+ if err != nil {
+ return nil, err
+ }
+
desc := &atom.SubscriptionDescription{
DefaultMessageTimeToLive: props.DefaultMessageTimeToLive,
LockDuration: props.LockDuration,
@@ -380,12 +393,39 @@ func newSubscriptionEnvelope(props *SubscriptionProperties, tokenProvider auth.T
UserMetadata: props.UserMetadata,
EnableBatchedOperations: props.EnableBatchedOperations,
AutoDeleteOnIdle: props.AutoDeleteOnIdle,
- // TODO: when we get rule serialization in place.
- // DefaultRuleDescription: props.DefaultRuleDescription,
- // are these attributes just not valid anymore?
+ DefaultRuleDescription: defaultRuleDescription,
+ }
+
+ return atom.WrapWithSubscriptionEnvelope(desc), nil
+}
+
+func newDefaultRuleDescription(properties *RuleProperties) (*atom.DefaultRuleDescription, error) {
+ if properties == nil {
+ return nil, nil
}
- return atom.WrapWithSubscriptionEnvelope(desc)
+ ruleDescription := atom.DefaultRuleDescription{
+ Name: makeRuleNameForProperties(properties),
+ }
+
+ filter, err := convertRuleFilterToFilterDescription(&properties.Filter)
+
+ if err != nil {
+ return nil, err
+ }
+
+ // Filter can never be nil because it's default is TrueFilter
+ ruleDescription.Filter = filter
+
+ action, err := convertRuleActionToActionDescription(&properties.Action)
+
+ if err != nil {
+ return nil, err
+ }
+
+ ruleDescription.Action = action
+
+ return &ruleDescription, nil
}
func newSubscriptionItem(env *atom.SubscriptionEnvelope, topicName string) (*SubscriptionPropertiesItem, error) {
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/atom/models.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/atom/models.go
index 2b60da83076..5431ef4580c 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/atom/models.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/atom/models.go
@@ -169,9 +169,10 @@ type (
}
// DefaultRuleDescription is the content type for Subscription Rule management requests
DefaultRuleDescription struct {
- XMLName xml.Name `xml:"DefaultRuleDescription"`
- Filter FilterDescription `xml:"Filter"`
- Name *string `xml:"Name,omitempty"`
+ XMLName xml.Name `xml:"DefaultRuleDescription"`
+ Filter *FilterDescription `xml:"Filter"`
+ Action *ActionDescription `xml:"Action,omitempty"`
+ Name string `xml:"Name,omitempty"`
}
// FilterDescription describes a filter which can be applied to a subscription to filter messages from the topic.
@@ -268,7 +269,7 @@ type (
DefaultMessageTimeToLive *string `xml:"DefaultMessageTimeToLive,omitempty"` // DefaultMessageTimeToLive - ISO 8601 default message timespan to live value. This is the duration after which the message expires, starting from when the message is sent to Service Bus. This is the default value used when TimeToLive is not set on a message itself.
DeadLetteringOnMessageExpiration *bool `xml:"DeadLetteringOnMessageExpiration,omitempty"` // DeadLetteringOnMessageExpiration - A value that indicates whether this queue has dead letter support when a message expires.
DeadLetteringOnFilterEvaluationExceptions *bool `xml:"DeadLetteringOnFilterEvaluationExceptions,omitempty"`
- DefaultRuleDescription *DefaultRuleDescription `xml:"DefaultRuleDescription,omitempty"`
+ DefaultRuleDescription *DefaultRuleDescription `xml:"DefaultRuleDescription,omitempty"` // DefaultRuleDescription - A default rule that is created right when the new subscription is created.
MaxDeliveryCount *int32 `xml:"MaxDeliveryCount,omitempty"` // MaxDeliveryCount - The maximum delivery count. A message is automatically deadlettered after this number of deliveries. default value is 10.
MessageCount *int64 `xml:"MessageCount,omitempty"` // MessageCount - The number of messages in the queue.
EnableBatchedOperations *bool `xml:"EnableBatchedOperations,omitempty"` // EnableBatchedOperations - Value that indicates whether server-side batched operations are enabled.
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/constants.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/constants.go
index b133d8b572a..2b1b00bb807 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/constants.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/constants.go
@@ -4,4 +4,4 @@
package internal
// Version is the semantic version number
-const Version = "v1.3.0"
+const Version = "v1.4.0"
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/utils/sync.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/utils/sync.go
deleted file mode 100644
index f3e08692140..00000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/messaging/azservicebus/internal/utils/sync.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package utils
-
-import (
- "context"
- "sync"
-)
-
-// WaitForGroupOrContext will wait for wg or the context to complete.
-func WaitForGroupOrContext(ctx context.Context, wg *sync.WaitGroup) error {
- done := make(chan struct{})
-
- go func() {
- wg.Wait()
- close(done)
- }()
-
- select {
- case <-ctx.Done():
- return ctx.Err()
- case <-done:
- return nil
- }
-}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
index c1c458b51a2..9943af744ba 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
@@ -14,6 +14,7 @@ const (
AwsIsoPartitionID = "aws-iso" // AWS ISO (US) partition.
AwsIsoBPartitionID = "aws-iso-b" // AWS ISOB (US) partition.
AwsIsoEPartitionID = "aws-iso-e" // AWS ISOE (Europe) partition.
+ AwsIsoFPartitionID = "aws-iso-f" // AWS ISOF partition.
)
// AWS Standard partition's regions.
@@ -73,8 +74,11 @@ const (
// AWS ISOE (Europe) partition's regions.
const ()
+// AWS ISOF partition's regions.
+const ()
+
// DefaultResolver returns an Endpoint resolver that will be able
-// to resolve endpoints for: AWS Standard, AWS China, AWS GovCloud (US), AWS ISO (US), AWS ISOB (US), and AWS ISOE (Europe).
+// to resolve endpoints for: AWS Standard, AWS China, AWS GovCloud (US), AWS ISO (US), AWS ISOB (US), AWS ISOE (Europe), and AWS ISOF.
//
// Use DefaultPartitions() to get the list of the default partitions.
func DefaultResolver() Resolver {
@@ -82,7 +86,7 @@ func DefaultResolver() Resolver {
}
// DefaultPartitions returns a list of the partitions the SDK is bundled
-// with. The available partitions are: AWS Standard, AWS China, AWS GovCloud (US), AWS ISO (US), AWS ISOB (US), and AWS ISOE (Europe).
+// with. The available partitions are: AWS Standard, AWS China, AWS GovCloud (US), AWS ISO (US), AWS ISOB (US), AWS ISOE (Europe), and AWS ISOF.
//
// partitions := endpoints.DefaultPartitions
// for _, p := range partitions {
@@ -99,6 +103,7 @@ var defaultPartitions = partitions{
awsisoPartition,
awsisobPartition,
awsisoePartition,
+ awsisofPartition,
}
// AwsPartition returns the Resolver for AWS Standard.
@@ -15001,6 +15006,9 @@ var awsPartition = partition{
endpointKey{
Region: "eu-west-1",
}: endpoint{},
+ endpointKey{
+ Region: "eu-west-2",
+ }: endpoint{},
endpointKey{
Region: "fips-us-east-1",
}: endpoint{
@@ -15130,6 +15138,12 @@ var awsPartition = partition{
}: endpoint{
Hostname: "kendra-ranking.ca-central-1.api.aws",
},
+ endpointKey{
+ Region: "ca-central-1",
+ Variant: fipsVariant,
+ }: endpoint{
+ Hostname: "kendra-ranking-fips.ca-central-1.api.aws",
+ },
endpointKey{
Region: "eu-central-2",
}: endpoint{
@@ -15180,11 +15194,23 @@ var awsPartition = partition{
}: endpoint{
Hostname: "kendra-ranking.us-east-1.api.aws",
},
+ endpointKey{
+ Region: "us-east-1",
+ Variant: fipsVariant,
+ }: endpoint{
+ Hostname: "kendra-ranking-fips.us-east-1.api.aws",
+ },
endpointKey{
Region: "us-east-2",
}: endpoint{
Hostname: "kendra-ranking.us-east-2.api.aws",
},
+ endpointKey{
+ Region: "us-east-2",
+ Variant: fipsVariant,
+ }: endpoint{
+ Hostname: "kendra-ranking-fips.us-east-2.api.aws",
+ },
endpointKey{
Region: "us-west-1",
}: endpoint{
@@ -15195,6 +15221,12 @@ var awsPartition = partition{
}: endpoint{
Hostname: "kendra-ranking.us-west-2.api.aws",
},
+ endpointKey{
+ Region: "us-west-2",
+ Variant: fipsVariant,
+ }: endpoint{
+ Hostname: "kendra-ranking-fips.us-west-2.api.aws",
+ },
},
},
"kinesis": service{
@@ -18184,6 +18216,9 @@ var awsPartition = partition{
endpointKey{
Region: "eu-west-2",
}: endpoint{},
+ endpointKey{
+ Region: "eu-west-3",
+ }: endpoint{},
endpointKey{
Region: "me-central-1",
}: endpoint{},
@@ -18252,6 +18287,9 @@ var awsPartition = partition{
endpointKey{
Region: "ap-south-1",
}: endpoint{},
+ endpointKey{
+ Region: "ap-south-2",
+ }: endpoint{},
endpointKey{
Region: "ap-southeast-1",
}: endpoint{},
@@ -18261,18 +18299,27 @@ var awsPartition = partition{
endpointKey{
Region: "ap-southeast-3",
}: endpoint{},
+ endpointKey{
+ Region: "ap-southeast-4",
+ }: endpoint{},
endpointKey{
Region: "ca-central-1",
}: endpoint{},
endpointKey{
Region: "eu-central-1",
}: endpoint{},
+ endpointKey{
+ Region: "eu-central-2",
+ }: endpoint{},
endpointKey{
Region: "eu-north-1",
}: endpoint{},
endpointKey{
Region: "eu-south-1",
}: endpoint{},
+ endpointKey{
+ Region: "eu-south-2",
+ }: endpoint{},
endpointKey{
Region: "eu-west-1",
}: endpoint{},
@@ -19155,18 +19202,33 @@ var awsPartition = partition{
endpointKey{
Region: "ap-northeast-1",
}: endpoint{},
+ endpointKey{
+ Region: "ap-southeast-1",
+ }: endpoint{},
endpointKey{
Region: "ap-southeast-2",
}: endpoint{},
endpointKey{
Region: "ca-central-1",
}: endpoint{},
+ endpointKey{
+ Region: "eu-central-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-north-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-west-1",
+ }: endpoint{},
endpointKey{
Region: "eu-west-2",
}: endpoint{},
endpointKey{
Region: "us-east-1",
}: endpoint{},
+ endpointKey{
+ Region: "us-east-2",
+ }: endpoint{},
endpointKey{
Region: "us-west-2",
}: endpoint{},
@@ -28440,6 +28502,91 @@ var awsPartition = partition{
},
},
},
+ "verifiedpermissions": service{
+ Endpoints: serviceEndpoints{
+ endpointKey{
+ Region: "af-south-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-east-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-northeast-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-northeast-2",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-northeast-3",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-south-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-south-2",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-southeast-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-southeast-2",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-southeast-3",
+ }: endpoint{},
+ endpointKey{
+ Region: "ap-southeast-4",
+ }: endpoint{},
+ endpointKey{
+ Region: "ca-central-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-central-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-central-2",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-north-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-south-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-south-2",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-west-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-west-2",
+ }: endpoint{},
+ endpointKey{
+ Region: "eu-west-3",
+ }: endpoint{},
+ endpointKey{
+ Region: "me-central-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "me-south-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "sa-east-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "us-east-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "us-east-2",
+ }: endpoint{},
+ endpointKey{
+ Region: "us-west-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "us-west-2",
+ }: endpoint{},
+ },
+ },
"voice-chime": service{
Endpoints: serviceEndpoints{
endpointKey{
@@ -37514,6 +37661,16 @@ var awsusgovPartition = partition{
},
},
},
+ "simspaceweaver": service{
+ Endpoints: serviceEndpoints{
+ endpointKey{
+ Region: "us-gov-east-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "us-gov-west-1",
+ }: endpoint{},
+ },
+ },
"sms": service{
Endpoints: serviceEndpoints{
endpointKey{
@@ -38387,6 +38544,15 @@ var awsusgovPartition = partition{
},
"workspaces": service{
Endpoints: serviceEndpoints{
+ endpointKey{
+ Region: "fips-us-gov-east-1",
+ }: endpoint{
+ Hostname: "workspaces-fips.us-gov-east-1.amazonaws.com",
+ CredentialScope: credentialScope{
+ Region: "us-gov-east-1",
+ },
+ Deprecated: boxedTrue,
+ },
endpointKey{
Region: "fips-us-gov-west-1",
}: endpoint{
@@ -38399,6 +38565,12 @@ var awsusgovPartition = partition{
endpointKey{
Region: "us-gov-east-1",
}: endpoint{},
+ endpointKey{
+ Region: "us-gov-east-1",
+ Variant: fipsVariant,
+ }: endpoint{
+ Hostname: "workspaces-fips.us-gov-east-1.amazonaws.com",
+ },
endpointKey{
Region: "us-gov-west-1",
}: endpoint{},
@@ -38659,6 +38831,16 @@ var awsisoPartition = partition{
}: endpoint{},
},
},
+ "dlm": service{
+ Endpoints: serviceEndpoints{
+ endpointKey{
+ Region: "us-iso-east-1",
+ }: endpoint{},
+ endpointKey{
+ Region: "us-iso-west-1",
+ }: endpoint{},
+ },
+ },
"dms": service{
Defaults: endpointDefaults{
defaultKey{}: endpoint{},
@@ -39994,3 +40176,37 @@ var awsisoePartition = partition{
Regions: regions{},
Services: services{},
}
+
+// AwsIsoFPartition returns the Resolver for AWS ISOF.
+func AwsIsoFPartition() Partition {
+ return awsisofPartition.Partition()
+}
+
+var awsisofPartition = partition{
+ ID: "aws-iso-f",
+ Name: "AWS ISOF",
+ DNSSuffix: "csp.hci.ic.gov",
+ RegionRegex: regionRegex{
+ Regexp: func() *regexp.Regexp {
+ reg, _ := regexp.Compile("^us\\-isof\\-\\w+\\-\\d+$")
+ return reg
+ }(),
+ },
+ Defaults: endpointDefaults{
+ defaultKey{}: endpoint{
+ Hostname: "{service}.{region}.{dnsSuffix}",
+ Protocols: []string{"https"},
+ SignatureVersions: []string{"v4"},
+ },
+ defaultKey{
+ Variant: fipsVariant,
+ }: endpoint{
+ Hostname: "{service}-fips.{region}.{dnsSuffix}",
+ DNSSuffix: "csp.hci.ic.gov",
+ Protocols: []string{"https"},
+ SignatureVersions: []string{"v4"},
+ },
+ },
+ Regions: regions{},
+ Services: services{},
+}
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go
index 777e8ba7ab8..9c10ad9ca4f 100644
--- a/vendor/github.com/aws/aws-sdk-go/aws/version.go
+++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go
@@ -5,4 +5,4 @@ package aws
const SDKName = "aws-sdk-go"
// SDKVersion is the version of this SDK
-const SDKVersion = "1.44.275"
+const SDKVersion = "1.44.286"
diff --git a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go
index 8b25fedcdac..07868966842 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/api.go
@@ -190,10 +190,11 @@ func (c *DynamoDB) BatchGetItemRequest(input *BatchGetItemInput) (req *request.R
//
// A single operation can retrieve up to 16 MB of data, which can contain as
// many as 100 items. BatchGetItem returns a partial result if the response
-// size limit is exceeded, the table's provisioned throughput is exceeded, or
-// an internal processing failure occurs. If a partial result is returned, the
-// operation returns a value for UnprocessedKeys. You can use this value to
-// retry the operation starting with the next item to get.
+// size limit is exceeded, the table's provisioned throughput is exceeded, more
+// than 1MB per partition is requested, or an internal processing failure occurs.
+// If a partial result is returned, the operation returns a value for UnprocessedKeys.
+// You can use this value to retry the operation starting with the next item
+// to get.
//
// If you request more than 100 items, BatchGetItem returns a ValidationException
// with the message "Too many items requested for the BatchGetItem call."
@@ -677,6 +678,12 @@ func (c *DynamoDB) CreateBackupRequest(input *CreateBackupInput) (req *request.R
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -846,6 +853,12 @@ func (c *DynamoDB) CreateGlobalTableRequest(input *CreateGlobalTableInput) (req
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -995,6 +1008,12 @@ func (c *DynamoDB) CreateTableRequest(input *CreateTableInput) (req *request.Req
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -1125,6 +1144,12 @@ func (c *DynamoDB) DeleteBackupRequest(input *DeleteBackupInput) (req *request.R
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -1419,6 +1444,12 @@ func (c *DynamoDB) DeleteTableRequest(input *DeleteTableInput) (req *request.Req
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -1980,6 +2011,12 @@ func (c *DynamoDB) DescribeExportRequest(input *DescribeExportInput) (req *reque
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -2996,6 +3033,12 @@ func (c *DynamoDB) DisableKinesisStreamingDestinationRequest(input *DisableKines
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - ResourceInUseException
// The operation conflicts with the resource's availability. For example, you
// attempted to recreate an existing table, or tried to delete a table currently
@@ -3129,6 +3172,12 @@ func (c *DynamoDB) EnableKinesisStreamingDestinationRequest(input *EnableKinesis
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - ResourceInUseException
// The operation conflicts with the resource's availability. For example, you
// attempted to recreate an existing table, or tried to delete a table currently
@@ -3602,6 +3651,12 @@ func (c *DynamoDB) ExportTableToPointInTimeRequest(input *ExportTableToPointInTi
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InvalidExportTimeException
// The specified ExportTime is outside of the point in time recovery window.
//
@@ -3837,6 +3892,12 @@ func (c *DynamoDB) ImportTableRequest(input *ImportTableInput) (req *request.Req
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - ImportConflictException
// There was a conflict when importing from the specified S3 source. This can
// occur when the current import conflicts with a previous import request that
@@ -4193,6 +4254,12 @@ func (c *DynamoDB) ListExportsRequest(input *ListExportsInput) (req *request.Req
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -4457,6 +4524,12 @@ func (c *DynamoDB) ListImportsRequest(input *ListImportsInput) (req *request.Req
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// See also, https://docs.aws.amazon.com/goto/WebAPI/dynamodb-2012-08-10/ListImports
func (c *DynamoDB) ListImports(input *ListImportsInput) (*ListImportsOutput, error) {
req, out := c.ListImportsRequest(input)
@@ -5312,6 +5385,12 @@ func (c *DynamoDB) RestoreTableFromBackupRequest(input *RestoreTableFromBackupIn
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -5479,6 +5558,12 @@ func (c *DynamoDB) RestoreTableToPointInTimeRequest(input *RestoreTableToPointIn
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InvalidRestoreTimeException
// An invalid restore time was specified. RestoreDateTime must be between EarliestRestorableDateTime
// and LatestRestorableDateTime.
@@ -5819,6 +5904,12 @@ func (c *DynamoDB) TagResourceRequest(input *TagResourceInput) (req *request.Req
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - ResourceNotFoundException
// The operation tried to access a nonexistent table or index. The resource
// might not be specified correctly, or its status might not be ACTIVE.
@@ -6491,6 +6582,12 @@ func (c *DynamoDB) UntagResourceRequest(input *UntagResourceInput) (req *request
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - ResourceNotFoundException
// The operation tried to access a nonexistent table or index. The resource
// might not be specified correctly, or its status might not be ACTIVE.
@@ -7000,6 +7097,12 @@ func (c *DynamoDB) UpdateGlobalTableSettingsRequest(input *UpdateGlobalTableSett
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - ResourceInUseException
// The operation conflicts with the resource's availability. For example, you
// attempted to recreate an existing table, or tried to delete a table currently
@@ -7291,6 +7394,12 @@ func (c *DynamoDB) UpdateTableRequest(input *UpdateTableInput) (req *request.Req
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -7399,6 +7508,12 @@ func (c *DynamoDB) UpdateTableReplicaAutoScalingRequest(input *UpdateTableReplic
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -7556,6 +7671,12 @@ func (c *DynamoDB) UpdateTimeToLiveRequest(input *UpdateTimeToLiveInput) (req *r
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -17086,6 +17207,12 @@ func (s *KinesisDataStreamDestination) SetStreamArn(v string) *KinesisDataStream
// are allowed per account.
//
// There is a soft account quota of 2,500 tables.
+//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
type LimitExceededException struct {
_ struct{} `type:"structure"`
RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"`
@@ -18533,7 +18660,7 @@ type ProvisionedThroughput struct {
// The maximum number of strongly consistent reads consumed per second before
// DynamoDB returns a ThrottlingException. For more information, see Specifying
- // Read and Write Requirements (https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkingWithTables.html#ProvisionedThroughput)
+ // Read and Write Requirements (https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ProvisionedThroughput.html)
// in the Amazon DynamoDB Developer Guide.
//
// If read/write capacity mode is PAY_PER_REQUEST the value is set to 0.
@@ -18543,7 +18670,7 @@ type ProvisionedThroughput struct {
// The maximum number of writes consumed per second before DynamoDB returns
// a ThrottlingException. For more information, see Specifying Read and Write
- // Requirements (https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkingWithTables.html#ProvisionedThroughput)
+ // Requirements (https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ProvisionedThroughput.html)
// in the Amazon DynamoDB Developer Guide.
//
// If read/write capacity mode is PAY_PER_REQUEST the value is set to 0.
diff --git a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/errors.go b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/errors.go
index d3af3262eb6..79b80e693a1 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/dynamodb/errors.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/dynamodb/errors.go
@@ -135,6 +135,12 @@ const (
// are allowed per account.
//
// There is a soft account quota of 2,500 tables.
+ //
+ // GetRecords was called with a value of more than 1000 for the limit request
+ // parameter.
+ //
+ // More than 2 processes are reading from the same streams shard at the same
+ // time. Exceeding this limit may result in request throttling.
ErrCodeLimitExceededException = "LimitExceededException"
// ErrCodePointInTimeRecoveryUnavailableException for service response error code
diff --git a/vendor/github.com/aws/aws-sdk-go/service/dynamodbstreams/api.go b/vendor/github.com/aws/aws-sdk-go/service/dynamodbstreams/api.go
index 1fec743401e..a308b110d20 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/dynamodbstreams/api.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/dynamodbstreams/api.go
@@ -191,6 +191,12 @@ func (c *DynamoDBStreams) GetRecordsRequest(input *GetRecordsInput) (req *reques
//
// There is a soft account quota of 2,500 tables.
//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
+//
// - InternalServerError
// An error occurred on the server side.
//
@@ -972,6 +978,12 @@ func (s *InternalServerError) RequestID() string {
// are allowed per account.
//
// There is a soft account quota of 2,500 tables.
+//
+// GetRecords was called with a value of more than 1000 for the limit request
+// parameter.
+//
+// More than 2 processes are reading from the same streams shard at the same
+// time. Exceeding this limit may result in request throttling.
type LimitExceededException struct {
_ struct{} `type:"structure"`
RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"`
@@ -1182,8 +1194,8 @@ type Record struct {
// * REMOVE - the item was deleted from the table
EventName *string `locationName:"eventName" type:"string" enum:"OperationType"`
- // The AWS service from which the stream record originated. For DynamoDB Streams,
- // this is aws:dynamodb.
+ // The Amazon Web Services service from which the stream record originated.
+ // For DynamoDB Streams, this is aws:dynamodb.
EventSource *string `locationName:"eventSource" type:"string"`
// The version number of the stream record format. This number is updated whenever
@@ -1437,7 +1449,7 @@ type Stream struct {
// However, the combination of the following three elements is guaranteed to
// be unique:
//
- // * the AWS customer ID.
+ // * the Amazon Web Services customer ID.
//
// * the table name
//
@@ -1519,7 +1531,7 @@ type StreamDescription struct {
// However, the combination of the following three elements is guaranteed to
// be unique:
//
- // * the AWS customer ID.
+ // * the Amazon Web Services customer ID.
//
// * the table name
//
@@ -1634,7 +1646,8 @@ type StreamRecord struct {
_ struct{} `type:"structure"`
// The approximate date and time when the stream record was created, in UNIX
- // epoch time (http://www.epochconverter.com/) format.
+ // epoch time (http://www.epochconverter.com/) format and rounded down to the
+ // closest second.
ApproximateCreationDateTime *time.Time `type:"timestamp"`
// The primary key attribute(s) for the DynamoDB item that was modified.
diff --git a/vendor/github.com/aws/aws-sdk-go/service/dynamodbstreams/errors.go b/vendor/github.com/aws/aws-sdk-go/service/dynamodbstreams/errors.go
index 0a478a577af..f2f8e38585a 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/dynamodbstreams/errors.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/dynamodbstreams/errors.go
@@ -40,6 +40,12 @@ const (
// are allowed per account.
//
// There is a soft account quota of 2,500 tables.
+ //
+ // GetRecords was called with a value of more than 1000 for the limit request
+ // parameter.
+ //
+ // More than 2 processes are reading from the same streams shard at the same
+ // time. Exceeding this limit may result in request throttling.
ErrCodeLimitExceededException = "LimitExceededException"
// ErrCodeResourceNotFoundException for service response error code
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sqs/api.go b/vendor/github.com/aws/aws-sdk-go/service/sqs/api.go
index b4299d79b4e..844e7b66c85 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/sqs/api.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/sqs/api.go
@@ -70,22 +70,16 @@ func (c *SQS) AddPermissionRequest(input *AddPermissionInput) (req *request.Requ
// with the Amazon SQS Access Policy Language (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-creating-custom-policies.html)
// in the Amazon SQS Developer Guide.
//
-// - An Amazon SQS policy can have a maximum of 7 actions.
+// - An Amazon SQS policy can have a maximum of seven actions per statement.
//
// - To remove the ability to change queue permissions, you must deny permission
// to the AddPermission, RemovePermission, and SetQueueAttributes actions
// in your IAM policy.
//
-// Some actions take lists of parameters. These lists are specified using the
-// param.n notation. Values of n are integers starting from 1. For example,
-// a parameter list with two elements looks like this:
-//
-// &AttributeName.1=first
-//
-// &AttributeName.2=second
+// - Amazon SQS AddPermission does not support adding a non-account principal.
//
// Cross-account permissions don't apply to this action. For more information,
-// see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+// see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
@@ -98,7 +92,7 @@ func (c *SQS) AddPermissionRequest(input *AddPermissionInput) (req *request.Requ
// Returned Error Codes:
// - ErrCodeOverLimit "OverLimit"
// The specified action violates a limit. For example, ReceiveMessage returns
-// this error if the maximum number of inflight messages is reached and AddPermission
+// this error if the maximum number of in flight messages is reached and AddPermission
// returns this error if the maximum number of permissions for the queue is
// reached.
//
@@ -124,6 +118,95 @@ func (c *SQS) AddPermissionWithContext(ctx aws.Context, input *AddPermissionInpu
return out, req.Send()
}
+const opCancelMessageMoveTask = "CancelMessageMoveTask"
+
+// CancelMessageMoveTaskRequest generates a "aws/request.Request" representing the
+// client's request for the CancelMessageMoveTask operation. The "output" return
+// value will be populated with the request's response once the request completes
+// successfully.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
+//
+// See CancelMessageMoveTask for more information on using the CancelMessageMoveTask
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
+//
+// // Example sending a request using the CancelMessageMoveTaskRequest method.
+// req, resp := client.CancelMessageMoveTaskRequest(params)
+//
+// err := req.Send()
+// if err == nil { // resp is now filled
+// fmt.Println(resp)
+// }
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sqs-2012-11-05/CancelMessageMoveTask
+func (c *SQS) CancelMessageMoveTaskRequest(input *CancelMessageMoveTaskInput) (req *request.Request, output *CancelMessageMoveTaskOutput) {
+ op := &request.Operation{
+ Name: opCancelMessageMoveTask,
+ HTTPMethod: "POST",
+ HTTPPath: "/",
+ }
+
+ if input == nil {
+ input = &CancelMessageMoveTaskInput{}
+ }
+
+ output = &CancelMessageMoveTaskOutput{}
+ req = c.newRequest(op, input, output)
+ return
+}
+
+// CancelMessageMoveTask API operation for Amazon Simple Queue Service.
+//
+// Cancels a specified message movement task.
+//
+// - A message movement can only be cancelled when the current status is
+// RUNNING.
+//
+// - Cancelling a message movement task does not revert the messages that
+// have already been moved. It can only stop the messages that have not been
+// moved yet.
+//
+// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
+// with awserr.Error's Code and Message methods to get detailed information about
+// the error.
+//
+// See the AWS API reference guide for Amazon Simple Queue Service's
+// API operation CancelMessageMoveTask for usage and error information.
+//
+// Returned Error Codes:
+//
+// - ErrCodeResourceNotFoundException "ResourceNotFoundException"
+// One or more specified resources don't exist.
+//
+// - ErrCodeUnsupportedOperation "AWS.SimpleQueueService.UnsupportedOperation"
+// Error code 400. Unsupported operation.
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sqs-2012-11-05/CancelMessageMoveTask
+func (c *SQS) CancelMessageMoveTask(input *CancelMessageMoveTaskInput) (*CancelMessageMoveTaskOutput, error) {
+ req, out := c.CancelMessageMoveTaskRequest(input)
+ return out, req.Send()
+}
+
+// CancelMessageMoveTaskWithContext is the same as CancelMessageMoveTask with the addition of
+// the ability to pass a context and additional request options.
+//
+// See CancelMessageMoveTask for details on how to use this API operation.
+//
+// The context must be non-nil and will be used for request cancellation. If
+// the context is nil a panic will occur. In the future the SDK may create
+// sub-contexts for http.Requests. See https://golang.org/pkg/context/
+// for more information on using Contexts.
+func (c *SQS) CancelMessageMoveTaskWithContext(ctx aws.Context, input *CancelMessageMoveTaskInput, opts ...request.Option) (*CancelMessageMoveTaskOutput, error) {
+ req, out := c.CancelMessageMoveTaskRequest(input)
+ req.SetContext(ctx)
+ req.ApplyOptions(opts...)
+ return out, req.Send()
+}
+
const opChangeMessageVisibility = "ChangeMessageVisibility"
// ChangeMessageVisibilityRequest generates a "aws/request.Request" representing the
@@ -174,11 +257,13 @@ func (c *SQS) ChangeMessageVisibilityRequest(input *ChangeMessageVisibilityInput
// Timeout (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-visibility-timeout.html)
// in the Amazon SQS Developer Guide.
//
-// For example, you have a message with a visibility timeout of 5 minutes. After
-// 3 minutes, you call ChangeMessageVisibility with a timeout of 10 minutes.
-// You can continue to call ChangeMessageVisibility to extend the visibility
-// timeout to the maximum allowed time. If you try to extend the visibility
-// timeout beyond the maximum, your request is rejected.
+// For example, if the default timeout for a queue is 60 seconds, 15 seconds
+// have elapsed since you received the message, and you send a ChangeMessageVisibility
+// call with VisibilityTimeout set to 10 seconds, the 10 seconds begin to count
+// from the time that you make the ChangeMessageVisibility call. Thus, any attempt
+// to change the visibility timeout or to delete that message 10 seconds after
+// you initially change the visibility timeout (a total of 25 seconds) might
+// result in an error.
//
// An Amazon SQS message has three basic states:
//
@@ -193,20 +278,20 @@ func (c *SQS) ChangeMessageVisibilityRequest(input *ChangeMessageVisibilityInput
// 1 and 2). There is no limit to the number of stored messages. A message is
// considered to be in flight after it is received from a queue by a consumer,
// but not yet deleted from the queue (that is, between states 2 and 3). There
-// is a limit to the number of inflight messages.
+// is a limit to the number of in flight messages.
//
-// Limits that apply to inflight messages are unrelated to the unlimited number
+// Limits that apply to in flight messages are unrelated to the unlimited number
// of stored messages.
//
// For most standard queues (depending on queue traffic and message backlog),
-// there can be a maximum of approximately 120,000 inflight messages (received
+// there can be a maximum of approximately 120,000 in flight messages (received
// from a queue by a consumer, but not yet deleted from the queue). If you reach
// this limit, Amazon SQS returns the OverLimit error message. To avoid reaching
// the limit, you should delete messages from the queue after they're processed.
// You can also increase the number of queues you use to process your messages.
// To request a limit increase, file a support request (https://console.aws.amazon.com/support/home#/case/create?issueType=service-limit-increase&limitType=service-code-sqs).
//
-// For FIFO queues, there can be a maximum of 20,000 inflight messages (received
+// For FIFO queues, there can be a maximum of 20,000 in flight messages (received
// from a queue by a consumer, but not yet deleted from the queue). If you reach
// this limit, Amazon SQS returns no error messages.
//
@@ -310,14 +395,6 @@ func (c *SQS) ChangeMessageVisibilityBatchRequest(input *ChangeMessageVisibility
// actions, you should check for batch errors even when the call returns an
// HTTP status code of 200.
//
-// Some actions take lists of parameters. These lists are specified using the
-// param.n notation. Values of n are integers starting from 1. For example,
-// a parameter list with two elements looks like this:
-//
-// &AttributeName.1=first
-//
-// &AttributeName.2=second
-//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
// with awserr.Error's Code and Message methods to get detailed information about
// the error.
@@ -438,16 +515,8 @@ func (c *SQS) CreateQueueRequest(input *CreateQueueInput) (req *request.Request,
// - If the queue name, attribute names, or attribute values don't match
// an existing queue, CreateQueue returns an error.
//
-// Some actions take lists of parameters. These lists are specified using the
-// param.n notation. Values of n are integers starting from 1. For example,
-// a parameter list with two elements looks like this:
-//
-// &AttributeName.1=first
-//
-// &AttributeName.2=second
-//
// Cross-account permissions don't apply to this action. For more information,
-// see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+// see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
@@ -545,7 +614,7 @@ func (c *SQS) DeleteMessageRequest(input *DeleteMessageInput) (req *request.Requ
// If you receive a message more than once, the ReceiptHandle is different each
// time you receive a message. When you use the DeleteMessage action, you must
// provide the most recently received ReceiptHandle for the message (otherwise,
-// the request succeeds, but the message might not be deleted).
+// the request succeeds, but the message will not be deleted).
//
// For standard queues, it is possible to receive a message even after you delete
// it. This might happen on rare occasions if one of the servers which stores
@@ -643,14 +712,6 @@ func (c *SQS) DeleteMessageBatchRequest(input *DeleteMessageBatchInput) (req *re
// actions, you should check for batch errors even when the call returns an
// HTTP status code of 200.
//
-// Some actions take lists of parameters. These lists are specified using the
-// param.n notation. Values of n are integers starting from 1. For example,
-// a parameter list with two elements looks like this:
-//
-// &AttributeName.1=first
-//
-// &AttributeName.2=second
-//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
// with awserr.Error's Code and Message methods to get detailed information about
// the error.
@@ -752,9 +813,11 @@ func (c *SQS) DeleteQueueRequest(input *DeleteQueueInput) (req *request.Request,
// a queue with the same name.
//
// Cross-account permissions don't apply to this action. For more information,
-// see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+// see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
//
+// The delete operation uses the HTTP GET verb.
+//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
// with awserr.Error's Code and Message methods to get detailed information about
// the error.
@@ -1097,6 +1160,89 @@ func (c *SQS) ListDeadLetterSourceQueuesPagesWithContext(ctx aws.Context, input
return p.Err()
}
+const opListMessageMoveTasks = "ListMessageMoveTasks"
+
+// ListMessageMoveTasksRequest generates a "aws/request.Request" representing the
+// client's request for the ListMessageMoveTasks operation. The "output" return
+// value will be populated with the request's response once the request completes
+// successfully.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
+//
+// See ListMessageMoveTasks for more information on using the ListMessageMoveTasks
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
+//
+// // Example sending a request using the ListMessageMoveTasksRequest method.
+// req, resp := client.ListMessageMoveTasksRequest(params)
+//
+// err := req.Send()
+// if err == nil { // resp is now filled
+// fmt.Println(resp)
+// }
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sqs-2012-11-05/ListMessageMoveTasks
+func (c *SQS) ListMessageMoveTasksRequest(input *ListMessageMoveTasksInput) (req *request.Request, output *ListMessageMoveTasksOutput) {
+ op := &request.Operation{
+ Name: opListMessageMoveTasks,
+ HTTPMethod: "POST",
+ HTTPPath: "/",
+ }
+
+ if input == nil {
+ input = &ListMessageMoveTasksInput{}
+ }
+
+ output = &ListMessageMoveTasksOutput{}
+ req = c.newRequest(op, input, output)
+ return
+}
+
+// ListMessageMoveTasks API operation for Amazon Simple Queue Service.
+//
+// Gets the most recent message movement tasks (up to 10) under a specific source
+// queue.
+//
+// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
+// with awserr.Error's Code and Message methods to get detailed information about
+// the error.
+//
+// See the AWS API reference guide for Amazon Simple Queue Service's
+// API operation ListMessageMoveTasks for usage and error information.
+//
+// Returned Error Codes:
+//
+// - ErrCodeResourceNotFoundException "ResourceNotFoundException"
+// One or more specified resources don't exist.
+//
+// - ErrCodeUnsupportedOperation "AWS.SimpleQueueService.UnsupportedOperation"
+// Error code 400. Unsupported operation.
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sqs-2012-11-05/ListMessageMoveTasks
+func (c *SQS) ListMessageMoveTasks(input *ListMessageMoveTasksInput) (*ListMessageMoveTasksOutput, error) {
+ req, out := c.ListMessageMoveTasksRequest(input)
+ return out, req.Send()
+}
+
+// ListMessageMoveTasksWithContext is the same as ListMessageMoveTasks with the addition of
+// the ability to pass a context and additional request options.
+//
+// See ListMessageMoveTasks for details on how to use this API operation.
+//
+// The context must be non-nil and will be used for request cancellation. If
+// the context is nil a panic will occur. In the future the SDK may create
+// sub-contexts for http.Requests. See https://golang.org/pkg/context/
+// for more information on using Contexts.
+func (c *SQS) ListMessageMoveTasksWithContext(ctx aws.Context, input *ListMessageMoveTasksInput, opts ...request.Option) (*ListMessageMoveTasksOutput, error) {
+ req, out := c.ListMessageMoveTasksRequest(input)
+ req.SetContext(ctx)
+ req.ApplyOptions(opts...)
+ return out, req.Send()
+}
+
const opListQueueTags = "ListQueueTags"
// ListQueueTagsRequest generates a "aws/request.Request" representing the
@@ -1145,7 +1291,7 @@ func (c *SQS) ListQueueTagsRequest(input *ListQueueTagsInput) (req *request.Requ
// in the Amazon SQS Developer Guide.
//
// Cross-account permissions don't apply to this action. For more information,
-// see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+// see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
@@ -1238,7 +1384,7 @@ func (c *SQS) ListQueuesRequest(input *ListQueuesInput) (req *request.Request, o
// request to listQueues to receive the next page of results.
//
// Cross-account permissions don't apply to this action. For more information,
-// see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+// see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
@@ -1518,7 +1664,7 @@ func (c *SQS) ReceiveMessageRequest(input *ReceiveMessageInput) (req *request.Re
// Returned Error Codes:
// - ErrCodeOverLimit "OverLimit"
// The specified action violates a limit. For example, ReceiveMessage returns
-// this error if the maximum number of inflight messages is reached and AddPermission
+// this error if the maximum number of in flight messages is reached and AddPermission
// returns this error if the maximum number of permissions for the queue is
// reached.
//
@@ -1594,7 +1740,7 @@ func (c *SQS) RemovePermissionRequest(input *RemovePermissionInput) (req *reques
// - Only the owner of a queue can remove permissions from it.
//
// - Cross-account permissions don't apply to this action. For more information,
-// see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+// see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
//
// - To remove the ability to change queue permissions, you must deny permission
@@ -1762,9 +1908,11 @@ func (c *SQS) SendMessageBatchRequest(input *SendMessageBatchInput) (req *reques
// SendMessageBatch API operation for Amazon Simple Queue Service.
//
-// Delivers up to ten messages to the specified queue. This is a batch version
-// of SendMessage. For a FIFO queue, multiple messages within a single batch
-// are enqueued in the order they are sent.
+// You can use SendMessageBatch to send up to 10 messages to the specified queue
+// by assigning either identical or different values to each message (or by
+// not assigning values at all). This is a batch version of SendMessage. For
+// a FIFO queue, multiple messages within a single batch are enqueued in the
+// order they are sent.
//
// The result of sending each message is reported individually in the response.
// Because the batch request can result in a combination of successful and unsuccessful
@@ -1773,7 +1921,7 @@ func (c *SQS) SendMessageBatchRequest(input *SendMessageBatchInput) (req *reques
//
// The maximum allowed individual message size and the maximum total payload
// size (the sum of the individual lengths of all of the batched messages) are
-// both 256 KB (262,144 bytes).
+// both 256 KiB (262,144 bytes).
//
// A message can include only XML, JSON, and unformatted text. The following
// Unicode characters are allowed:
@@ -1786,14 +1934,6 @@ func (c *SQS) SendMessageBatchRequest(input *SendMessageBatchInput) (req *reques
// If you don't specify the DelaySeconds parameter for an entry, Amazon SQS
// uses the default value for the queue.
//
-// Some actions take lists of parameters. These lists are specified using the
-// param.n notation. Values of n are integers starting from 1. For example,
-// a parameter list with two elements looks like this:
-//
-// &AttributeName.1=first
-//
-// &AttributeName.2=second
-//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
// with awserr.Error's Code and Message methods to get detailed information about
// the error.
@@ -1890,14 +2030,16 @@ func (c *SQS) SetQueueAttributesRequest(input *SetQueueAttributesInput) (req *re
// Sets the value of one or more queue attributes. When you change a queue's
// attributes, the change can take up to 60 seconds for most of the attributes
// to propagate throughout the Amazon SQS system. Changes made to the MessageRetentionPeriod
-// attribute can take up to 15 minutes.
+// attribute can take up to 15 minutes and will impact existing messages in
+// the queue potentially causing them to be expired and deleted if the MessageRetentionPeriod
+// is reduced below the age of existing messages.
//
// - In the future, new attributes might be added. If you write code that
// calls this action, we recommend that you structure your code so that it
// can handle new attributes gracefully.
//
// - Cross-account permissions don't apply to this action. For more information,
-// see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+// see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
//
// - To remove the ability to change queue permissions, you must deny permission
@@ -1937,6 +2079,100 @@ func (c *SQS) SetQueueAttributesWithContext(ctx aws.Context, input *SetQueueAttr
return out, req.Send()
}
+const opStartMessageMoveTask = "StartMessageMoveTask"
+
+// StartMessageMoveTaskRequest generates a "aws/request.Request" representing the
+// client's request for the StartMessageMoveTask operation. The "output" return
+// value will be populated with the request's response once the request completes
+// successfully.
+//
+// Use "Send" method on the returned Request to send the API call to the service.
+// the "output" return value is not valid until after Send returns without error.
+//
+// See StartMessageMoveTask for more information on using the StartMessageMoveTask
+// API call, and error handling.
+//
+// This method is useful when you want to inject custom logic or configuration
+// into the SDK's request lifecycle. Such as custom headers, or retry logic.
+//
+// // Example sending a request using the StartMessageMoveTaskRequest method.
+// req, resp := client.StartMessageMoveTaskRequest(params)
+//
+// err := req.Send()
+// if err == nil { // resp is now filled
+// fmt.Println(resp)
+// }
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sqs-2012-11-05/StartMessageMoveTask
+func (c *SQS) StartMessageMoveTaskRequest(input *StartMessageMoveTaskInput) (req *request.Request, output *StartMessageMoveTaskOutput) {
+ op := &request.Operation{
+ Name: opStartMessageMoveTask,
+ HTTPMethod: "POST",
+ HTTPPath: "/",
+ }
+
+ if input == nil {
+ input = &StartMessageMoveTaskInput{}
+ }
+
+ output = &StartMessageMoveTaskOutput{}
+ req = c.newRequest(op, input, output)
+ return
+}
+
+// StartMessageMoveTask API operation for Amazon Simple Queue Service.
+//
+// Starts an asynchronous task to move messages from a specified source queue
+// to a specified destination queue.
+//
+// - This action is currently limited to supporting message redrive from
+// dead-letter queues (DLQs) only. In this context, the source queue is the
+// dead-letter queue (DLQ), while the destination queue can be the original
+// source queue (from which the messages were driven to the dead-letter-queue),
+// or a custom destination queue.
+//
+// - Currently, only standard queues are supported.
+//
+// - Only one active message movement task is supported per queue at any
+// given time.
+//
+// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
+// with awserr.Error's Code and Message methods to get detailed information about
+// the error.
+//
+// See the AWS API reference guide for Amazon Simple Queue Service's
+// API operation StartMessageMoveTask for usage and error information.
+//
+// Returned Error Codes:
+//
+// - ErrCodeResourceNotFoundException "ResourceNotFoundException"
+// One or more specified resources don't exist.
+//
+// - ErrCodeUnsupportedOperation "AWS.SimpleQueueService.UnsupportedOperation"
+// Error code 400. Unsupported operation.
+//
+// See also, https://docs.aws.amazon.com/goto/WebAPI/sqs-2012-11-05/StartMessageMoveTask
+func (c *SQS) StartMessageMoveTask(input *StartMessageMoveTaskInput) (*StartMessageMoveTaskOutput, error) {
+ req, out := c.StartMessageMoveTaskRequest(input)
+ return out, req.Send()
+}
+
+// StartMessageMoveTaskWithContext is the same as StartMessageMoveTask with the addition of
+// the ability to pass a context and additional request options.
+//
+// See StartMessageMoveTask for details on how to use this API operation.
+//
+// The context must be non-nil and will be used for request cancellation. If
+// the context is nil a panic will occur. In the future the SDK may create
+// sub-contexts for http.Requests. See https://golang.org/pkg/context/
+// for more information on using Contexts.
+func (c *SQS) StartMessageMoveTaskWithContext(ctx aws.Context, input *StartMessageMoveTaskInput, opts ...request.Option) (*StartMessageMoveTaskOutput, error) {
+ req, out := c.StartMessageMoveTaskRequest(input)
+ req.SetContext(ctx)
+ req.ApplyOptions(opts...)
+ return out, req.Send()
+}
+
const opTagQueue = "TagQueue"
// TagQueueRequest generates a "aws/request.Request" representing the
@@ -2001,7 +2237,7 @@ func (c *SQS) TagQueueRequest(input *TagQueueInput) (req *request.Request, outpu
// in the Amazon SQS Developer Guide.
//
// Cross-account permissions don't apply to this action. For more information,
-// see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+// see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
@@ -2081,7 +2317,7 @@ func (c *SQS) UntagQueueRequest(input *UntagQueueInput) (req *request.Request, o
// in the Amazon SQS Developer Guide.
//
// Cross-account permissions don't apply to this action. For more information,
-// see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+// see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
//
// Returns awserr.Error for service API and SDK errors. Use runtime type assertions
@@ -2305,10 +2541,87 @@ func (s *BatchResultErrorEntry) SetSenderFault(v bool) *BatchResultErrorEntry {
return s
}
+type CancelMessageMoveTaskInput struct {
+ _ struct{} `type:"structure"`
+
+ // An identifier associated with a message movement task.
+ //
+ // TaskHandle is a required field
+ TaskHandle *string `type:"string" required:"true"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s CancelMessageMoveTaskInput) String() string {
+ return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s CancelMessageMoveTaskInput) GoString() string {
+ return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *CancelMessageMoveTaskInput) Validate() error {
+ invalidParams := request.ErrInvalidParams{Context: "CancelMessageMoveTaskInput"}
+ if s.TaskHandle == nil {
+ invalidParams.Add(request.NewErrParamRequired("TaskHandle"))
+ }
+
+ if invalidParams.Len() > 0 {
+ return invalidParams
+ }
+ return nil
+}
+
+// SetTaskHandle sets the TaskHandle field's value.
+func (s *CancelMessageMoveTaskInput) SetTaskHandle(v string) *CancelMessageMoveTaskInput {
+ s.TaskHandle = &v
+ return s
+}
+
+type CancelMessageMoveTaskOutput struct {
+ _ struct{} `type:"structure"`
+
+ // The approximate number of messages already moved to the destination queue.
+ ApproximateNumberOfMessagesMoved *int64 `type:"long"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s CancelMessageMoveTaskOutput) String() string {
+ return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s CancelMessageMoveTaskOutput) GoString() string {
+ return s.String()
+}
+
+// SetApproximateNumberOfMessagesMoved sets the ApproximateNumberOfMessagesMoved field's value.
+func (s *CancelMessageMoveTaskOutput) SetApproximateNumberOfMessagesMoved(v int64) *CancelMessageMoveTaskOutput {
+ s.ApproximateNumberOfMessagesMoved = &v
+ return s
+}
+
type ChangeMessageVisibilityBatchInput struct {
_ struct{} `type:"structure"`
- // A list of receipt handles of the messages for which the visibility timeout
+ // Lists the receipt handles of the messages for which the visibility timeout
// must be changed.
//
// Entries is a required field
@@ -2425,17 +2738,7 @@ func (s *ChangeMessageVisibilityBatchOutput) SetSuccessful(v []*ChangeMessageVis
return s
}
-// Encloses a receipt handle and an entry id for each message in ChangeMessageVisibilityBatch.
-//
-// All of the following list parameters must be prefixed with ChangeMessageVisibilityBatchRequestEntry.n,
-// where n is an integer value starting with 1. For example, a parameter list
-// for this action might look like this:
-//
-// &ChangeMessageVisibilityBatchRequestEntry.1.Id=change_visibility_msg_2
-//
-// &ChangeMessageVisibilityBatchRequestEntry.1.ReceiptHandle=your_receipt_handle
-//
-// &ChangeMessageVisibilityBatchRequestEntry.1.VisibilityTimeout=45
+// Encloses a receipt handle and an entry ID for each message in ChangeMessageVisibilityBatch.
type ChangeMessageVisibilityBatchRequestEntry struct {
_ struct{} `type:"structure"`
@@ -2555,8 +2858,8 @@ type ChangeMessageVisibilityInput struct {
// QueueUrl is a required field
QueueUrl *string `type:"string" required:"true"`
- // The receipt handle associated with the message whose visibility timeout is
- // changed. This parameter is returned by the ReceiveMessage action.
+ // The receipt handle associated with the message, whose visibility timeout
+ // is changed. This parameter is returned by the ReceiveMessage action.
//
// ReceiptHandle is a required field
ReceiptHandle *string `type:"string" required:"true"`
@@ -2664,36 +2967,60 @@ type CreateQueueInput struct {
// * MessageRetentionPeriod – The length of time, in seconds, for which
// Amazon SQS retains a message. Valid values: An integer from 60 seconds
// (1 minute) to 1,209,600 seconds (14 days). Default: 345,600 (4 days).
+ // When you change a queue's attributes, the change can take up to 60 seconds
+ // for most of the attributes to propagate throughout the Amazon SQS system.
+ // Changes made to the MessageRetentionPeriod attribute can take up to 15
+ // minutes and will impact existing messages in the queue potentially causing
+ // them to be expired and deleted if the MessageRetentionPeriod is reduced
+ // below the age of existing messages.
//
// * Policy – The queue's policy. A valid Amazon Web Services policy. For
// more information about policy structure, see Overview of Amazon Web Services
// IAM Policies (https://docs.aws.amazon.com/IAM/latest/UserGuide/PoliciesOverview.html)
- // in the Amazon IAM User Guide.
+ // in the IAM User Guide.
//
// * ReceiveMessageWaitTimeSeconds – The length of time, in seconds, for
// which a ReceiveMessage action waits for a message to arrive. Valid values:
// An integer from 0 to 20 (seconds). Default: 0.
//
- // * RedrivePolicy – The string that includes the parameters for the dead-letter
- // queue functionality of the source queue as a JSON object. For more information
- // about the redrive policy and dead-letter queues, see Using Amazon SQS
- // Dead-Letter Queues (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-dead-letter-queues.html)
- // in the Amazon SQS Developer Guide. deadLetterTargetArn – The Amazon
- // Resource Name (ARN) of the dead-letter queue to which Amazon SQS moves
- // messages after the value of maxReceiveCount is exceeded. maxReceiveCount
- // – The number of times a message is delivered to the source queue before
- // being moved to the dead-letter queue. When the ReceiveCount for a message
- // exceeds the maxReceiveCount for a queue, Amazon SQS moves the message
- // to the dead-letter-queue. The dead-letter queue of a FIFO queue must also
- // be a FIFO queue. Similarly, the dead-letter queue of a standard queue
- // must also be a standard queue.
- //
// * VisibilityTimeout – The visibility timeout for the queue, in seconds.
// Valid values: An integer from 0 to 43,200 (12 hours). Default: 30. For
// more information about the visibility timeout, see Visibility Timeout
// (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-visibility-timeout.html)
// in the Amazon SQS Developer Guide.
//
+ // The following attributes apply only to dead-letter queues: (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-dead-letter-queues.html)
+ //
+ // * RedrivePolicy – The string that includes the parameters for the dead-letter
+ // queue functionality of the source queue as a JSON object. The parameters
+ // are as follows: deadLetterTargetArn – The Amazon Resource Name (ARN)
+ // of the dead-letter queue to which Amazon SQS moves messages after the
+ // value of maxReceiveCount is exceeded. maxReceiveCount – The number of
+ // times a message is delivered to the source queue before being moved to
+ // the dead-letter queue. Default: 10. When the ReceiveCount for a message
+ // exceeds the maxReceiveCount for a queue, Amazon SQS moves the message
+ // to the dead-letter-queue.
+ //
+ // * RedriveAllowPolicy – The string that includes the parameters for the
+ // permissions for the dead-letter queue redrive permission and which source
+ // queues can specify dead-letter queues as a JSON object. The parameters
+ // are as follows: redrivePermission – The permission type that defines
+ // which source queues can specify the current queue as the dead-letter queue.
+ // Valid values are: allowAll – (Default) Any source queues in this Amazon
+ // Web Services account in the same Region can specify this queue as the
+ // dead-letter queue. denyAll – No source queues can specify this queue
+ // as the dead-letter queue. byQueue – Only queues specified by the sourceQueueArns
+ // parameter can specify this queue as the dead-letter queue. sourceQueueArns
+ // – The Amazon Resource Names (ARN)s of the source queues that can specify
+ // this queue as the dead-letter queue and redrive messages. You can specify
+ // this parameter only when the redrivePermission parameter is set to byQueue.
+ // You can specify up to 10 source queue ARNs. To allow more than 10 source
+ // queues to specify dead-letter queues, set the redrivePermission parameter
+ // to allowAll.
+ //
+ // The dead-letter queue of a FIFO queue must also be a FIFO queue. Similarly,
+ // the dead-letter queue of a standard queue must also be a standard queue.
+ //
// The following attributes apply only to server-side-encryption (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-server-side-encryption.html):
//
// * KmsMasterKeyId – The ID of an Amazon Web Services managed customer
@@ -2711,11 +3038,11 @@ type CreateQueueInput struct {
// Default: 300 (5 minutes). A shorter time period provides better security
// but results in more calls to KMS which might incur charges after Free
// Tier. For more information, see How Does the Data Key Reuse Period Work?
- // (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-server-side-encryption.html#sqs-how-does-the-data-key-reuse-period-work).
+ // (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-server-side-encryption.html#sqs-how-does-the-data-key-reuse-period-work)
//
// * SqsManagedSseEnabled – Enables server-side queue encryption using
// SQS owned encryption keys. Only one server-side encryption option is supported
- // per queue (e.g. SSE-KMS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sse-existing-queue.html)
+ // per queue (for example, SSE-KMS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sse-existing-queue.html)
// or SSE-SQS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sqs-sse-queue.html)).
//
// The following attributes apply only to FIFO (first-in-first-out) queues (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/FIFO-queues.html):
@@ -2809,7 +3136,7 @@ type CreateQueueInput struct {
// and sqs:TagQueue permissions.
//
// Cross-account permissions don't apply to this action. For more information,
- // see Grant cross-account permissions to a role and a user name (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
+ // see Grant cross-account permissions to a role and a username (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-customer-managed-policy-examples.html#grant-cross-account-permissions-to-role-and-user-name)
// in the Amazon SQS Developer Guide.
Tags map[string]*string `locationName:"Tag" locationNameKey:"Key" locationNameValue:"Value" type:"map" flattened:"true"`
}
@@ -2898,7 +3225,7 @@ func (s *CreateQueueOutput) SetQueueUrl(v string) *CreateQueueOutput {
type DeleteMessageBatchInput struct {
_ struct{} `type:"structure"`
- // A list of receipt handles for the messages to be deleted.
+ // Lists the receipt handles for the messages to be deleted.
//
// Entries is a required field
Entries []*DeleteMessageBatchRequestEntry `locationNameList:"DeleteMessageBatchRequestEntry" type:"list" flattened:"true" required:"true"`
@@ -3018,7 +3345,7 @@ func (s *DeleteMessageBatchOutput) SetSuccessful(v []*DeleteMessageBatchResultEn
type DeleteMessageBatchRequestEntry struct {
_ struct{} `type:"structure"`
- // An identifier for this particular receipt handle. This is used to communicate
+ // The identifier for this particular receipt handle. This is used to communicate
// the result.
//
// The Ids of a batch request need to be unique within a request.
@@ -3274,7 +3601,7 @@ type GetQueueAttributesInput struct {
// A list of attributes for which to retrieve information.
//
- // The AttributeName.N parameter is optional, but if you don't specify values
+ // The AttributeNames parameter is optional, but if you don't specify values
// for this parameter, the request returns empty results.
//
// In the future, new attributes might be added. If you write code that calls
@@ -3284,8 +3611,8 @@ type GetQueueAttributesInput struct {
// The following attributes are supported:
//
// The ApproximateNumberOfMessagesDelayed, ApproximateNumberOfMessagesNotVisible,
- // and ApproximateNumberOfMessagesVisible metrics may not achieve consistency
- // until at least 1 minute after the producers stop sending messages. This period
+ // and ApproximateNumberOfMessages metrics may not achieve consistency until
+ // at least 1 minute after the producers stop sending messages. This period
// is required for the queue metadata to reach eventual consistency.
//
// * All – Returns all values.
@@ -3315,7 +3642,12 @@ type GetQueueAttributesInput struct {
// can contain before Amazon SQS rejects it.
//
// * MessageRetentionPeriod – Returns the length of time, in seconds, for
- // which Amazon SQS retains a message.
+ // which Amazon SQS retains a message. When you change a queue's attributes,
+ // the change can take up to 60 seconds for most of the attributes to propagate
+ // throughout the Amazon SQS system. Changes made to the MessageRetentionPeriod
+ // attribute can take up to 15 minutes and will impact existing messages
+ // in the queue potentially causing them to be expired and deleted if the
+ // MessageRetentionPeriod is reduced below the age of existing messages.
//
// * Policy – Returns the policy of the queue.
//
@@ -3324,23 +3656,43 @@ type GetQueueAttributesInput struct {
// * ReceiveMessageWaitTimeSeconds – Returns the length of time, in seconds,
// for which the ReceiveMessage action waits for a message to arrive.
//
- // * RedrivePolicy – The string that includes the parameters for the dead-letter
- // queue functionality of the source queue as a JSON object. For more information
- // about the redrive policy and dead-letter queues, see Using Amazon SQS
- // Dead-Letter Queues (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-dead-letter-queues.html)
- // in the Amazon SQS Developer Guide. deadLetterTargetArn – The Amazon
- // Resource Name (ARN) of the dead-letter queue to which Amazon SQS moves
- // messages after the value of maxReceiveCount is exceeded. maxReceiveCount
- // – The number of times a message is delivered to the source queue before
- // being moved to the dead-letter queue. When the ReceiveCount for a message
- // exceeds the maxReceiveCount for a queue, Amazon SQS moves the message
- // to the dead-letter-queue.
- //
// * VisibilityTimeout – Returns the visibility timeout for the queue.
// For more information about the visibility timeout, see Visibility Timeout
// (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-visibility-timeout.html)
// in the Amazon SQS Developer Guide.
//
+ // The following attributes apply only to dead-letter queues: (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-dead-letter-queues.html)
+ //
+ // * RedrivePolicy – The string that includes the parameters for the dead-letter
+ // queue functionality of the source queue as a JSON object. The parameters
+ // are as follows: deadLetterTargetArn – The Amazon Resource Name (ARN)
+ // of the dead-letter queue to which Amazon SQS moves messages after the
+ // value of maxReceiveCount is exceeded. maxReceiveCount – The number of
+ // times a message is delivered to the source queue before being moved to
+ // the dead-letter queue. Default: 10. When the ReceiveCount for a message
+ // exceeds the maxReceiveCount for a queue, Amazon SQS moves the message
+ // to the dead-letter-queue.
+ //
+ // * RedriveAllowPolicy – The string that includes the parameters for the
+ // permissions for the dead-letter queue redrive permission and which source
+ // queues can specify dead-letter queues as a JSON object. The parameters
+ // are as follows: redrivePermission – The permission type that defines
+ // which source queues can specify the current queue as the dead-letter queue.
+ // Valid values are: allowAll – (Default) Any source queues in this Amazon
+ // Web Services account in the same Region can specify this queue as the
+ // dead-letter queue. denyAll – No source queues can specify this queue
+ // as the dead-letter queue. byQueue – Only queues specified by the sourceQueueArns
+ // parameter can specify this queue as the dead-letter queue. sourceQueueArns
+ // – The Amazon Resource Names (ARN)s of the source queues that can specify
+ // this queue as the dead-letter queue and redrive messages. You can specify
+ // this parameter only when the redrivePermission parameter is set to byQueue.
+ // You can specify up to 10 source queue ARNs. To allow more than 10 source
+ // queues to specify dead-letter queues, set the redrivePermission parameter
+ // to allowAll.
+ //
+ // The dead-letter queue of a FIFO queue must also be a FIFO queue. Similarly,
+ // the dead-letter queue of a standard queue must also be a standard queue.
+ //
// The following attributes apply only to server-side-encryption (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-server-side-encryption.html):
//
// * KmsMasterKeyId – Returns the ID of an Amazon Web Services managed
@@ -3354,7 +3706,8 @@ type GetQueueAttributesInput struct {
//
// * SqsManagedSseEnabled – Returns information about whether the queue
// is using SSE-SQS encryption using SQS owned encryption keys. Only one
- // server-side encryption option is supported per queue (e.g. SSE-KMS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sse-existing-queue.html)
+ // server-side encryption option is supported per queue (for example, SSE-KMS
+ // (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sse-existing-queue.html)
// or SSE-SQS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sqs-sse-queue.html)).
//
// The following attributes apply only to FIFO (first-in-first-out) queues (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/FIFO-queues.html):
@@ -3682,6 +4035,207 @@ func (s *ListDeadLetterSourceQueuesOutput) SetQueueUrls(v []*string) *ListDeadLe
return s
}
+type ListMessageMoveTasksInput struct {
+ _ struct{} `type:"structure"`
+
+ // The maximum number of results to include in the response. The default is
+ // 1, which provides the most recent message movement task. The upper limit
+ // is 10.
+ MaxResults *int64 `type:"integer"`
+
+ // The ARN of the queue whose message movement tasks are to be listed.
+ //
+ // SourceArn is a required field
+ SourceArn *string `type:"string" required:"true"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s ListMessageMoveTasksInput) String() string {
+ return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s ListMessageMoveTasksInput) GoString() string {
+ return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *ListMessageMoveTasksInput) Validate() error {
+ invalidParams := request.ErrInvalidParams{Context: "ListMessageMoveTasksInput"}
+ if s.SourceArn == nil {
+ invalidParams.Add(request.NewErrParamRequired("SourceArn"))
+ }
+
+ if invalidParams.Len() > 0 {
+ return invalidParams
+ }
+ return nil
+}
+
+// SetMaxResults sets the MaxResults field's value.
+func (s *ListMessageMoveTasksInput) SetMaxResults(v int64) *ListMessageMoveTasksInput {
+ s.MaxResults = &v
+ return s
+}
+
+// SetSourceArn sets the SourceArn field's value.
+func (s *ListMessageMoveTasksInput) SetSourceArn(v string) *ListMessageMoveTasksInput {
+ s.SourceArn = &v
+ return s
+}
+
+type ListMessageMoveTasksOutput struct {
+ _ struct{} `type:"structure"`
+
+ // A list of message movement tasks and their attributes.
+ Results []*ListMessageMoveTasksResultEntry `locationNameList:"ListMessageMoveTasksResultEntry" type:"list" flattened:"true"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s ListMessageMoveTasksOutput) String() string {
+ return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s ListMessageMoveTasksOutput) GoString() string {
+ return s.String()
+}
+
+// SetResults sets the Results field's value.
+func (s *ListMessageMoveTasksOutput) SetResults(v []*ListMessageMoveTasksResultEntry) *ListMessageMoveTasksOutput {
+ s.Results = v
+ return s
+}
+
+// Contains the details of a message movement task.
+type ListMessageMoveTasksResultEntry struct {
+ _ struct{} `type:"structure"`
+
+ // The approximate number of messages already moved to the destination queue.
+ ApproximateNumberOfMessagesMoved *int64 `type:"long"`
+
+ // The number of messages to be moved from the source queue. This number is
+ // obtained at the time of starting the message movement task.
+ ApproximateNumberOfMessagesToMove *int64 `type:"long"`
+
+ // The ARN of the destination queue if it has been specified in the StartMessageMoveTask
+ // request. If a DestinationArn has not been specified in the StartMessageMoveTask
+ // request, this field value will be NULL.
+ DestinationArn *string `type:"string"`
+
+ // The task failure reason (only included if the task status is FAILED).
+ FailureReason *string `type:"string"`
+
+ // The number of messages to be moved per second (the message movement rate),
+ // if it has been specified in the StartMessageMoveTask request. If a MaxNumberOfMessagesPerSecond
+ // has not been specified in the StartMessageMoveTask request, this field value
+ // will be NULL.
+ MaxNumberOfMessagesPerSecond *int64 `type:"integer"`
+
+ // The ARN of the queue that contains the messages to be moved to another queue.
+ SourceArn *string `type:"string"`
+
+ // The timestamp of starting the message movement task.
+ StartedTimestamp *int64 `type:"long"`
+
+ // The status of the message movement task. Possible values are: RUNNING, COMPLETED,
+ // CANCELLING, CANCELLED, and FAILED.
+ Status *string `type:"string"`
+
+ // An identifier associated with a message movement task. When this field is
+ // returned in the response of the ListMessageMoveTasks action, it is only populated
+ // for tasks that are in RUNNING status.
+ TaskHandle *string `type:"string"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s ListMessageMoveTasksResultEntry) String() string {
+ return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s ListMessageMoveTasksResultEntry) GoString() string {
+ return s.String()
+}
+
+// SetApproximateNumberOfMessagesMoved sets the ApproximateNumberOfMessagesMoved field's value.
+func (s *ListMessageMoveTasksResultEntry) SetApproximateNumberOfMessagesMoved(v int64) *ListMessageMoveTasksResultEntry {
+ s.ApproximateNumberOfMessagesMoved = &v
+ return s
+}
+
+// SetApproximateNumberOfMessagesToMove sets the ApproximateNumberOfMessagesToMove field's value.
+func (s *ListMessageMoveTasksResultEntry) SetApproximateNumberOfMessagesToMove(v int64) *ListMessageMoveTasksResultEntry {
+ s.ApproximateNumberOfMessagesToMove = &v
+ return s
+}
+
+// SetDestinationArn sets the DestinationArn field's value.
+func (s *ListMessageMoveTasksResultEntry) SetDestinationArn(v string) *ListMessageMoveTasksResultEntry {
+ s.DestinationArn = &v
+ return s
+}
+
+// SetFailureReason sets the FailureReason field's value.
+func (s *ListMessageMoveTasksResultEntry) SetFailureReason(v string) *ListMessageMoveTasksResultEntry {
+ s.FailureReason = &v
+ return s
+}
+
+// SetMaxNumberOfMessagesPerSecond sets the MaxNumberOfMessagesPerSecond field's value.
+func (s *ListMessageMoveTasksResultEntry) SetMaxNumberOfMessagesPerSecond(v int64) *ListMessageMoveTasksResultEntry {
+ s.MaxNumberOfMessagesPerSecond = &v
+ return s
+}
+
+// SetSourceArn sets the SourceArn field's value.
+func (s *ListMessageMoveTasksResultEntry) SetSourceArn(v string) *ListMessageMoveTasksResultEntry {
+ s.SourceArn = &v
+ return s
+}
+
+// SetStartedTimestamp sets the StartedTimestamp field's value.
+func (s *ListMessageMoveTasksResultEntry) SetStartedTimestamp(v int64) *ListMessageMoveTasksResultEntry {
+ s.StartedTimestamp = &v
+ return s
+}
+
+// SetStatus sets the Status field's value.
+func (s *ListMessageMoveTasksResultEntry) SetStatus(v string) *ListMessageMoveTasksResultEntry {
+ s.Status = &v
+ return s
+}
+
+// SetTaskHandle sets the TaskHandle field's value.
+func (s *ListMessageMoveTasksResultEntry) SetTaskHandle(v string) *ListMessageMoveTasksResultEntry {
+ s.TaskHandle = &v
+ return s
+}
+
type ListQueueTagsInput struct {
_ struct{} `type:"structure"`
@@ -3975,7 +4529,7 @@ func (s *Message) SetReceiptHandle(v string) *Message {
//
// Name, type, value and the message body must not be empty or null. All parts
// of the message attribute, including Name, Type, and Value, are part of the
-// message size restriction (256 KB or 262,144 bytes).
+// message size restriction (256 KiB or 262,144 bytes).
type MessageAttributeValue struct {
_ struct{} `type:"structure"`
@@ -4248,7 +4802,7 @@ type ReceiveMessageInput struct {
//
// * AWSTraceHeader – Returns the X-Ray trace header string.
//
- // * SenderId For an IAM user, returns the IAM user ID, for example ABCDEFGHI1JKLMNOPQ23R.
+ // * SenderId For a user, returns the user ID, for example ABCDEFGHI1JKLMNOPQ23R.
// For an IAM role, returns the IAM role ID, for example ABCDE1F2GH3I4JK5LMNOP:i-a123b456.
//
// * SentTimestamp – Returns the time the message was sent to the queue
@@ -4256,7 +4810,7 @@ type ReceiveMessageInput struct {
//
// * SqsManagedSseEnabled – Enables server-side queue encryption using
// SQS owned encryption keys. Only one server-side encryption option is supported
- // per queue (e.g. SSE-KMS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sse-existing-queue.html)
+ // per queue (for example, SSE-KMS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sse-existing-queue.html)
// or SSE-SQS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sqs-sse-queue.html)).
//
// * MessageDeduplicationId – Returns the value provided by the producer
@@ -5010,7 +5564,7 @@ type SendMessageInput struct {
MessageAttributes map[string]*MessageAttributeValue `locationName:"MessageAttribute" locationNameKey:"Name" locationNameValue:"Value" type:"map" flattened:"true"`
// The message to send. The minimum size is one character. The maximum size
- // is 256 KB.
+ // is 256 KiB.
//
// A message can include only XML, JSON, and unformatted text. The following
// Unicode characters are allowed:
@@ -5313,6 +5867,12 @@ type SetQueueAttributesInput struct {
// * MessageRetentionPeriod – The length of time, in seconds, for which
// Amazon SQS retains a message. Valid values: An integer representing seconds,
// from 60 (1 minute) to 1,209,600 (14 days). Default: 345,600 (4 days).
+ // When you change a queue's attributes, the change can take up to 60 seconds
+ // for most of the attributes to propagate throughout the Amazon SQS system.
+ // Changes made to the MessageRetentionPeriod attribute can take up to 15
+ // minutes and will impact existing messages in the queue potentially causing
+ // them to be expired and deleted if the MessageRetentionPeriod is reduced
+ // below the age of existing messages.
//
// * Policy – The queue's policy. A valid Amazon Web Services policy. For
// more information about policy structure, see Overview of Amazon Web Services
@@ -5323,26 +5883,44 @@ type SetQueueAttributesInput struct {
// which a ReceiveMessage action waits for a message to arrive. Valid values:
// An integer from 0 to 20 (seconds). Default: 0.
//
- // * RedrivePolicy – The string that includes the parameters for the dead-letter
- // queue functionality of the source queue as a JSON object. For more information
- // about the redrive policy and dead-letter queues, see Using Amazon SQS
- // Dead-Letter Queues (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-dead-letter-queues.html)
- // in the Amazon SQS Developer Guide. deadLetterTargetArn – The Amazon
- // Resource Name (ARN) of the dead-letter queue to which Amazon SQS moves
- // messages after the value of maxReceiveCount is exceeded. maxReceiveCount
- // – The number of times a message is delivered to the source queue before
- // being moved to the dead-letter queue. When the ReceiveCount for a message
- // exceeds the maxReceiveCount for a queue, Amazon SQS moves the message
- // to the dead-letter-queue. The dead-letter queue of a FIFO queue must also
- // be a FIFO queue. Similarly, the dead-letter queue of a standard queue
- // must also be a standard queue.
- //
// * VisibilityTimeout – The visibility timeout for the queue, in seconds.
// Valid values: An integer from 0 to 43,200 (12 hours). Default: 30. For
// more information about the visibility timeout, see Visibility Timeout
// (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-visibility-timeout.html)
// in the Amazon SQS Developer Guide.
//
+ // The following attributes apply only to dead-letter queues: (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-dead-letter-queues.html)
+ //
+ // * RedrivePolicy – The string that includes the parameters for the dead-letter
+ // queue functionality of the source queue as a JSON object. The parameters
+ // are as follows: deadLetterTargetArn – The Amazon Resource Name (ARN)
+ // of the dead-letter queue to which Amazon SQS moves messages after the
+ // value of maxReceiveCount is exceeded. maxReceiveCount – The number of
+ // times a message is delivered to the source queue before being moved to
+ // the dead-letter queue. Default: 10. When the ReceiveCount for a message
+ // exceeds the maxReceiveCount for a queue, Amazon SQS moves the message
+ // to the dead-letter-queue.
+ //
+ // * RedriveAllowPolicy – The string that includes the parameters for the
+ // permissions for the dead-letter queue redrive permission and which source
+ // queues can specify dead-letter queues as a JSON object. The parameters
+ // are as follows: redrivePermission – The permission type that defines
+ // which source queues can specify the current queue as the dead-letter queue.
+ // Valid values are: allowAll – (Default) Any source queues in this Amazon
+ // Web Services account in the same Region can specify this queue as the
+ // dead-letter queue. denyAll – No source queues can specify this queue
+ // as the dead-letter queue. byQueue – Only queues specified by the sourceQueueArns
+ // parameter can specify this queue as the dead-letter queue. sourceQueueArns
+ // – The Amazon Resource Names (ARN)s of the source queues that can specify
+ // this queue as the dead-letter queue and redrive messages. You can specify
+ // this parameter only when the redrivePermission parameter is set to byQueue.
+ // You can specify up to 10 source queue ARNs. To allow more than 10 source
+ // queues to specify dead-letter queues, set the redrivePermission parameter
+ // to allowAll.
+ //
+ // The dead-letter queue of a FIFO queue must also be a FIFO queue. Similarly,
+ // the dead-letter queue of a standard queue must also be a standard queue.
+ //
// The following attributes apply only to server-side-encryption (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-server-side-encryption.html):
//
// * KmsMasterKeyId – The ID of an Amazon Web Services managed customer
@@ -5364,7 +5942,7 @@ type SetQueueAttributesInput struct {
//
// * SqsManagedSseEnabled – Enables server-side queue encryption using
// SQS owned encryption keys. Only one server-side encryption option is supported
- // per queue (e.g. SSE-KMS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sse-existing-queue.html)
+ // per queue (for example, SSE-KMS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sse-existing-queue.html)
// or SSE-SQS (https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-sqs-sse-queue.html)).
//
// The following attribute applies only to FIFO (first-in-first-out) queues
@@ -5491,6 +6069,111 @@ func (s SetQueueAttributesOutput) GoString() string {
return s.String()
}
+type StartMessageMoveTaskInput struct {
+ _ struct{} `type:"structure"`
+
+ // The ARN of the queue that receives the moved messages. You can use this field
+ // to specify the destination queue where you would like to redrive messages.
+ // If this field is left blank, the messages will be redriven back to their
+ // respective original source queues.
+ DestinationArn *string `type:"string"`
+
+ // The number of messages to be moved per second (the message movement rate).
+ // You can use this field to define a fixed message movement rate. The maximum
+ // value for messages per second is 500. If this field is left blank, the system
+ // will optimize the rate based on the queue message backlog size, which may
+ // vary throughout the duration of the message movement task.
+ MaxNumberOfMessagesPerSecond *int64 `type:"integer"`
+
+ // The ARN of the queue that contains the messages to be moved to another queue.
+ // Currently, only dead-letter queue (DLQ) ARNs are accepted.
+ //
+ // SourceArn is a required field
+ SourceArn *string `type:"string" required:"true"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s StartMessageMoveTaskInput) String() string {
+ return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s StartMessageMoveTaskInput) GoString() string {
+ return s.String()
+}
+
+// Validate inspects the fields of the type to determine if they are valid.
+func (s *StartMessageMoveTaskInput) Validate() error {
+ invalidParams := request.ErrInvalidParams{Context: "StartMessageMoveTaskInput"}
+ if s.SourceArn == nil {
+ invalidParams.Add(request.NewErrParamRequired("SourceArn"))
+ }
+
+ if invalidParams.Len() > 0 {
+ return invalidParams
+ }
+ return nil
+}
+
+// SetDestinationArn sets the DestinationArn field's value.
+func (s *StartMessageMoveTaskInput) SetDestinationArn(v string) *StartMessageMoveTaskInput {
+ s.DestinationArn = &v
+ return s
+}
+
+// SetMaxNumberOfMessagesPerSecond sets the MaxNumberOfMessagesPerSecond field's value.
+func (s *StartMessageMoveTaskInput) SetMaxNumberOfMessagesPerSecond(v int64) *StartMessageMoveTaskInput {
+ s.MaxNumberOfMessagesPerSecond = &v
+ return s
+}
+
+// SetSourceArn sets the SourceArn field's value.
+func (s *StartMessageMoveTaskInput) SetSourceArn(v string) *StartMessageMoveTaskInput {
+ s.SourceArn = &v
+ return s
+}
+
+type StartMessageMoveTaskOutput struct {
+ _ struct{} `type:"structure"`
+
+ // An identifier associated with a message movement task. You can use this identifier
+ // to cancel a specified message movement task using the CancelMessageMoveTask
+ // action.
+ TaskHandle *string `type:"string"`
+}
+
+// String returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s StartMessageMoveTaskOutput) String() string {
+ return awsutil.Prettify(s)
+}
+
+// GoString returns the string representation.
+//
+// API parameter values that are decorated as "sensitive" in the API will not
+// be included in the string output. The member name will be present, but the
+// value will be replaced with "sensitive".
+func (s StartMessageMoveTaskOutput) GoString() string {
+ return s.String()
+}
+
+// SetTaskHandle sets the TaskHandle field's value.
+func (s *StartMessageMoveTaskOutput) SetTaskHandle(v string) *StartMessageMoveTaskOutput {
+ s.TaskHandle = &v
+ return s
+}
+
type TagQueueInput struct {
_ struct{} `type:"structure"`
@@ -5679,6 +6362,9 @@ const (
// MessageSystemAttributeNameAwstraceHeader is a MessageSystemAttributeName enum value
MessageSystemAttributeNameAwstraceHeader = "AWSTraceHeader"
+
+ // MessageSystemAttributeNameDeadLetterQueueSourceArn is a MessageSystemAttributeName enum value
+ MessageSystemAttributeNameDeadLetterQueueSourceArn = "DeadLetterQueueSourceArn"
)
// MessageSystemAttributeName_Values returns all elements of the MessageSystemAttributeName enum
@@ -5692,6 +6378,7 @@ func MessageSystemAttributeName_Values() []string {
MessageSystemAttributeNameMessageDeduplicationId,
MessageSystemAttributeNameMessageGroupId,
MessageSystemAttributeNameAwstraceHeader,
+ MessageSystemAttributeNameDeadLetterQueueSourceArn,
}
}
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sqs/errors.go b/vendor/github.com/aws/aws-sdk-go/service/sqs/errors.go
index 89eb40d7fd2..b32e6d93ada 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/sqs/errors.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/sqs/errors.go
@@ -56,7 +56,7 @@ const (
// "OverLimit".
//
// The specified action violates a limit. For example, ReceiveMessage returns
- // this error if the maximum number of inflight messages is reached and AddPermission
+ // this error if the maximum number of in flight messages is reached and AddPermission
// returns this error if the maximum number of permissions for the queue is
// reached.
ErrCodeOverLimit = "OverLimit"
@@ -96,6 +96,12 @@ const (
// The specified receipt handle isn't valid.
ErrCodeReceiptHandleIsInvalid = "ReceiptHandleIsInvalid"
+ // ErrCodeResourceNotFoundException for service response error code
+ // "ResourceNotFoundException".
+ //
+ // One or more specified resources don't exist.
+ ErrCodeResourceNotFoundException = "ResourceNotFoundException"
+
// ErrCodeTooManyEntriesInBatchRequest for service response error code
// "AWS.SimpleQueueService.TooManyEntriesInBatchRequest".
//
diff --git a/vendor/github.com/aws/aws-sdk-go/service/sqs/sqsiface/interface.go b/vendor/github.com/aws/aws-sdk-go/service/sqs/sqsiface/interface.go
index 1c1be069bec..c51f14765b7 100644
--- a/vendor/github.com/aws/aws-sdk-go/service/sqs/sqsiface/interface.go
+++ b/vendor/github.com/aws/aws-sdk-go/service/sqs/sqsiface/interface.go
@@ -64,6 +64,10 @@ type SQSAPI interface {
AddPermissionWithContext(aws.Context, *sqs.AddPermissionInput, ...request.Option) (*sqs.AddPermissionOutput, error)
AddPermissionRequest(*sqs.AddPermissionInput) (*request.Request, *sqs.AddPermissionOutput)
+ CancelMessageMoveTask(*sqs.CancelMessageMoveTaskInput) (*sqs.CancelMessageMoveTaskOutput, error)
+ CancelMessageMoveTaskWithContext(aws.Context, *sqs.CancelMessageMoveTaskInput, ...request.Option) (*sqs.CancelMessageMoveTaskOutput, error)
+ CancelMessageMoveTaskRequest(*sqs.CancelMessageMoveTaskInput) (*request.Request, *sqs.CancelMessageMoveTaskOutput)
+
ChangeMessageVisibility(*sqs.ChangeMessageVisibilityInput) (*sqs.ChangeMessageVisibilityOutput, error)
ChangeMessageVisibilityWithContext(aws.Context, *sqs.ChangeMessageVisibilityInput, ...request.Option) (*sqs.ChangeMessageVisibilityOutput, error)
ChangeMessageVisibilityRequest(*sqs.ChangeMessageVisibilityInput) (*request.Request, *sqs.ChangeMessageVisibilityOutput)
@@ -103,6 +107,10 @@ type SQSAPI interface {
ListDeadLetterSourceQueuesPages(*sqs.ListDeadLetterSourceQueuesInput, func(*sqs.ListDeadLetterSourceQueuesOutput, bool) bool) error
ListDeadLetterSourceQueuesPagesWithContext(aws.Context, *sqs.ListDeadLetterSourceQueuesInput, func(*sqs.ListDeadLetterSourceQueuesOutput, bool) bool, ...request.Option) error
+ ListMessageMoveTasks(*sqs.ListMessageMoveTasksInput) (*sqs.ListMessageMoveTasksOutput, error)
+ ListMessageMoveTasksWithContext(aws.Context, *sqs.ListMessageMoveTasksInput, ...request.Option) (*sqs.ListMessageMoveTasksOutput, error)
+ ListMessageMoveTasksRequest(*sqs.ListMessageMoveTasksInput) (*request.Request, *sqs.ListMessageMoveTasksOutput)
+
ListQueueTags(*sqs.ListQueueTagsInput) (*sqs.ListQueueTagsOutput, error)
ListQueueTagsWithContext(aws.Context, *sqs.ListQueueTagsInput, ...request.Option) (*sqs.ListQueueTagsOutput, error)
ListQueueTagsRequest(*sqs.ListQueueTagsInput) (*request.Request, *sqs.ListQueueTagsOutput)
@@ -138,6 +146,10 @@ type SQSAPI interface {
SetQueueAttributesWithContext(aws.Context, *sqs.SetQueueAttributesInput, ...request.Option) (*sqs.SetQueueAttributesOutput, error)
SetQueueAttributesRequest(*sqs.SetQueueAttributesInput) (*request.Request, *sqs.SetQueueAttributesOutput)
+ StartMessageMoveTask(*sqs.StartMessageMoveTaskInput) (*sqs.StartMessageMoveTaskOutput, error)
+ StartMessageMoveTaskWithContext(aws.Context, *sqs.StartMessageMoveTaskInput, ...request.Option) (*sqs.StartMessageMoveTaskOutput, error)
+ StartMessageMoveTaskRequest(*sqs.StartMessageMoveTaskInput) (*request.Request, *sqs.StartMessageMoveTaskOutput)
+
TagQueue(*sqs.TagQueueInput) (*sqs.TagQueueOutput, error)
TagQueueWithContext(aws.Context, *sqs.TagQueueInput, ...request.Option) (*sqs.TagQueueOutput, error)
TagQueueRequest(*sqs.TagQueueInput) (*request.Request, *sqs.TagQueueOutput)
diff --git a/vendor/github.com/bradleyfalzon/ghinstallation/v2/AUTHORS b/vendor/github.com/bradleyfalzon/ghinstallation/v2/AUTHORS
new file mode 100644
index 00000000000..88ca0ddd64b
--- /dev/null
+++ b/vendor/github.com/bradleyfalzon/ghinstallation/v2/AUTHORS
@@ -0,0 +1,6 @@
+Billy Lynch
+Bradley Falzon
+Philippe Modard
+Ricardo Chimal, Jr
+Tatsuya Kamohara <17017563+kamontia@users.noreply.github.com>
+rob boll
diff --git a/vendor/github.com/bradleyfalzon/ghinstallation/v2/LICENSE b/vendor/github.com/bradleyfalzon/ghinstallation/v2/LICENSE
new file mode 100644
index 00000000000..1c508b07b63
--- /dev/null
+++ b/vendor/github.com/bradleyfalzon/ghinstallation/v2/LICENSE
@@ -0,0 +1,191 @@
+
+ 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
+
+ Copyright 2019 ghinstallation 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.
diff --git a/vendor/github.com/bradleyfalzon/ghinstallation/v2/README.md b/vendor/github.com/bradleyfalzon/ghinstallation/v2/README.md
new file mode 100644
index 00000000000..9c3071ec62c
--- /dev/null
+++ b/vendor/github.com/bradleyfalzon/ghinstallation/v2/README.md
@@ -0,0 +1,108 @@
+# ghinstallation
+
+[](https://godoc.org/github.com/bradleyfalzon/ghinstallation)
+
+`ghinstallation` provides `Transport`, which implements `http.RoundTripper` to
+provide authentication as an installation for GitHub Apps.
+
+This library is designed to provide automatic authentication for
+https://github.com/google/go-github or your own HTTP client.
+
+See
+https://developer.github.com/apps/building-integrations/setting-up-and-registering-github-apps/about-authentication-options-for-github-apps/
+
+# Installation
+
+Get the package:
+
+```bash
+GO111MODULE=on go get -u github.com/bradleyfalzon/ghinstallation/v2
+```
+
+# GitHub Example
+
+```go
+import "github.com/bradleyfalzon/ghinstallation/v2"
+
+func main() {
+ // Shared transport to reuse TCP connections.
+ tr := http.DefaultTransport
+
+ // Wrap the shared transport for use with the app ID 1 authenticating with installation ID 99.
+ itr, err := ghinstallation.NewKeyFromFile(tr, 1, 99, "2016-10-19.private-key.pem")
+ if err != nil {
+ log.Fatal(err)
+ }
+
+ // Use installation transport with github.com/google/go-github
+ client := github.NewClient(&http.Client{Transport: itr})
+}
+```
+
+# GitHub Enterprise Example
+
+For clients using GitHub Enterprise, set the base URL as follows:
+
+```go
+import "github.com/bradleyfalzon/ghinstallation/v2"
+
+const GitHubEnterpriseURL = "https://github.example.com/api/v3"
+
+func main() {
+ // Shared transport to reuse TCP connections.
+ tr := http.DefaultTransport
+
+ // Wrap the shared transport for use with the app ID 1 authenticating with installation ID 99.
+ itr, err := ghinstallation.NewKeyFromFile(tr, 1, 99, "2016-10-19.private-key.pem")
+ if err != nil {
+ log.Fatal(err)
+ }
+ itr.BaseURL = GitHubEnterpriseURL
+
+ // Use installation transport with github.com/google/go-github
+ client := github.NewEnterpriseClient(GitHubEnterpriseURL, GitHubEnterpriseURL, &http.Client{Transport: itr})
+}
+```
+
+## What is app ID and installation ID
+
+`app ID` is the GitHub App ID. \
+You can check as following : \
+Settings > Developer > settings > GitHub App > About item
+
+`installation ID` is a part of WebHook request. \
+You can get the number to check the request. \
+Settings > Developer > settings > GitHub Apps > Advanced > Payload in Request
+tab
+
+```
+WebHook request
+...
+ "installation": {
+ "id": `installation ID`
+ }
+```
+
+# Customizing signing behavior
+
+Users can customize signing behavior by passing in a
+[Signer](https://pkg.go.dev/github.com/bradleyfalzon/ghinstallation/v2#Signer)
+implementation when creating an
+[AppsTransport](https://pkg.go.dev/github.com/bradleyfalzon/ghinstallation/v2#AppsTransport).
+For example, this can be used to create tokens backed by keys in a KMS system.
+
+```go
+signer := &myCustomSigner{
+ key: "https://url/to/key/vault",
+}
+atr := NewAppsTransportWithOptions(http.DefaultTransport, 1, WithSigner(signer))
+tr := NewFromAppsTransport(atr, 99)
+```
+
+# License
+
+[Apache 2.0](LICENSE)
+
+# Dependencies
+
+- [github.com/golang-jwt/jwt-go](https://github.com/golang-jwt/jwt-go)
diff --git a/vendor/github.com/bradleyfalzon/ghinstallation/v2/appsTransport.go b/vendor/github.com/bradleyfalzon/ghinstallation/v2/appsTransport.go
new file mode 100644
index 00000000000..317de76fc10
--- /dev/null
+++ b/vendor/github.com/bradleyfalzon/ghinstallation/v2/appsTransport.go
@@ -0,0 +1,116 @@
+package ghinstallation
+
+import (
+ "crypto/rsa"
+ "errors"
+ "fmt"
+ "io/ioutil"
+ "net/http"
+ "strconv"
+ "time"
+
+ jwt "github.com/golang-jwt/jwt/v4"
+)
+
+// AppsTransport provides a http.RoundTripper by wrapping an existing
+// http.RoundTripper and provides GitHub Apps authentication as a
+// GitHub App.
+//
+// Client can also be overwritten, and is useful to change to one which
+// provides retry logic if you do experience retryable errors.
+//
+// See https://developer.github.com/apps/building-integrations/setting-up-and-registering-github-apps/about-authentication-options-for-github-apps/
+type AppsTransport struct {
+ BaseURL string // BaseURL is the scheme and host for GitHub API, defaults to https://api.github.com
+ Client Client // Client to use to refresh tokens, defaults to http.Client with provided transport
+ tr http.RoundTripper // tr is the underlying roundtripper being wrapped
+ signer Signer // signer signs JWT tokens.
+ appID int64 // appID is the GitHub App's ID
+}
+
+// NewAppsTransportKeyFromFile returns a AppsTransport using a private key from file.
+func NewAppsTransportKeyFromFile(tr http.RoundTripper, appID int64, privateKeyFile string) (*AppsTransport, error) {
+ privateKey, err := ioutil.ReadFile(privateKeyFile)
+ if err != nil {
+ return nil, fmt.Errorf("could not read private key: %s", err)
+ }
+ return NewAppsTransport(tr, appID, privateKey)
+}
+
+// NewAppsTransport returns a AppsTransport using private key. The key is parsed
+// and if any errors occur the error is non-nil.
+//
+// The provided tr http.RoundTripper should be shared between multiple
+// installations to ensure reuse of underlying TCP connections.
+//
+// The returned Transport's RoundTrip method is safe to be used concurrently.
+func NewAppsTransport(tr http.RoundTripper, appID int64, privateKey []byte) (*AppsTransport, error) {
+ key, err := jwt.ParseRSAPrivateKeyFromPEM(privateKey)
+ if err != nil {
+ return nil, fmt.Errorf("could not parse private key: %s", err)
+ }
+ return NewAppsTransportFromPrivateKey(tr, appID, key), nil
+}
+
+// NewAppsTransportFromPrivateKey returns an AppsTransport using a crypto/rsa.(*PrivateKey).
+func NewAppsTransportFromPrivateKey(tr http.RoundTripper, appID int64, key *rsa.PrivateKey) *AppsTransport {
+ return &AppsTransport{
+ BaseURL: apiBaseURL,
+ Client: &http.Client{Transport: tr},
+ tr: tr,
+ signer: NewRSASigner(jwt.SigningMethodRS256, key),
+ appID: appID,
+ }
+}
+
+func NewAppsTransportWithOptions(tr http.RoundTripper, appID int64, opts ...AppsTransportOption) (*AppsTransport, error) {
+ t := &AppsTransport{
+ BaseURL: apiBaseURL,
+ Client: &http.Client{Transport: tr},
+ tr: tr,
+ appID: appID,
+ }
+ for _, fn := range opts {
+ fn(t)
+ }
+
+ if t.signer == nil {
+ return nil, errors.New("no signer provided")
+ }
+
+ return t, nil
+}
+
+// RoundTrip implements http.RoundTripper interface.
+func (t *AppsTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+ // GitHub rejects expiry and issue timestamps that are not an integer,
+ // while the jwt-go library serializes to fractional timestamps.
+ // Truncate them before passing to jwt-go.
+ iss := time.Now().Add(-30 * time.Second).Truncate(time.Second)
+ exp := iss.Add(2 * time.Minute)
+ claims := &jwt.RegisteredClaims{
+ IssuedAt: jwt.NewNumericDate(iss),
+ ExpiresAt: jwt.NewNumericDate(exp),
+ Issuer: strconv.FormatInt(t.appID, 10),
+ }
+
+ ss, err := t.signer.Sign(claims)
+ if err != nil {
+ return nil, fmt.Errorf("could not sign jwt: %s", err)
+ }
+
+ req.Header.Set("Authorization", "Bearer "+ss)
+ req.Header.Add("Accept", acceptHeader)
+
+ resp, err := t.tr.RoundTrip(req)
+ return resp, err
+}
+
+type AppsTransportOption func(*AppsTransport)
+
+// WithSigner configures the AppsTransport to use the given Signer for generating JWT tokens.
+func WithSigner(signer Signer) AppsTransportOption {
+ return func(at *AppsTransport) {
+ at.signer = signer
+ }
+}
diff --git a/vendor/github.com/bradleyfalzon/ghinstallation/v2/sign.go b/vendor/github.com/bradleyfalzon/ghinstallation/v2/sign.go
new file mode 100644
index 00000000000..928e10efc95
--- /dev/null
+++ b/vendor/github.com/bradleyfalzon/ghinstallation/v2/sign.go
@@ -0,0 +1,33 @@
+package ghinstallation
+
+import (
+ "crypto/rsa"
+
+ jwt "github.com/golang-jwt/jwt/v4"
+)
+
+// Signer is a JWT token signer. This is a wrapper around [jwt.SigningMethod] with predetermined
+// key material.
+type Signer interface {
+ // Sign signs the given claims and returns a JWT token string, as specified
+ // by [jwt.Token.SignedString]
+ Sign(claims jwt.Claims) (string, error)
+}
+
+// RSASigner signs JWT tokens using RSA keys.
+type RSASigner struct {
+ method *jwt.SigningMethodRSA
+ key *rsa.PrivateKey
+}
+
+func NewRSASigner(method *jwt.SigningMethodRSA, key *rsa.PrivateKey) *RSASigner {
+ return &RSASigner{
+ method: method,
+ key: key,
+ }
+}
+
+// Sign signs the JWT claims with the RSA key.
+func (s *RSASigner) Sign(claims jwt.Claims) (string, error) {
+ return jwt.NewWithClaims(s.method, claims).SignedString(s.key)
+}
diff --git a/vendor/github.com/bradleyfalzon/ghinstallation/v2/transport.go b/vendor/github.com/bradleyfalzon/ghinstallation/v2/transport.go
new file mode 100644
index 00000000000..015ebe4b656
--- /dev/null
+++ b/vendor/github.com/bradleyfalzon/ghinstallation/v2/transport.go
@@ -0,0 +1,266 @@
+package ghinstallation
+
+import (
+ "bytes"
+ "context"
+ "encoding/json"
+ "errors"
+ "fmt"
+ "io"
+ "io/ioutil"
+ "net/http"
+ "strings"
+ "sync"
+ "time"
+
+ "github.com/google/go-github/v53/github"
+)
+
+const (
+ acceptHeader = "application/vnd.github.v3+json"
+ apiBaseURL = "https://api.github.com"
+)
+
+// Transport provides a http.RoundTripper by wrapping an existing
+// http.RoundTripper and provides GitHub Apps authentication as an
+// installation.
+//
+// Client can also be overwritten, and is useful to change to one which
+// provides retry logic if you do experience retryable errors.
+//
+// See https://developer.github.com/apps/building-integrations/setting-up-and-registering-github-apps/about-authentication-options-for-github-apps/
+type Transport struct {
+ BaseURL string // BaseURL is the scheme and host for GitHub API, defaults to https://api.github.com
+ Client Client // Client to use to refresh tokens, defaults to http.Client with provided transport
+ tr http.RoundTripper // tr is the underlying roundtripper being wrapped
+ appID int64 // appID is the GitHub App's ID
+ installationID int64 // installationID is the GitHub App Installation ID
+ InstallationTokenOptions *github.InstallationTokenOptions // parameters restrict a token's access
+ appsTransport *AppsTransport
+
+ mu *sync.Mutex // mu protects token
+ token *accessToken // token is the installation's access token
+}
+
+// accessToken is an installation access token response from GitHub
+type accessToken struct {
+ Token string `json:"token"`
+ ExpiresAt time.Time `json:"expires_at"`
+ Permissions github.InstallationPermissions `json:"permissions,omitempty"`
+ Repositories []github.Repository `json:"repositories,omitempty"`
+}
+
+// HTTPError represents a custom error for failing HTTP operations.
+// Example in our usecase: refresh access token operation.
+// It enables the caller to inspect the root cause and response.
+type HTTPError struct {
+ Message string
+ RootCause error
+ InstallationID int64
+ Response *http.Response
+}
+
+func (e *HTTPError) Error() string {
+ return e.Message
+}
+
+// Unwrap implements the standard library's error wrapping. It unwraps to the root cause.
+func (e *HTTPError) Unwrap() error {
+ return e.RootCause
+}
+
+var _ http.RoundTripper = &Transport{}
+
+// NewKeyFromFile returns a Transport using a private key from file.
+func NewKeyFromFile(tr http.RoundTripper, appID, installationID int64, privateKeyFile string) (*Transport, error) {
+ privateKey, err := ioutil.ReadFile(privateKeyFile)
+ if err != nil {
+ return nil, fmt.Errorf("could not read private key: %s", err)
+ }
+ return New(tr, appID, installationID, privateKey)
+}
+
+// Client is a HTTP client which sends a http.Request and returns a http.Response
+// or an error.
+type Client interface {
+ Do(*http.Request) (*http.Response, error)
+}
+
+// New returns an Transport using private key. The key is parsed
+// and if any errors occur the error is non-nil.
+//
+// The provided tr http.RoundTripper should be shared between multiple
+// installations to ensure reuse of underlying TCP connections.
+//
+// The returned Transport's RoundTrip method is safe to be used concurrently.
+func New(tr http.RoundTripper, appID, installationID int64, privateKey []byte) (*Transport, error) {
+ atr, err := NewAppsTransport(tr, appID, privateKey)
+ if err != nil {
+ return nil, err
+ }
+
+ return NewFromAppsTransport(atr, installationID), nil
+}
+
+// NewFromAppsTransport returns a Transport using an existing *AppsTransport.
+func NewFromAppsTransport(atr *AppsTransport, installationID int64) *Transport {
+ return &Transport{
+ BaseURL: atr.BaseURL,
+ Client: &http.Client{Transport: atr.tr},
+ tr: atr.tr,
+ appID: atr.appID,
+ installationID: installationID,
+ appsTransport: atr,
+ mu: &sync.Mutex{},
+ }
+}
+
+// RoundTrip implements http.RoundTripper interface.
+func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
+ reqBodyClosed := false
+ if req.Body != nil {
+ defer func() {
+ if !reqBodyClosed {
+ req.Body.Close()
+ }
+ }()
+ }
+
+ token, err := t.Token(req.Context())
+ if err != nil {
+ return nil, err
+ }
+
+ creq := cloneRequest(req) // per RoundTripper contract
+ creq.Header.Set("Authorization", "token "+token)
+
+ if creq.Header.Get("Accept") == "" { // We only add an "Accept" header to avoid overwriting the expected behavior.
+ creq.Header.Add("Accept", acceptHeader)
+ }
+ reqBodyClosed = true // req.Body is assumed to be closed by the tr RoundTripper.
+ resp, err := t.tr.RoundTrip(creq)
+ return resp, err
+}
+
+func (at *accessToken) getRefreshTime() time.Time {
+ return at.ExpiresAt.Add(-time.Minute)
+}
+
+func (at *accessToken) isExpired() bool {
+ return at == nil || at.getRefreshTime().Before(time.Now())
+}
+
+// Token checks the active token expiration and renews if necessary. Token returns
+// a valid access token. If renewal fails an error is returned.
+func (t *Transport) Token(ctx context.Context) (string, error) {
+ t.mu.Lock()
+ defer t.mu.Unlock()
+ if t.token.isExpired() {
+ // Token is not set or expired/nearly expired, so refresh
+ if err := t.refreshToken(ctx); err != nil {
+ return "", fmt.Errorf("could not refresh installation id %v's token: %w", t.installationID, err)
+ }
+ }
+
+ return t.token.Token, nil
+}
+
+// Permissions returns a transport token's GitHub installation permissions.
+func (t *Transport) Permissions() (github.InstallationPermissions, error) {
+ if t.token == nil {
+ return github.InstallationPermissions{}, fmt.Errorf("Permissions() = nil, err: nil token")
+ }
+ return t.token.Permissions, nil
+}
+
+// Repositories returns a transport token's GitHub repositories.
+func (t *Transport) Repositories() ([]github.Repository, error) {
+ if t.token == nil {
+ return nil, fmt.Errorf("Repositories() = nil, err: nil token")
+ }
+ return t.token.Repositories, nil
+}
+
+// Expiry returns a transport token's expiration time and refresh time. There is a small grace period
+// built in where a token will be refreshed before it expires. expiresAt is the actual token expiry,
+// and refreshAt is when a call to Token() will cause it to be refreshed.
+func (t *Transport) Expiry() (expiresAt time.Time, refreshAt time.Time, err error) {
+ if t.token == nil {
+ return time.Time{}, time.Time{}, errors.New("Expiry() = unknown, err: nil token")
+ }
+ return t.token.ExpiresAt, t.token.getRefreshTime(), nil
+}
+
+func (t *Transport) refreshToken(ctx context.Context) error {
+ // Convert InstallationTokenOptions into a ReadWriter to pass as an argument to http.NewRequest.
+ body, err := GetReadWriter(t.InstallationTokenOptions)
+ if err != nil {
+ return fmt.Errorf("could not convert installation token parameters into json: %s", err)
+ }
+
+ requestURL := fmt.Sprintf("%s/app/installations/%v/access_tokens", strings.TrimRight(t.BaseURL, "/"), t.installationID)
+ req, err := http.NewRequest("POST", requestURL, body)
+ if err != nil {
+ return fmt.Errorf("could not create request: %s", err)
+ }
+
+ // Set Content and Accept headers.
+ if body != nil {
+ req.Header.Set("Content-Type", "application/json")
+ }
+ req.Header.Set("Accept", acceptHeader)
+
+ if ctx != nil {
+ req = req.WithContext(ctx)
+ }
+
+ t.appsTransport.BaseURL = t.BaseURL
+ t.appsTransport.Client = t.Client
+ resp, err := t.appsTransport.RoundTrip(req)
+ e := &HTTPError{
+ RootCause: err,
+ InstallationID: t.installationID,
+ Response: resp,
+ }
+ if err != nil {
+ e.Message = fmt.Sprintf("could not get access_tokens from GitHub API for installation ID %v: %v", t.installationID, err)
+ return e
+ }
+
+ if resp.StatusCode/100 != 2 {
+ e.Message = fmt.Sprintf("received non 2xx response status %q when fetching %v", resp.Status, req.URL)
+ return e
+ }
+ // Closing body late, to provide caller a chance to inspect body in an error / non-200 response status situation
+ defer resp.Body.Close()
+
+ return json.NewDecoder(resp.Body).Decode(&t.token)
+}
+
+// GetReadWriter converts a body interface into an io.ReadWriter object.
+func GetReadWriter(i interface{}) (io.ReadWriter, error) {
+ var buf io.ReadWriter
+ if i != nil {
+ buf = new(bytes.Buffer)
+ enc := json.NewEncoder(buf)
+ err := enc.Encode(i)
+ if err != nil {
+ return nil, err
+ }
+ }
+ return buf, nil
+}
+
+// cloneRequest returns a clone of the provided *http.Request.
+// The clone is a shallow copy of the struct and its Header map.
+func cloneRequest(r *http.Request) *http.Request {
+ // shallow copy of the struct
+ r2 := new(http.Request)
+ *r2 = *r
+ // deep copy of the Header
+ r2.Header = make(http.Header, len(r.Header))
+ for k, s := range r.Header {
+ r2.Header[k] = append([]string(nil), s...)
+ }
+ return r2
+}
diff --git a/vendor/github.com/gocql/gocql/AUTHORS b/vendor/github.com/gocql/gocql/AUTHORS
index 28b008a672d..42591736aa1 100644
--- a/vendor/github.com/gocql/gocql/AUTHORS
+++ b/vendor/github.com/gocql/gocql/AUTHORS
@@ -137,3 +137,5 @@ Steven Seidman
Wojciech Przytuła
João Reis
Lauro Ramos Venancio
+Dmitry Kropachev
+Oliver Boyle
diff --git a/vendor/github.com/gocql/gocql/CHANGELOG.md b/vendor/github.com/gocql/gocql/CHANGELOG.md
index 10a430c9be7..2ff9743d775 100644
--- a/vendor/github.com/gocql/gocql/CHANGELOG.md
+++ b/vendor/github.com/gocql/gocql/CHANGELOG.md
@@ -12,6 +12,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
+## [1.5.0] - 2023-06-12
+
+### Added
+
+- gocql now advertises the driver name and version in the STARTUP message to the server.
+ The values are taken from the Go module's path and version
+ (or from the replacement module, if used). (#1702)
+ That allows the server to track which fork of the driver is being used.
+- Query.Values() to retrieve the values bound to the Query.
+ This makes writing wrappers around Query easier. (#1700)
+
+### Fixed
+- Potential panic on deserialization (#1695)
+- Unmarshalling of dates outside of `[1677-09-22, 2262-04-11]` range. (#1692)
+
## [1.4.0] - 2023-04-26
### Added
diff --git a/vendor/github.com/gocql/gocql/conn.go b/vendor/github.com/gocql/gocql/conn.go
index 9fb40c488bd..7b793b4cda0 100644
--- a/vendor/github.com/gocql/gocql/conn.go
+++ b/vendor/github.com/gocql/gocql/conn.go
@@ -422,7 +422,9 @@ func (s *startupCoordinator) options(ctx context.Context) error {
func (s *startupCoordinator) startup(ctx context.Context, supported map[string][]string) error {
m := map[string]string{
- "CQL_VERSION": s.conn.cfg.CQLVersion,
+ "CQL_VERSION": s.conn.cfg.CQLVersion,
+ "DRIVER_NAME": driverName,
+ "DRIVER_VERSION": driverVersion,
}
if s.conn.compressor != nil {
diff --git a/vendor/github.com/gocql/gocql/doc.go b/vendor/github.com/gocql/gocql/doc.go
index b48cef88e50..6739d98e4ab 100644
--- a/vendor/github.com/gocql/gocql/doc.go
+++ b/vendor/github.com/gocql/gocql/doc.go
@@ -30,6 +30,9 @@
// protocol version explicitly, as it's not defined which version will be used in certain situations (for example
// during upgrade of the cluster when some of the nodes support different set of protocol versions than other nodes).
//
+// The driver advertises the module name and version in the STARTUP message, so servers are able to detect the version.
+// If you use replace directive in go.mod, the driver will send information about the replacement module instead.
+//
// When ready, create a session from the configuration. Don't forget to Close the session once you are done with it:
//
// session, err := cluster.CreateSession()
diff --git a/vendor/github.com/gocql/gocql/marshal.go b/vendor/github.com/gocql/gocql/marshal.go
index d476449018b..b887b3f2b10 100644
--- a/vendor/github.com/gocql/gocql/marshal.go
+++ b/vendor/github.com/gocql/gocql/marshal.go
@@ -1169,6 +1169,9 @@ func unmarshalDecimal(info TypeInfo, data []byte, value interface{}) error {
case Unmarshaler:
return v.UnmarshalCQL(info, data)
case *inf.Dec:
+ if len(data) < 4 {
+ return unmarshalErrorf("inf.Dec needs at least 4 bytes, while value has only %d", len(data))
+ }
scale := decInt(data[0:4])
unscaled := decBigInt2C(data[4:], nil)
*v = *inf.NewDecBig(unscaled, inf.Scale(scale))
@@ -1326,6 +1329,8 @@ func unmarshalTimestamp(info TypeInfo, data []byte, value interface{}) error {
return unmarshalErrorf("can not unmarshal %s into %T", info, value)
}
+const millisecondsInADay int64 = 24 * 60 * 60 * 1000
+
func marshalDate(info TypeInfo, value interface{}) ([]byte, error) {
var timestamp int64
switch v := value.(type) {
@@ -1335,21 +1340,21 @@ func marshalDate(info TypeInfo, value interface{}) ([]byte, error) {
return nil, nil
case int64:
timestamp = v
- x := timestamp/86400000 + int64(1<<31)
+ x := timestamp/millisecondsInADay + int64(1<<31)
return encInt(int32(x)), nil
case time.Time:
if v.IsZero() {
return []byte{}, nil
}
timestamp = int64(v.UTC().Unix()*1e3) + int64(v.UTC().Nanosecond()/1e6)
- x := timestamp/86400000 + int64(1<<31)
+ x := timestamp/millisecondsInADay + int64(1<<31)
return encInt(int32(x)), nil
case *time.Time:
if v.IsZero() {
return []byte{}, nil
}
timestamp = int64(v.UTC().Unix()*1e3) + int64(v.UTC().Nanosecond()/1e6)
- x := timestamp/86400000 + int64(1<<31)
+ x := timestamp/millisecondsInADay + int64(1<<31)
return encInt(int32(x)), nil
case string:
if v == "" {
@@ -1360,7 +1365,7 @@ func marshalDate(info TypeInfo, value interface{}) ([]byte, error) {
return nil, marshalErrorf("can not marshal %T into %s, date layout must be '2006-01-02'", value, info)
}
timestamp = int64(t.UTC().Unix()*1e3) + int64(t.UTC().Nanosecond()/1e6)
- x := timestamp/86400000 + int64(1<<31)
+ x := timestamp/millisecondsInADay + int64(1<<31)
return encInt(int32(x)), nil
}
@@ -1381,8 +1386,8 @@ func unmarshalDate(info TypeInfo, data []byte, value interface{}) error {
}
var origin uint32 = 1 << 31
var current uint32 = binary.BigEndian.Uint32(data)
- timestamp := (int64(current) - int64(origin)) * 86400000
- *v = time.Unix(0, timestamp*int64(time.Millisecond)).In(time.UTC)
+ timestamp := (int64(current) - int64(origin)) * millisecondsInADay
+ *v = time.UnixMilli(timestamp).In(time.UTC)
return nil
case *string:
if len(data) == 0 {
@@ -1391,8 +1396,8 @@ func unmarshalDate(info TypeInfo, data []byte, value interface{}) error {
}
var origin uint32 = 1 << 31
var current uint32 = binary.BigEndian.Uint32(data)
- timestamp := (int64(current) - int64(origin)) * 86400000
- *v = time.Unix(0, timestamp*int64(time.Millisecond)).In(time.UTC).Format("2006-01-02")
+ timestamp := (int64(current) - int64(origin)) * millisecondsInADay
+ *v = time.UnixMilli(timestamp).In(time.UTC).Format("2006-01-02")
return nil
}
return unmarshalErrorf("can not unmarshal %s into %T", info, value)
@@ -1443,7 +1448,10 @@ func unmarshalDuration(info TypeInfo, data []byte, value interface{}) error {
}
return nil
}
- months, days, nanos := decVints(data)
+ months, days, nanos, err := decVints(data)
+ if err != nil {
+ return unmarshalErrorf("failed to unmarshal %s into %T: %s", info, value, err.Error())
+ }
*v = Duration{
Months: months,
Days: days,
@@ -1454,25 +1462,40 @@ func unmarshalDuration(info TypeInfo, data []byte, value interface{}) error {
return unmarshalErrorf("can not unmarshal %s into %T", info, value)
}
-func decVints(data []byte) (int32, int32, int64) {
- month, i := decVint(data)
- days, j := decVint(data[i:])
- nanos, _ := decVint(data[i+j:])
- return int32(month), int32(days), nanos
+func decVints(data []byte) (int32, int32, int64, error) {
+ month, i, err := decVint(data, 0)
+ if err != nil {
+ return 0, 0, 0, fmt.Errorf("failed to extract month: %s", err.Error())
+ }
+ days, i, err := decVint(data, i)
+ if err != nil {
+ return 0, 0, 0, fmt.Errorf("failed to extract days: %s", err.Error())
+ }
+ nanos, _, err := decVint(data, i)
+ if err != nil {
+ return 0, 0, 0, fmt.Errorf("failed to extract nanoseconds: %s", err.Error())
+ }
+ return int32(month), int32(days), nanos, err
}
-func decVint(data []byte) (int64, int) {
- firstByte := data[0]
+func decVint(data []byte, start int) (int64, int, error) {
+ if len(data) <= start {
+ return 0, 0, errors.New("unexpected eof")
+ }
+ firstByte := data[start]
if firstByte&0x80 == 0 {
- return decIntZigZag(uint64(firstByte)), 1
+ return decIntZigZag(uint64(firstByte)), start + 1, nil
}
numBytes := bits.LeadingZeros32(uint32(^firstByte)) - 24
ret := uint64(firstByte & (0xff >> uint(numBytes)))
- for i := 0; i < numBytes; i++ {
+ if len(data) < start+numBytes+1 {
+ return 0, 0, fmt.Errorf("data expect to have %d bytes, but it has only %d", start+numBytes+1, len(data))
+ }
+ for i := start; i < start+numBytes; i++ {
ret <<= 8
ret |= uint64(data[i+1] & 0xff)
}
- return decIntZigZag(ret), numBytes + 1
+ return decIntZigZag(ret), start + numBytes + 1, nil
}
func decIntZigZag(n uint64) int64 {
@@ -1648,13 +1671,12 @@ func unmarshalList(info TypeInfo, data []byte, value interface{}) error {
return err
}
data = data[p:]
- if len(data) < m {
- return unmarshalErrorf("unmarshal list: unexpected eof")
- }
-
// In case m < 0, the value is null, and unmarshalData should be nil.
var unmarshalData []byte
if m >= 0 {
+ if len(data) < m {
+ return unmarshalErrorf("unmarshal list: unexpected eof")
+ }
unmarshalData = data[:m]
data = data[m:]
}
@@ -1764,14 +1786,13 @@ func unmarshalMap(info TypeInfo, data []byte, value interface{}) error {
return err
}
data = data[p:]
- if len(data) < m {
- return unmarshalErrorf("unmarshal map: unexpected eof")
- }
key := reflect.New(t.Key())
-
// In case m < 0, the key is null, and unmarshalData should be nil.
var unmarshalData []byte
if m >= 0 {
+ if len(data) < m {
+ return unmarshalErrorf("unmarshal map: unexpected eof")
+ }
unmarshalData = data[:m]
data = data[m:]
}
@@ -1784,14 +1805,14 @@ func unmarshalMap(info TypeInfo, data []byte, value interface{}) error {
return err
}
data = data[p:]
- if len(data) < m {
- return unmarshalErrorf("unmarshal map: unexpected eof")
- }
val := reflect.New(t.Elem())
// In case m < 0, the value is null, and unmarshalData should be nil.
unmarshalData = nil
if m >= 0 {
+ if len(data) < m {
+ return unmarshalErrorf("unmarshal map: unexpected eof")
+ }
unmarshalData = data[:m]
data = data[m:]
}
@@ -2281,14 +2302,16 @@ func unmarshalUDT(info TypeInfo, data []byte, value interface{}) error {
case UDTUnmarshaler:
udt := info.(UDTTypeInfo)
- for _, e := range udt.Elements {
+ for id, e := range udt.Elements {
if len(data) == 0 {
return nil
}
+ if len(data) < 4 {
+ return unmarshalErrorf("can not unmarshal %s: field [%d]%s: unexpected eof", info, id, e.Name)
+ }
var p []byte
p, data = readBytes(data)
-
if err := v.UnmarshalUDT(e.Name, e.Type, p); err != nil {
return err
}
@@ -2315,10 +2338,13 @@ func unmarshalUDT(info TypeInfo, data []byte, value interface{}) error {
rv.Set(reflect.MakeMap(t))
m := *v
- for _, e := range udt.Elements {
+ for id, e := range udt.Elements {
if len(data) == 0 {
return nil
}
+ if len(data) < 4 {
+ return unmarshalErrorf("can not unmarshal %s: field [%d]%s: unexpected eof", info, id, e.Name)
+ }
valType, err := goType(e.Type)
if err != nil {
@@ -2368,10 +2394,13 @@ func unmarshalUDT(info TypeInfo, data []byte, value interface{}) error {
}
udt := info.(UDTTypeInfo)
- for _, e := range udt.Elements {
+ for id, e := range udt.Elements {
+ if len(data) == 0 {
+ return nil
+ }
if len(data) < 4 {
// UDT def does not match the column value
- return nil
+ return unmarshalErrorf("can not unmarshal %s: field [%d]%s: unexpected eof", info, id, e.Name)
}
var p []byte
diff --git a/vendor/github.com/gocql/gocql/session.go b/vendor/github.com/gocql/gocql/session.go
index 3b0d71c8da7..0263d564dfd 100644
--- a/vendor/github.com/gocql/gocql/session.go
+++ b/vendor/github.com/gocql/gocql/session.go
@@ -935,6 +935,12 @@ func (q Query) Statement() string {
return q.stmt
}
+// Values returns the values passed in via Bind.
+// This can be used by a wrapper type that needs to access the bound values.
+func (q Query) Values() []interface{} {
+ return q.values
+}
+
// String implements the stringer interface.
func (q Query) String() string {
return fmt.Sprintf("[query statement=%q values=%+v consistency=%s]", q.stmt, q.values, q.cons)
diff --git a/vendor/github.com/gocql/gocql/version.go b/vendor/github.com/gocql/gocql/version.go
new file mode 100644
index 00000000000..015b40e1eed
--- /dev/null
+++ b/vendor/github.com/gocql/gocql/version.go
@@ -0,0 +1,28 @@
+package gocql
+
+import "runtime/debug"
+
+const (
+ mainModule = "github.com/gocql/gocql"
+)
+
+var driverName string
+
+var driverVersion string
+
+func init() {
+ buildInfo, ok := debug.ReadBuildInfo()
+ if ok {
+ for _, d := range buildInfo.Deps {
+ if d.Path == mainModule {
+ driverName = mainModule
+ driverVersion = d.Version
+ if d.Replace != nil {
+ driverName = d.Replace.Path
+ driverVersion = d.Replace.Version
+ }
+ break
+ }
+ }
+ }
+}
diff --git a/vendor/github.com/google/go-github/v53/AUTHORS b/vendor/github.com/google/go-github/v53/AUTHORS
new file mode 100644
index 00000000000..5e40cd1f38e
--- /dev/null
+++ b/vendor/github.com/google/go-github/v53/AUTHORS
@@ -0,0 +1,433 @@
+# This is the official list of go-github authors for copyright purposes.
+#
+# This does not necessarily list everyone who has contributed code, since in
+# some cases, their employer may be the copyright holder. To see the full list
+# of contributors, see the revision history in source control or
+# https://github.com/google/go-github/graphs/contributors.
+#
+# Authors who wish to be recognized in this file should add themselves (or
+# their employer, as appropriate).
+
+178inaba
+2BFL
+413x
+Abed Kibbe
+Abhinav Gupta
+Abhishek Veeramalla
+aboy
+adrienzieba
+afdesk
+Ahmed Hagy
+Aidan Steele
+Ainsley Chong
+ajz01
+Akeda Bagus
+Akhil Mohan
+Alec Thomas
+Aleks Clark
+Alex Bramley
+Alex Orr
+Alex Su
+Alex Unger
+Alexander Harkness
+Alexis Gauthiez
+Ali Farooq
+Allan Guwatudde
+Allen Sun
+Amey Sakhadeo
+Anders Janmyr
+Andreas Garnæs
+Andrew Ryabchun
+Andrew Svoboda
+Andy Grunwald
+Andy Hume
+Andy Lindeman
+angie pinilla
+anjanashenoy
+Anshuman Bhartiya
+Antoine
+Antoine Pelisse
+Anton Nguyen
+Anubha Kushwaha
+appilon
+aprp
+Aravind
+Arda Kuyumcu
+Arıl Bozoluk
+Asier Marruedo
+Austin Burdine
+Austin Dizzy
+Azuka Okuleye
+Ben Batha
+Benjamen Keroack
+Beshr Kayali
+Beyang Liu
+Billy Keyes
+Billy Lynch
+Bjorn Neergaard
+Björn Häuser
+boljen
+Bracken
+Brad Harris
+Brad Moylan
+Bradley Falzon
+Bradley McAllister
+Brandon Butler
+Brandon Cook
+Brett Kuhlman
+Brett Logan
+Brian Egizi
+Bryan Boreham
+Bryan Peterson
+Cami Diez
+Carl Johnson
+Carlos Alexandro Becker
+Carlos Tadeu Panato Junior
+ChandanChainani
+chandresh-pancholi
+Charles Fenwick Elliott
+Charlie Yan
+Chmouel Boudjnah
+Chris King
+Chris Mc
+Chris Raborg
+Chris Roche
+Chris Schaefer
+chrisforrette
+Christian Bargmann
+Christian Muehlhaeuser
+Christoph Sassenberg
+CI Monk
+Colin Misare
+Craig Gumbley
+Craig Peterson
+Cristian Maglie
+Cyb3r Jak3
+Daehyeok Mun
+Dalton Hubble
+Daniel Lanner
+Daniel Leavitt
+Daniel Nilsson
+Daoq
+Dave Du Cros
+Dave Henderson
+Dave Perrett
+Dave Protasowski
+David Deng
+David Gamba
+David J. M. Karlsen
+David Jannotta
+David Ji
+David Lopez Reyes
+Davide Zipeto
+Dennis Webb
+Derek Jobst
+DeviousLab
+Dhi Aurrahman
+Diego Lapiduz
+Dmitri Shuralyov
+dmnlk
+Don Petersen
+Doug Turner
+Drew Fradette
+Dustin Deus
+Eivind
+Eli Uriegas
+Elliott Beach
+Emerson Wood
+Emil V
+Eng Zer Jun
+eperm
+Erick Fejta
+Erik Nobel
+erwinvaneyk
+Evan Elias
+Fabian Holler
+Fabrice
+Fatema-Moaiyadi
+Felix Geisendörfer
+Filippo Valsorda
+Florian Forster
+Florian Wagner
+Francesc Gil
+Francis
+Francisco Guimarães
+François de Metz
+Fredrik Jönsson
+Gabriel
+Garrett Squire
+George Kontridze
+Georgy Buranov
+Glen Mailer
+Gnahz
+Google Inc.
+Grachev Mikhail
+griffin_stewie
+Guillaume Jacquet
+Guz Alexander
+Guðmundur Bjarni Ólafsson
+Hanno Hecker
+Hari haran
+Harikesh00
+haya14busa
+haya14busa
+Hiroki Ito
+Hubot Jr
+Huy Tr
+huydx
+i2bskn
+Iain Steers
+Ikko Ashimine
+Ioannis Georgoulas
+Isao Jonas
+ishan upadhyay
+isqua
+Jacob Valdemar
+Jake Krammer
+Jake White
+Jameel Haffejee
+James Bowes
+James Cockbain
+James Loh
+Jamie West
+Jan Kosecki
+Jan Švábík
+Javier Campanini
+Jef LeCompte
+Jens Rantil
+Jeremy Morris
+Jesse Haka
+Jesse Newland
+Jihoon Chung
+Jille Timmermans
+Jimmi Dyson
+Joan Saum
+Joe Tsai
+John Barton
+John Engelman
+John Jones
+John Liu
+Jordan Brockopp
+Jordan Sussman
+Joshua Bezaleel Abednego
+João Cerqueira
+JP Phillips
+jpbelanger-mtl
+Juan
+Juan Basso
+Julien Garcia Gonzalez
+Julien Rostand
+Junya Kono
+Justin Abrahms
+Justin Toh
+Jusung Lee
+jzhoucliqr
+k1rnt
+kadern0
+Katrina Owen
+Kautilya Tripathi
+Keita Urashima
+Kevin Burke
+Kevin Wang
+Kevin Zhao
+Kirill
+Konrad Malawski
+Kookheon Kwon
+Krishna Indani
+Krzysztof Kowalczyk
+Kshitij Saraogi
+Kumar Saurabh
+Kyle Kurz
+kyokomi
+Laurent Verdoïa
+leopoldwang
+Liam Galvin
+Lluis Campos
+Lovro Mažgon
+Luca Campese
+Lucas Alcantara
+Luis Davim
+Luke Evers
+Luke Kysow
+Luke Roberts
+Luke Young
+lynn [they]