From 3558aed975fe4398ceedccec6295bf6569e9bf62 Mon Sep 17 00:00:00 2001 From: dylan Date: Wed, 16 Aug 2023 14:05:05 -0700 Subject: [PATCH 1/8] feat: support server 6.4 configs --- go.mod | 2 +- go.sum | 8 +++ schema/schemas | 2 +- testdata/cases/server64/conf-tests.json | 1 + testdata/cases/server64/server64.conf | 67 +++++++++++++++++++++++++ testdata/cases/server64/server64.yaml | 43 ++++++++++++++++ testdata/cases/server64/versions.json | 1 + testdata/cases/server64/yaml-tests.json | 1 + 8 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 testdata/cases/server64/conf-tests.json create mode 100644 testdata/cases/server64/server64.conf create mode 100644 testdata/cases/server64/server64.yaml create mode 100644 testdata/cases/server64/versions.json create mode 100644 testdata/cases/server64/yaml-tests.json diff --git a/go.mod b/go.mod index d225214..91ba89b 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module aerospike/asconfig go 1.19 require ( - github.com/aerospike/aerospike-management-lib v0.0.0-20230721181710-e0ad7587b911 + github.com/aerospike/aerospike-management-lib v0.0.0-20230816205303-06c8e66a7feb github.com/bombsimon/logrusr/v4 v4.0.0 github.com/docker/docker v23.0.3+incompatible github.com/go-logr/logr v1.2.3 diff --git a/go.sum b/go.sum index 5f2667d..64e47af 100644 --- a/go.sum +++ b/go.sum @@ -12,6 +12,14 @@ github.com/aerospike/aerospike-management-lib v0.0.0-20230721173757-ee3d780a0142 github.com/aerospike/aerospike-management-lib v0.0.0-20230721173757-ee3d780a0142/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/aerospike/aerospike-management-lib v0.0.0-20230721181710-e0ad7587b911 h1:pZ7Z38Qvy8am2xNrerESD+RDUjR0t4uja5bc1bZGCpc= github.com/aerospike/aerospike-management-lib v0.0.0-20230721181710-e0ad7587b911/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230815231638-e2fe5d024ff8 h1:thYiVEQIry5x5SCr586iaKbMQD/vtd3yvdQI/0RsxCc= +github.com/aerospike/aerospike-management-lib v0.0.0-20230815231638-e2fe5d024ff8/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230816200813-3190ce0edae0 h1:q2WyhmaFUA8wXTNSDD1/LYw5T0kr4KXTetMo0SAyCok= +github.com/aerospike/aerospike-management-lib v0.0.0-20230816200813-3190ce0edae0/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230816202429-d065cc95654a h1:Xf9ohUc2W/Xv7pbc5KJDvSZTXj6R00Jacnpl6fQKaMc= +github.com/aerospike/aerospike-management-lib v0.0.0-20230816202429-d065cc95654a/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230816205303-06c8e66a7feb h1:iu0Alq5OA6HEgWqY88Cao7VJ/oLcIZ1dXd2ZLPoXzfI= +github.com/aerospike/aerospike-management-lib v0.0.0-20230816205303-06c8e66a7feb/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/bombsimon/logrusr/v4 v4.0.0 h1:Pm0InGphX0wMhPqC02t31onlq9OVyJ98eP/Vh63t1Oo= github.com/bombsimon/logrusr/v4 v4.0.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhOR03TRc6im0l8= diff --git a/schema/schemas b/schema/schemas index b94b2c3..557c338 160000 --- a/schema/schemas +++ b/schema/schemas @@ -1 +1 @@ -Subproject commit b94b2c3627b5c308911f96b7a79677967804f9ff +Subproject commit 557c338db9ab7bb84d3c8f3550068ce9eb73aa36 diff --git a/testdata/cases/server64/conf-tests.json b/testdata/cases/server64/conf-tests.json new file mode 100644 index 0000000..da01a9e --- /dev/null +++ b/testdata/cases/server64/conf-tests.json @@ -0,0 +1 @@ +[{"Source":"testdata/cases/server64/server64.conf","Destination":"testdata/cases/server64/server64-res-.yaml","Expected":"testdata/cases/server64/server64.yaml","Arguments":["convert","--aerospike-version","6.4.0.1","--format","asconfig","--output","testdata/cases/server64/server64-res-.yaml"],"SkipServerTest":false,"ServerErrorAllowList":null}] \ No newline at end of file diff --git a/testdata/cases/server64/server64.conf b/testdata/cases/server64/server64.conf new file mode 100644 index 0000000..978c886 --- /dev/null +++ b/testdata/cases/server64/server64.conf @@ -0,0 +1,67 @@ + +service { + user root + group root + pidfile /dummy/file/path1 + proto-fd-max 15000 + + secrets-address-port test_dns_name 4000 127.0.0.1 + secrets-tls-context tlscontext + secrets-uds-path /test/path/socket +} + +logging { + + file /dummy/file/path2 { + context any info + } +} + +network { + service { + address any + port 3000 + } + + heartbeat { + mode multicast + multicast-group 127.0.0.1 + port 9918 + + + + + interval 150 + timeout 10 + } + + fabric { + port 3001 + } + + info { + port 3003 + } +} + +namespace ns1 { + replication-factor 2 + memory-size 4G + + index-type flash { + mount /dummy/mount/point1 /test/mount2 + mounts-high-water-pct 30 + mounts-size-limit 10G + } + + storage-engine device { + + device /dummy/device1 + device /dummy/device2 + + + write-block-size 128K + + + } +} diff --git a/testdata/cases/server64/server64.yaml b/testdata/cases/server64/server64.yaml new file mode 100644 index 0000000..da487e2 --- /dev/null +++ b/testdata/cases/server64/server64.yaml @@ -0,0 +1,43 @@ +logging: + - any: info + name: /dummy/file/path2 +namespaces: + - index-type: + mounts: + - /dummy/mount/point1 /test/mount2 + mounts-high-water-pct: 30 + mounts-size-limit: 10737418240 + type: flash + memory-size: 4294967296 + name: ns1 + replication-factor: 2 + storage-engine: + devices: + - /dummy/device1 + - /dummy/device2 + type: device + write-block-size: 131072 +network: + fabric: + port: 3001 + heartbeat: + interval: 150 + mode: multicast + multicast-groups: + - 127.0.0.1 + port: 9918 + timeout: 10 + info: + port: 3003 + service: + addresses: + - any + port: 3000 +service: + group: root + pidfile: /dummy/file/path1 + proto-fd-max: 15000 + secrets-address-port: test_dns_name 4000 127.0.0.1 + secrets-tls-context: tlscontext + secrets-uds-path: /test/path/socket + user: root diff --git a/testdata/cases/server64/versions.json b/testdata/cases/server64/versions.json new file mode 100644 index 0000000..e2a14fd --- /dev/null +++ b/testdata/cases/server64/versions.json @@ -0,0 +1 @@ +{"TestedVersion":"6.4.0.1","OriginallyUsedVersion":"6.4.0.1"} \ No newline at end of file diff --git a/testdata/cases/server64/yaml-tests.json b/testdata/cases/server64/yaml-tests.json new file mode 100644 index 0000000..8774e34 --- /dev/null +++ b/testdata/cases/server64/yaml-tests.json @@ -0,0 +1 @@ +[{"Source":"testdata/cases/server64/server64.yaml","Destination":"testdata/cases/server64/server64-res-.conf","Expected":"testdata/cases/server64/server64.conf","Arguments":["convert","--aerospike-version","6.4.0.1","--format","yaml","--output","testdata/cases/server64/server64-res-.conf"],"SkipServerTest":false,"ServerErrorAllowList":null}] \ No newline at end of file From 0be87466fcca106b542671d455cc3b9b496e3ebf Mon Sep 17 00:00:00 2001 From: dylan Date: Wed, 16 Aug 2023 14:40:07 -0700 Subject: [PATCH 2/8] ci: add allowed error to server64 test --- testdata/cases/server64/conf-tests.json | 2 +- testdata/cases/server64/yaml-tests.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testdata/cases/server64/conf-tests.json b/testdata/cases/server64/conf-tests.json index da01a9e..e3b626e 100644 --- a/testdata/cases/server64/conf-tests.json +++ b/testdata/cases/server64/conf-tests.json @@ -1 +1 @@ -[{"Source":"testdata/cases/server64/server64.conf","Destination":"testdata/cases/server64/server64-res-.yaml","Expected":"testdata/cases/server64/server64.yaml","Arguments":["convert","--aerospike-version","6.4.0.1","--format","asconfig","--output","testdata/cases/server64/server64-res-.yaml"],"SkipServerTest":false,"ServerErrorAllowList":null}] \ No newline at end of file +[{"Source":"testdata/cases/server64/server64.conf","Destination":"testdata/cases/server64/server64-res-.yaml","Expected":"testdata/cases/server64/server64.yaml","Arguments":["convert","--aerospike-version","6.4.0.1","--format","asconfig","--output","testdata/cases/server64/server64-res-.yaml"],"SkipServerTest":false,"ServerErrorAllowList":["each of: /proc/sys/vm/dirty_bytes"]}] \ No newline at end of file diff --git a/testdata/cases/server64/yaml-tests.json b/testdata/cases/server64/yaml-tests.json index 8774e34..7fccbde 100644 --- a/testdata/cases/server64/yaml-tests.json +++ b/testdata/cases/server64/yaml-tests.json @@ -1 +1 @@ -[{"Source":"testdata/cases/server64/server64.yaml","Destination":"testdata/cases/server64/server64-res-.conf","Expected":"testdata/cases/server64/server64.conf","Arguments":["convert","--aerospike-version","6.4.0.1","--format","yaml","--output","testdata/cases/server64/server64-res-.conf"],"SkipServerTest":false,"ServerErrorAllowList":null}] \ No newline at end of file +[{"Source":"testdata/cases/server64/server64.yaml","Destination":"testdata/cases/server64/server64-res-.conf","Expected":"testdata/cases/server64/server64.conf","Arguments":["convert","--aerospike-version","6.4.0.1","--format","yaml","--output","testdata/cases/server64/server64-res-.conf"],"SkipServerTest":false,"ServerErrorAllowList":["each of: /proc/sys/vm/dirty_bytes"]}] \ No newline at end of file From 1ac37417567044204d749ce3ce3642bdbede7dc0 Mon Sep 17 00:00:00 2001 From: dylan Date: Wed, 16 Aug 2023 15:27:31 -0700 Subject: [PATCH 3/8] ci: use docker CLI to get logs --- integration_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/integration_test.go b/integration_test.go index 8417f5f..0780fba 100644 --- a/integration_test.go +++ b/integration_test.go @@ -9,7 +9,6 @@ import ( "encoding/json" "errors" "fmt" - "io" "os" "os/exec" "path/filepath" @@ -21,7 +20,6 @@ import ( "aerospike/asconfig/testutils" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/mount" "github.com/docker/docker/client" @@ -465,13 +463,6 @@ func runServer(version string, confPath string, dockerClient *client.Client, t * t.Error(err) } - logReader, err := dockerClient.ContainerLogs(context.Background(), id, types.ContainerLogsOptions{ShowStdout: true, ShowStderr: true, Follow: true}) - if err != nil { - t.Error(err) - } - - defer logReader.Close() - // need this to allow logs to accumulate time.Sleep(time.Second * 3) @@ -494,7 +485,7 @@ func runServer(version string, confPath string, dockerClient *client.Client, t * case <-statusCh: } - data, err := io.ReadAll(logReader) + data, err := docker("logs", id) if err != nil { t.Error(err) } @@ -762,6 +753,15 @@ func TestConfToYaml(t *testing.T) { } } +func docker(args ...string) ([]byte, error) { + com := exec.Command("docker", args...) + out, err := com.Output() + if err != nil { + err = fmt.Errorf("docker failed err: %s, out: %s", err, string(out)) + } + return out, err +} + func diff(args ...string) ([]byte, error) { args = append([]string{"diff"}, args...) com := exec.Command(binPath+"/asconfig.test", args...) From d1cf644c347fb25a2eabae25916a007e2b7ebb10 Mon Sep 17 00:00:00 2001 From: dylan Date: Fri, 18 Aug 2023 10:07:40 -0700 Subject: [PATCH 4/8] ci: don't hide feature key version errors --- integration_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/integration_test.go b/integration_test.go index 0780fba..fc170a3 100644 --- a/integration_test.go +++ b/integration_test.go @@ -517,10 +517,6 @@ func runServer(version string, confPath string, dockerClient *client.Client, t * // always ignore this failure td.ServerErrorAllowList = append(td.ServerErrorAllowList, "' is enterprise-only") - // TODO support both feature key versions for testing - // servers older than 5.4 won't accept version 2 feature key files. Suppress this for now - td.ServerErrorAllowList = append(td.ServerErrorAllowList, " invalid value 2 for feature feature-key-version") - reg := regexp.MustCompile(`CRITICAL \(config\):.*`) configErrors := reg.FindAllString(containerOut, -1) for _, cfgErr := range configErrors { From 159bb0227420532150a85244c3e3885bbf1250a0 Mon Sep 17 00:00:00 2001 From: dylan Date: Tue, 22 Aug 2023 11:28:09 -0700 Subject: [PATCH 5/8] fix: parse sindex-type from asconf --- go.mod | 2 +- go.sum | 4 ++++ testdata/cases/server64/server64.conf | 7 +++++++ testdata/cases/server64/server64.yaml | 6 ++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 91ba89b..f611725 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module aerospike/asconfig go 1.19 require ( - github.com/aerospike/aerospike-management-lib v0.0.0-20230816205303-06c8e66a7feb + github.com/aerospike/aerospike-management-lib v0.0.0-20230822173759-ad428008d0ba github.com/bombsimon/logrusr/v4 v4.0.0 github.com/docker/docker v23.0.3+incompatible github.com/go-logr/logr v1.2.3 diff --git a/go.sum b/go.sum index 64e47af..a1f495d 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,10 @@ github.com/aerospike/aerospike-management-lib v0.0.0-20230816202429-d065cc95654a github.com/aerospike/aerospike-management-lib v0.0.0-20230816202429-d065cc95654a/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/aerospike/aerospike-management-lib v0.0.0-20230816205303-06c8e66a7feb h1:iu0Alq5OA6HEgWqY88Cao7VJ/oLcIZ1dXd2ZLPoXzfI= github.com/aerospike/aerospike-management-lib v0.0.0-20230816205303-06c8e66a7feb/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822172728-20e37b8709f3 h1:8h+Mjh52GsicN64g9orkHko3j4cGUJtrMe3hpTdy0po= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822172728-20e37b8709f3/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822173759-ad428008d0ba h1:REidvX6m57gfvvfjDwwfPEUyRhugmsTEC7JXHUwZOvA= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822173759-ad428008d0ba/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/bombsimon/logrusr/v4 v4.0.0 h1:Pm0InGphX0wMhPqC02t31onlq9OVyJ98eP/Vh63t1Oo= github.com/bombsimon/logrusr/v4 v4.0.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhOR03TRc6im0l8= diff --git a/testdata/cases/server64/server64.conf b/testdata/cases/server64/server64.conf index 978c886..392c265 100644 --- a/testdata/cases/server64/server64.conf +++ b/testdata/cases/server64/server64.conf @@ -53,6 +53,12 @@ namespace ns1 { mounts-high-water-pct 30 mounts-size-limit 10G } + + sindex-type flash { + mount /dummy/mount/point3 + mounts-high-water-pct 60 + mounts-size-limit 20000M + } storage-engine device { @@ -65,3 +71,4 @@ namespace ns1 { } } + diff --git a/testdata/cases/server64/server64.yaml b/testdata/cases/server64/server64.yaml index da487e2..3ef5190 100644 --- a/testdata/cases/server64/server64.yaml +++ b/testdata/cases/server64/server64.yaml @@ -11,6 +11,12 @@ namespaces: memory-size: 4294967296 name: ns1 replication-factor: 2 + sindex-type: + mounts: + - /dummy/mount/point3 + mounts-high-water-pct: 60 + mounts-size-limit: 20971520000 + type: flash storage-engine: devices: - /dummy/device1 From 3add720a2ee8558f047247d19a8aa77f061d6964 Mon Sep 17 00:00:00 2001 From: dylan Date: Tue, 22 Aug 2023 11:49:38 -0700 Subject: [PATCH 6/8] write sindex-type as a typed section --- go.mod | 2 +- go.sum | 2 ++ testdata/cases/server64/server64.conf | 11 +---------- testdata/cases/server64/server64.yaml | 6 +----- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index f611725..e84d005 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module aerospike/asconfig go 1.19 require ( - github.com/aerospike/aerospike-management-lib v0.0.0-20230822173759-ad428008d0ba + github.com/aerospike/aerospike-management-lib v0.0.0-20230822184602-2c376f926901 github.com/bombsimon/logrusr/v4 v4.0.0 github.com/docker/docker v23.0.3+incompatible github.com/go-logr/logr v1.2.3 diff --git a/go.sum b/go.sum index a1f495d..4fcafa2 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,8 @@ github.com/aerospike/aerospike-management-lib v0.0.0-20230822172728-20e37b8709f3 github.com/aerospike/aerospike-management-lib v0.0.0-20230822172728-20e37b8709f3/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/aerospike/aerospike-management-lib v0.0.0-20230822173759-ad428008d0ba h1:REidvX6m57gfvvfjDwwfPEUyRhugmsTEC7JXHUwZOvA= github.com/aerospike/aerospike-management-lib v0.0.0-20230822173759-ad428008d0ba/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822184602-2c376f926901 h1:53/1ZRPs4mdIeKip+L+tm33lSWHz7XNAwGdpJWFIWnY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822184602-2c376f926901/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/bombsimon/logrusr/v4 v4.0.0 h1:Pm0InGphX0wMhPqC02t31onlq9OVyJ98eP/Vh63t1Oo= github.com/bombsimon/logrusr/v4 v4.0.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhOR03TRc6im0l8= diff --git a/testdata/cases/server64/server64.conf b/testdata/cases/server64/server64.conf index 392c265..ee5eca0 100644 --- a/testdata/cases/server64/server64.conf +++ b/testdata/cases/server64/server64.conf @@ -60,15 +60,6 @@ namespace ns1 { mounts-size-limit 20000M } - storage-engine device { - - device /dummy/device1 - device /dummy/device2 - - - write-block-size 128K - - - } + storage-engine memory } diff --git a/testdata/cases/server64/server64.yaml b/testdata/cases/server64/server64.yaml index 3ef5190..79a6623 100644 --- a/testdata/cases/server64/server64.yaml +++ b/testdata/cases/server64/server64.yaml @@ -18,11 +18,7 @@ namespaces: mounts-size-limit: 20971520000 type: flash storage-engine: - devices: - - /dummy/device1 - - /dummy/device2 - type: device - write-block-size: 131072 + type: memory network: fabric: port: 3001 From 5cd035368ad14ca3287a7e274bc02ac250fdca3c Mon Sep 17 00:00:00 2001 From: dylan Date: Tue, 22 Aug 2023 11:55:18 -0700 Subject: [PATCH 7/8] bump management lib version --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e84d005..e78665f 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module aerospike/asconfig go 1.19 require ( - github.com/aerospike/aerospike-management-lib v0.0.0-20230822184602-2c376f926901 + github.com/aerospike/aerospike-management-lib v0.0.0-20230822185320-14b3ae8f64af github.com/bombsimon/logrusr/v4 v4.0.0 github.com/docker/docker v23.0.3+incompatible github.com/go-logr/logr v1.2.3 diff --git a/go.sum b/go.sum index 4fcafa2..3ab7b0f 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,8 @@ github.com/aerospike/aerospike-management-lib v0.0.0-20230822173759-ad428008d0ba github.com/aerospike/aerospike-management-lib v0.0.0-20230822173759-ad428008d0ba/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/aerospike/aerospike-management-lib v0.0.0-20230822184602-2c376f926901 h1:53/1ZRPs4mdIeKip+L+tm33lSWHz7XNAwGdpJWFIWnY= github.com/aerospike/aerospike-management-lib v0.0.0-20230822184602-2c376f926901/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822185320-14b3ae8f64af h1:wmBKU4Vxb5OIrQWFOJXS/vEKRG2W4k936Lc/zOfNwiA= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822185320-14b3ae8f64af/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/bombsimon/logrusr/v4 v4.0.0 h1:Pm0InGphX0wMhPqC02t31onlq9OVyJ98eP/Vh63t1Oo= github.com/bombsimon/logrusr/v4 v4.0.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhOR03TRc6im0l8= From 5f1857a468dd3c252376abd3f74c87befa2739da Mon Sep 17 00:00:00 2001 From: dylan Date: Tue, 22 Aug 2023 13:08:47 -0700 Subject: [PATCH 8/8] test colon delimited secrets-address-port --- go.mod | 2 +- go.sum | 4 ++++ testdata/cases/server64/server64.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index e78665f..ab77363 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module aerospike/asconfig go 1.19 require ( - github.com/aerospike/aerospike-management-lib v0.0.0-20230822185320-14b3ae8f64af + github.com/aerospike/aerospike-management-lib v0.0.0-20230822200615-d2c51f8be9c7 github.com/bombsimon/logrusr/v4 v4.0.0 github.com/docker/docker v23.0.3+incompatible github.com/go-logr/logr v1.2.3 diff --git a/go.sum b/go.sum index 3ab7b0f..961cb0f 100644 --- a/go.sum +++ b/go.sum @@ -28,6 +28,10 @@ github.com/aerospike/aerospike-management-lib v0.0.0-20230822184602-2c376f926901 github.com/aerospike/aerospike-management-lib v0.0.0-20230822184602-2c376f926901/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/aerospike/aerospike-management-lib v0.0.0-20230822185320-14b3ae8f64af h1:wmBKU4Vxb5OIrQWFOJXS/vEKRG2W4k936Lc/zOfNwiA= github.com/aerospike/aerospike-management-lib v0.0.0-20230822185320-14b3ae8f64af/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822190551-58b773166475 h1:tmsTO9UnWDGDCcDXMiyumIozufGvGYQs2qMV/HPc4z8= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822190551-58b773166475/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822200615-d2c51f8be9c7 h1:MWJbQO+FRcw6wuAxD3MsjZkouyO5UPSWEzLcoeobrYc= +github.com/aerospike/aerospike-management-lib v0.0.0-20230822200615-d2c51f8be9c7/go.mod h1:sTlH+QtluBfc1ZkUaB3sfpZxd4aIux13ENkztyh0lsY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/bombsimon/logrusr/v4 v4.0.0 h1:Pm0InGphX0wMhPqC02t31onlq9OVyJ98eP/Vh63t1Oo= github.com/bombsimon/logrusr/v4 v4.0.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhOR03TRc6im0l8= diff --git a/testdata/cases/server64/server64.yaml b/testdata/cases/server64/server64.yaml index 79a6623..7b1aa97 100644 --- a/testdata/cases/server64/server64.yaml +++ b/testdata/cases/server64/server64.yaml @@ -39,7 +39,7 @@ service: group: root pidfile: /dummy/file/path1 proto-fd-max: 15000 - secrets-address-port: test_dns_name 4000 127.0.0.1 + secrets-address-port: test_dns_name:4000:127.0.0.1 secrets-tls-context: tlscontext secrets-uds-path: /test/path/socket user: root