Merge pull request #396 from aerospike/v7.6.0

V7.6.0
aerospike · Aug 28, 2024 · 912edc4 · 912edc4
2 parents 7ab0b27 + 1dcd752
commit 912edc4
Show file tree

Hide file tree

Showing 344 changed files with 16,422 additions and 13,101 deletions.
diff --git a/.github/workflows/create-prerelease.yml b/.github/workflows/create-prerelease.yml
@@ -38,8 +38,8 @@ jobs:
                 echo "Dependencies checked"
             - name: "Install golang"
               run: |
-                wget https://go.dev/dl/go1.22.5.darwin-amd64.pkg
-                sudo installer -store -pkg go1.22.5.darwin-amd64.pkg -target /
+                wget https://go.dev/dl/go1.22.6.darwin-amd64.pkg
+                sudo installer -store -pkg go1.22.6.darwin-amd64.pkg -target /
             - name: "Install Packages.pkg for making macos PKG files"
               run: |
                 wget http://s.sudre.free.fr/Software/files/Packages.dmg

diff --git a/docs/agi/supported_log_formats.md b/docs/agi/supported_log_formats.md
@@ -49,17 +49,13 @@ sometext        node_a1        prod_cluster        May 19 2021 23:59:57 GMT: INF
 
 ### GKE default logger
 
-Supported log json definition is defined below. Optional json fields may be provided and will be ignored. One line per Aerospike log line. Do NOT encapsulate in list enumerator `[]`. Multiple node logs may be encapsulated in the same json log file.
+Supported log json definition is defined below. Optional json fields may be provided and will be ignored. One line per Aerospike log line. Multiple node logs may be encapsulated in the same json log file.
+
+***Do NOT encapsulate in list enumerator `[]`.***
 
 ```
-{
-    "textPayload": "LOG_LINE",
-    "resource":{
-        "labels":{
-            "pod_name": "NODE_NAME"
-        }
-    }
-}
+{"textPayload": "LOG_LINE","resource":{"labels":{"pod_name": "NODE_NAME"}}}
+{"textPayload": "LOG_LINE","resource":{"labels":{"pod_name": "NODE_NAME_2"}}}
 ```
 
 Example:
@@ -72,12 +68,12 @@ Example:
 
 ### K8s JSON default logs
 
-Each node must be logged in seaprate JSON file, as node markers are not present in this format. Optional json fields may be provided and will be ignored. One line per Aerospike log line. Do NOT encapsulate in list enumerator `[]`.
+Each node must be logged in seaprate JSON file, as node markers are not present in this format. Optional json fields may be provided and will be ignored. One line per Aerospike log line.
+
+***Do NOT encapsulate in list enumerator `[]`.***
 
 ```
-{
-    "log": "LOG_LINE"
-}
+{"log": "LOG_LINE"}
 ```
 
 Example:
@@ -89,14 +85,12 @@ Example:
 
 ### K8s JSON alternative log format
 
-Each node must be logged in seaprate JSON file, as node markers are not present in this format. Optional json fields may be provided and will be ignored. One line per Aerospike log line. Do NOT encapsulate in list enumerator `[]`.
+Each node must be logged in seaprate JSON file, as node markers are not present in this format. Optional json fields may be provided and will be ignored. One line per Aerospike log line.
+
+***Do NOT encapsulate in list enumerator `[]`.***
 
 ```
-{
-    "jsonPayload":{
-        "log": "LOG_LINE"
-    }
-}
+{"jsonPayload":{"log": "LOG_LINE"}}
 ```
 
 Example:
@@ -114,7 +108,9 @@ Note that AWS CloudWatch CSV encapsulation is not supported. If exporting logs f
 
 Further to the above logging formats, separated line logging is also supported.
 
-Each node must be logged in seaprate JSON file, as node markers are not present in this format. Optional json fields may be provided and will be ignored. One line per Aerospike log line. Do NOT encapsulate in list enumerator `[]`. JSON format is as follows:
+Each node must be logged in seaprate JSON file, as node markers are not present in this format. Optional json fields may be provided and will be ignored. One line per Aerospike log line. JSON format is as follows:
+
+***Do NOT encapsulate in list enumerator `[]`.***
 
 ```
 {

diff --git a/expiries/aws/go.mod b/expiries/aws/go.mod
@@ -4,7 +4,7 @@ go 1.22
 
 require (
 	github.com/aws/aws-lambda-go v1.47.0
-	github.com/aws/aws-sdk-go v1.55.3
+	github.com/aws/aws-sdk-go v1.55.5
 	github.com/bestmethod/inslice v0.0.0-20210212091431-146fa4d769bf
 )
 

diff --git a/expiries/aws/go.sum b/expiries/aws/go.sum
@@ -1,7 +1,7 @@
 github.com/aws/aws-lambda-go v1.47.0 h1:0H8s0vumYx/YKs4sE7YM0ktwL2eWse+kfopsRI1sXVI=
 github.com/aws/aws-lambda-go v1.47.0/go.mod h1:dpMpZgvWx5vuQJfBt0zqBha60q7Dd7RfgJv23DymV8A=
-github.com/aws/aws-sdk-go v1.55.3 h1:0B5hOX+mIx7I5XPOrjrHlKSDQV/+ypFZpIHOx5LOk3E=
-github.com/aws/aws-sdk-go v1.55.3/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
+github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU=
+github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
 github.com/bestmethod/inslice v0.0.0-20210212091431-146fa4d769bf h1:/jMpLhzWQWdZeorH74kr1lmzWorNXlyD1CVgnI/x81I=
 github.com/bestmethod/inslice v0.0.0-20210212091431-146fa4d769bf/go.mod h1:4sPAXglGsGECmmnqzVv9xjZ6beMuAsM+Xp8HqN4r3JY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/expiries/aws/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/expiries/aws/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go
diff --git a/expiries/aws/vendor/github.com/aws/aws-sdk-go/aws/version.go b/expiries/aws/vendor/github.com/aws/aws-sdk-go/aws/version.go
diff --git a/expiries/aws/vendor/modules.txt b/expiries/aws/vendor/modules.txt
@@ -4,7 +4,7 @@ github.com/aws/aws-lambda-go/lambda
 github.com/aws/aws-lambda-go/lambda/handlertrace
 github.com/aws/aws-lambda-go/lambda/messages
 github.com/aws/aws-lambda-go/lambdacontext
-# github.com/aws/aws-sdk-go v1.55.3
+# github.com/aws/aws-sdk-go v1.55.5
 ## explicit; go 1.19
 github.com/aws/aws-sdk-go/aws
 github.com/aws/aws-sdk-go/aws/auth/bearer

diff --git a/expiries/gcp/go.mod b/expiries/gcp/go.mod
@@ -3,15 +3,15 @@ module aerolabexpiry.com/gcf
 go 1.22
 
 require (
-	cloud.google.com/go/compute v1.27.4
-	github.com/GoogleCloudPlatform/functions-framework-go v1.8.1
-	google.golang.org/api v0.189.0
+	cloud.google.com/go/compute v1.28.0
+	github.com/GoogleCloudPlatform/functions-framework-go v1.9.0
+	google.golang.org/api v0.195.0
 	google.golang.org/protobuf v1.34.2
 )
 
 require (
-	cloud.google.com/go/auth v0.7.2 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect
+	cloud.google.com/go/auth v0.9.1 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
 	cloud.google.com/go/compute/metadata v0.5.0 // indirect
 	github.com/cloudevents/sdk-go/v2 v2.15.2 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -20,25 +20,25 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/s2a-go v0.1.8 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.3 // indirect
 	github.com/googleapis/gax-go/v2 v2.13.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
-	go.opentelemetry.io/otel v1.28.0 // indirect
-	go.opentelemetry.io/otel/metric v1.28.0 // indirect
-	go.opentelemetry.io/otel/trace v1.28.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
+	go.opentelemetry.io/otel v1.29.0 // indirect
+	go.opentelemetry.io/otel/metric v1.29.0 // indirect
+	go.opentelemetry.io/otel/trace v1.29.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/crypto v0.25.0 // indirect
-	golang.org/x/net v0.27.0 // indirect
-	golang.org/x/oauth2 v0.21.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
-	google.golang.org/genproto v0.0.0-20240725213756-90e476079158 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240725213756-90e476079158 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240725213756-90e476079158 // indirect
-	google.golang.org/grpc v1.65.0 // indirect
+	golang.org/x/crypto v0.26.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/oauth2 v0.22.0 // indirect
+	golang.org/x/sys v0.24.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
+	google.golang.org/genproto v0.0.0-20240827150818-7e3bb234dfed // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
+	google.golang.org/grpc v1.66.0 // indirect
 )