From 74ba3024d36bd51c9d8d8f984ca05d355e44d9a2 Mon Sep 17 00:00:00 2001
From: dwelch-spike <53876192+dwelch-spike@users.noreply.github.com>
Date: Mon, 6 Nov 2023 13:12:28 -0800
Subject: [PATCH] fix: tools-2671 Server7 schema fixes (#22)

* fix: update management lib, add server7.0 new configs
---
 go.mod                                | 2 +-
 go.sum                                | 2 ++
 schema/schemas                        | 2 +-
 testdata/cases/server70/server70.conf | 7 +++++++
 testdata/cases/server70/server70.yaml | 5 +++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 68c8706..fdc6c85 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/aerospike/asconfig
 go 1.20
 
 require (
-	github.com/aerospike/aerospike-management-lib v0.0.0-20231025224657-765f71b4994d
+	github.com/aerospike/aerospike-management-lib v0.0.0-20231106202816-b2438dbb7e03
 	github.com/bombsimon/logrusr/v4 v4.0.0
 	github.com/docker/docker v24.0.6+incompatible
 	github.com/go-logr/logr v1.2.4
diff --git a/go.sum b/go.sum
index fea4657..11aeebe 100644
--- a/go.sum
+++ b/go.sum
@@ -5,6 +5,8 @@ github.com/aerospike/aerospike-management-lib v0.0.0-20231025222637-439d643badb8
 github.com/aerospike/aerospike-management-lib v0.0.0-20231025222637-439d643badb8/go.mod h1:O4v2oGl4VjG9KwYJoSVEwZXv1PUB4ioKAsrm2tczJPQ=
 github.com/aerospike/aerospike-management-lib v0.0.0-20231025224657-765f71b4994d h1:WqKtqOqdZ41/WvbPV/3tGa4KNXZOOTdhwz/K1+P2CuI=
 github.com/aerospike/aerospike-management-lib v0.0.0-20231025224657-765f71b4994d/go.mod h1:O4v2oGl4VjG9KwYJoSVEwZXv1PUB4ioKAsrm2tczJPQ=
+github.com/aerospike/aerospike-management-lib v0.0.0-20231106202816-b2438dbb7e03 h1:Od7oCSBCTfpRmk73fbNGXA53U1in38iNSklCEwMMZFc=
+github.com/aerospike/aerospike-management-lib v0.0.0-20231106202816-b2438dbb7e03/go.mod h1:O4v2oGl4VjG9KwYJoSVEwZXv1PUB4ioKAsrm2tczJPQ=
 github.com/bombsimon/logrusr/v4 v4.0.0 h1:Pm0InGphX0wMhPqC02t31onlq9OVyJ98eP/Vh63t1Oo=
 github.com/bombsimon/logrusr/v4 v4.0.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhOR03TRc6im0l8=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
diff --git a/schema/schemas b/schema/schemas
index 849214b..3e9868b 160000
--- a/schema/schemas
+++ b/schema/schemas
@@ -1 +1 @@
-Subproject commit 849214bd225997e95f39c2a9a6aa10d83b44ac42
+Subproject commit 3e9868b02654aa64653bc8235c969d68aae8ee32
diff --git a/testdata/cases/server70/server70.conf b/testdata/cases/server70/server70.conf
index 1eb1973..0587af6 100644
--- a/testdata/cases/server70/server70.conf
+++ b/testdata/cases/server70/server70.conf
@@ -4,6 +4,7 @@ service {
 
     debug-allocations false
     poison-allocations false
+	quarantine-allocations 100
 
 	user root
 	group root
@@ -72,6 +73,12 @@ namespace ns1 {
         stop-writes-avail-pct 20
         data-size 32G
     }
+
+	nsup-period 2048
+
+	set s1 {
+		default-ttl 25D
+	}
 }
 
 namespace ns2 {
diff --git a/testdata/cases/server70/server70.yaml b/testdata/cases/server70/server70.yaml
index bff0315..9c8adeb 100644
--- a/testdata/cases/server70/server70.yaml
+++ b/testdata/cases/server70/server70.yaml
@@ -44,7 +44,11 @@ namespaces:
         mounts-budget: 10737418240
         type: pmem
       name: ns1
+      nsup-period: 2048
       replication-factor: 2
+      sets:
+        - default-ttl: 2160000
+          name: s1
       sindex-type:
         evict-mounts-pct: 80
         mounts:
@@ -80,6 +84,7 @@ service:
     pidfile: /dummy/file/path1
     poison-allocations: false
     proto-fd-max: 15000
+    quarantine-allocations: 100
     secrets-address-port: test_dns_name:4000:127.0.0.1
     secrets-tls-context: tlscontext
     secrets-uds-path: /test/path/socket