From 69053efc008f11feb4c5873d5134e9292aa814d9 Mon Sep 17 00:00:00 2001
From: hc-github-team-secure-vault-core
 <82990506+hc-github-team-secure-vault-core@users.noreply.github.com>
Date: Wed, 21 Jun 2023 18:56:07 -0400
Subject: [PATCH] backport of commit 6157b5ffcb6e0fcd1d0823e4929bf50ef1b00bc8
 (#20837)

Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
---
 changelog/20825.txt                                      | 3 +++
 physical/aerospike/aerospike_test.go                     | 4 ++++
 website/content/docs/configuration/storage/aerospike.mdx | 3 +++
 3 files changed, 10 insertions(+)
 create mode 100644 changelog/20825.txt

diff --git a/changelog/20825.txt b/changelog/20825.txt
new file mode 100644
index 000000000..da993696b
--- /dev/null
+++ b/changelog/20825.txt
@@ -0,0 +1,3 @@
+```release-note:change
+storage/aerospike: Aerospike storage shouldn't be used on 32-bit architectures and is now unsupported on them.
+```
\ No newline at end of file
diff --git a/physical/aerospike/aerospike_test.go b/physical/aerospike/aerospike_test.go
index 076272776..6887610ea 100644
--- a/physical/aerospike/aerospike_test.go
+++ b/physical/aerospike/aerospike_test.go
@@ -5,6 +5,7 @@ package aerospike
 
 import (
 	"context"
+	"math/bits"
 	"testing"
 	"time"
 
@@ -16,6 +17,9 @@ import (
 )
 
 func TestAerospikeBackend(t *testing.T) {
+	if bits.UintSize == 32 {
+		t.Skip("Aerospike storage is only supported on 64-bit architectures")
+	}
 	cleanup, config := prepareAerospikeContainer(t)
 	defer cleanup()
 
diff --git a/website/content/docs/configuration/storage/aerospike.mdx b/website/content/docs/configuration/storage/aerospike.mdx
index 826a03e56..bb4714032 100644
--- a/website/content/docs/configuration/storage/aerospike.mdx
+++ b/website/content/docs/configuration/storage/aerospike.mdx
@@ -19,6 +19,9 @@ The Aerospike storage backend is used to persist Vault's data in an
   be as knowledgeable about the technology. If you encounter problems with them,
   you may be referred to the original author.
 
+- **64-bit only** - the Aerospike storage backend is not supported when Vault runs
+  on a 32-bit architecture, because the Aerospike Go client doesn't support 32-bits.
+
 ```hcl
 storage "aerospike" {
   hostname = "localhost"