Merge branch 'aws-samples:main' into main

Author: lyakhovv

.github/workflows/validate_doc_gen_metadata.yaml

@@ -0,0 +1,23 @@
+# Ensure DocGen metadata is valid for internal AWS docs build
+# https://github.com/awsdocs/aws-doc-sdk-examples-tools
+name: Validate DocGen Metadata
+
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: checkout repo content
+        uses: actions/checkout@v3
+      - name: validate metadata
+        uses: awsdocs/aws-doc-sdk-examples-tools@main

.gitignore

@@ -0,0 +1,2 @@
+scala/datastax-v4/aws-glue/dist/
+**/*.DS_Store

dotnet/datastax-v3/connection-lambda/src/keyspaces-lambda-csharp/keyspaces-lambda-csharp.csproj

@@ -12,7 +12,7 @@
     <PackageReference Include="Amazon.Lambda.Serialization.SystemTextJson" Version="2.1.0" />
     <PackageReference Include="CassandraCSharpDriver" Version="3.16.2" />
     <PackageReference Include="Amazon.Lambda.SQSEvents" Version="1.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ResolvedFileToPublish Include="../../AmazonRootCA1.pem">

golang/gocql/connection-sigv4/main.go

@@ -1,9 +1,13 @@
+// snippet-start:[keyspaces.GO.connection.sigv4]
 package main
 
 import (
 	"fmt"
 	"log"
+	"math"
+	"math/rand"
 	"os"
+	"time"
 
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sigv4-auth-cassandra-gocql-driver-plugin/sigv4"
@@ -35,24 +39,37 @@ func init() {
 func main() {
 
 	//Determine Contact Point
-	contactPoint := fmt.Sprintf("cassandra.%s.amazonaws.com:9142", awsRegion)
+	contactPoint := fmt.Sprintf("cassandra.%s.amazonaws.com", awsRegion)
 	fmt.Println("Using Contact Point ", contactPoint)
 
 	// Configure Cluster
 	cluster := gocql.NewCluster(contactPoint)
 
+	cluster.Port = 9142
+
+	cluster.NumConns = 4
+
 	awsAuth := sigv4.NewAwsAuthenticator()
 	cluster.Authenticator = awsAuth
 
+	//Retry Policy
+	amazonKeyspacesRetry := &AmazonKeyspacesExponentialBackoffRetryPolicy{Max: 100 * time.Millisecond , Min: 10 * time.Millisecond, NumRetries: 20}
+	cluster.RetryPolicy = amazonKeyspacesRetry
+
+	amazonKeyspacesConnectionObserver, _ := NewAmazonKeyspacesObserver()
+	cluster.ConnectObserver = amazonKeyspacesConnectionObserver
+
 	// Configure Connection TrustStore for TLS
 	cluster.SslOpts = &gocql.SslOptions{
 		CaPath: "certs/sf-class2-root.crt",
+		EnableHostVerification: false,
 	}
 
 	cluster.Consistency = gocql.LocalQuorum
-	cluster.DisableInitialHostLookup = true
+	cluster.DisableInitialHostLookup = false
 
 	cassandraSession, err := cluster.CreateSession()
+
 	if err != nil {
 		fmt.Println("Cassandra Session Creation Error - ", err)
 		os.Exit(-2)
@@ -62,7 +79,10 @@ func main() {
 
 	// Perform Query
 	var keyspaceName string
-	iter := cassandraSession.Query("SELECT keyspace_name FROM system_schema.keyspaces;").Iter()
+	query := cassandraSession.Query("SELECT keyspace_name FROM system_schema.keyspaces;")
+        query.Idempotent(true)
+	iter := query.Iter()
+
 	defer iter.Close()
 
 	for iter.Scan(&keyspaceName) {
@@ -72,3 +92,60 @@ func main() {
 		log.Fatal(err)
 	}
 }
+//Observer for debugging connection
+func NewAmazonKeyspacesObserver() (*AmazonKeyspacesObserver, error) {
+	s := &AmazonKeyspacesObserver{
+	}
+	return s, nil
+}
+
+type AmazonKeyspacesObserver struct {}
+
+func (e *AmazonKeyspacesObserver) ObserveConnect(q gocql.ObservedConnect) {
+
+	if q.Err != nil {
+		fmt.Printf("Error Connecting to IP:%s, Port:%d Error: %s\n", q.Host.ConnectAddress(), q.Host.Port(), q.Err)
+	} else {
+		fmt.Printf("Connected to hostid:%s, IP:%s, Port:%d, elapse:%d\n", q.Host.HostID(), q.Host.ConnectAddress(), q.Host.Port(), q.End.UnixMilli()-q.Start.UnixMilli())
+	}
+}
+
+
+//AmazonKeyspacesExponentialBackoffRetryPolicy will retry exponentially on the same connection
+type AmazonKeyspacesExponentialBackoffRetryPolicy struct {
+	NumRetries int
+	Min, Max   time.Duration
+}
+
+func (e *AmazonKeyspacesExponentialBackoffRetryPolicy) Attempt(q gocql.RetryableQuery) bool {
+	if q.Attempts() > e.NumRetries {
+		return false
+	}
+	time.Sleep(e.napTime(q.Attempts()))
+	return true
+}
+// used to calculate exponentially growing time
+func getExponentialTime(min time.Duration, max time.Duration, attempts int) time.Duration {
+	if min <= 0 {
+		min = 100 * time.Millisecond
+	}
+	if max <= 0 {
+		max = 10 * time.Second
+	}
+	minFloat := float64(min)
+	napDuration := minFloat * math.Pow(2, float64(attempts-1))
+	// add some jitter
+	napDuration += rand.Float64()*minFloat - (minFloat / 2)
+	if napDuration > float64(max) {
+		return time.Duration(max)
+	}
+	return time.Duration(napDuration)
+}
+// GetRetryType will always retry instead of RetryNextHost
+func (e *AmazonKeyspacesExponentialBackoffRetryPolicy) GetRetryType(err error) gocql.RetryType {
+	return gocql.Retry
+}
+func (e *AmazonKeyspacesExponentialBackoffRetryPolicy) napTime(attempts int) time.Duration {
+	return getExponentialTime(e.Min, e.Max, attempts)
+}
+// snippet-end:[keyspaces.GO.connection.sigv4]

java/datastax-v4/connection-lambda/src/main/resources/application.conf

@@ -6,8 +6,10 @@ datastax-java-driver {
     }
     basic.load-balancing-policy {
         local-datacenter = "us-west-2"
+        slow-replica-avoidance = false
     }
     advanced {
+        reconnect-on-init = true
         auth-provider = {
             class = software.aws.mcs.auth.SigV4AuthProvider
             aws-region = "us-west-2"

java/datastax-v4/connection-sigv4/src/main/resources/application-full.conf

@@ -2,8 +2,10 @@ datastax-java-driver {
     basic.contact-points = [ "cassandra.us-east-2.amazonaws.com:9142" ]
     basic.load-balancing-policy {
         class = DefaultLoadBalancingPolicy
+        slow-replica-avoidance = false
     }
     advanced {
+        reconnect-on-init = true
         auth-provider = {
             class = software.aws.mcs.auth.SigV4AuthProvider
             aws-region = us-east-2
@@ -12,5 +14,6 @@ datastax-java-driver {
             class = DefaultSslEngineFactory
             hostname-validation = false
         }
+        connection.pool.local.size = 3
     }
 }

java/datastax-v4/connection-sigv4/src/main/resources/application.conf

@@ -1,14 +1,17 @@
 datastax-java-driver {
     basic.load-balancing-policy {
         class = DefaultLoadBalancingPolicy
+        slow-replica-avoidance = false
     }
     advanced {
+        reconnect-on-init = true
         auth-provider = {
             class = software.aws.mcs.auth.SigV4AuthProvider
         }
         ssl-engine-factory {
             class = DefaultSslEngineFactory
             hostname-validation = false
         }
+        connection.pool.local.size = 3
     }
 }

java/datastax-v4/connection-vpc-endpoint/src/main/resources/application-full.conf

@@ -3,12 +3,14 @@ datastax-java-driver {
         contact-points = [ "cassandra.us-east-2.amazonaws.com:9142" ]
         load-balancing-policy {
             class = DefaultLoadBalancingPolicy
+            slow-replica-avoidance = false
         }
         request {
             default-idempotence = true
         }
     }
     advanced {
+        reconnect-on-init = true
         auth-provider = {
             class = software.aws.mcs.auth.SigV4AuthProvider
             aws-region = us-east-2

java/datastax-v4/connection-vpc-endpoint/src/main/resources/application.conf

@@ -2,13 +2,16 @@ datastax-java-driver {
     basic {
         load-balancing-policy {
             class = DefaultLoadBalancingPolicy
+            slow-replica-avoidance = false
         }
         request {
             default-idempotence = true
         }
     }
 
     advanced {
+        reconnect-on-init = true
+
         auth-provider = {
             class = software.aws.mcs.auth.SigV4AuthProvider
         }