Merge pull request #46 from aerospike/tools-2972

a-spiker · web-flow · commit 56fd6d7a62a8 · 2024-09-24T22:04:40.000+05:30
fix: TOOLS-2972 include the schema changes for AER-6762
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,4 @@ pkg/*
 
 # Meta files
 .DS_Store
+testdata/*.log
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.21.7
 
 require (
 	github.com/aerospike/aerospike-client-go/v7 v7.2.1
-	github.com/aerospike/aerospike-management-lib v1.4.1-0.20240906065448-a8c2fffd7822
+	github.com/aerospike/aerospike-management-lib v1.4.1-0.20240924074645-465f90bedf30
 	github.com/aerospike/tools-common-go v0.0.0-20240425222921-596724ec5926
 	github.com/bombsimon/logrusr/v4 v4.1.0
 	github.com/docker/docker v26.1.0+incompatible
@@ -41,8 +41,6 @@ require (
 	github.com/pelletier/go-toml/v2 v2.2.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/qdm12/reprint v0.0.0-20200326205758-722754a53494 // indirect
-	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
diff --git a/go.sum b/go.sum
@@ -4,16 +4,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/aerospike/aerospike-client-go/v7 v7.2.1 h1:4A6CxgJMRlDnHx4ycyJ1a5lUzxMS7u4byG1XlhCrvSg=
 github.com/aerospike/aerospike-client-go/v7 v7.2.1/go.mod h1:sKfNsnAKgkGtAlYxdgWNOJm3ykm49s/p6xjEB/cX8/k=
-github.com/aerospike/aerospike-management-lib v1.3.1-0.20240418222400-0d7c09d1b513 h1:mqaKimj6pWkZaIWTMnoj1kSuzExUATwGa4FEO2L6NI0=
-github.com/aerospike/aerospike-management-lib v1.3.1-0.20240418222400-0d7c09d1b513/go.mod h1:o1TV3BTsAiuZ5HtZi9E4FgXqWRwjDzlkS4bfvfaAHLU=
-github.com/aerospike/aerospike-management-lib v1.4.0 h1:wT0l3kwzXv5DV5Cd+hD0BQq3hjSIyaPX1HaUb1304TI=
-github.com/aerospike/aerospike-management-lib v1.4.0/go.mod h1:3JKrmC/mLSV8SygbrPQPNV8T7bFaTMjB8wfnX25gB+4=
-github.com/aerospike/aerospike-management-lib v1.4.1-0.20240905090951-8ea933d560b0 h1:9GKn8wHq4NYR5n6Wc7iMzKPRvFmAGAEUdvV+Ksu46Ww=
-github.com/aerospike/aerospike-management-lib v1.4.1-0.20240905090951-8ea933d560b0/go.mod h1:3JKrmC/mLSV8SygbrPQPNV8T7bFaTMjB8wfnX25gB+4=
-github.com/aerospike/aerospike-management-lib v1.4.1-0.20240906064606-6e4a29134fcf h1:euE/wjWK/MWAS32XKY7uZ/Ty2RSSvODyMxDgzau+kEo=
-github.com/aerospike/aerospike-management-lib v1.4.1-0.20240906064606-6e4a29134fcf/go.mod h1:3JKrmC/mLSV8SygbrPQPNV8T7bFaTMjB8wfnX25gB+4=
-github.com/aerospike/aerospike-management-lib v1.4.1-0.20240906065448-a8c2fffd7822 h1:l/Bbw4Wb5CPAOscP7t2vGsMr40CSaHSC3s3F1Q1HkzQ=
-github.com/aerospike/aerospike-management-lib v1.4.1-0.20240906065448-a8c2fffd7822/go.mod h1:3JKrmC/mLSV8SygbrPQPNV8T7bFaTMjB8wfnX25gB+4=
+github.com/aerospike/aerospike-management-lib v1.4.1-0.20240924074645-465f90bedf30 h1:IOpBwCUxXxFIZ1oeqzPbpnIypdhRND1M/aS/CceKgxc=
+github.com/aerospike/aerospike-management-lib v1.4.1-0.20240924074645-465f90bedf30/go.mod h1:3JKrmC/mLSV8SygbrPQPNV8T7bFaTMjB8wfnX25gB+4=
 github.com/aerospike/tools-common-go v0.0.0-20240425222921-596724ec5926 h1:CqkNasGC/7x5JvYjCSuAVX/rG+nUgRQtXfxIURXo5OE=
 github.com/aerospike/tools-common-go v0.0.0-20240425222921-596724ec5926/go.mod h1:Ig1lRynXx0tXNOY3MdtanTsKz1ifG/2AyDFMXn3RMTc=
 github.com/bombsimon/logrusr/v4 v4.1.0 h1:uZNPbwusB0eUXlO8hIUwStE6Lr5bLN6IgYgG+75kuh4=
@@ -54,6 +46,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q=
 github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is=
@@ -93,8 +87,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/qdm12/reprint v0.0.0-20200326205758-722754a53494 h1:wSmWgpuccqS2IOfmYrbRiUgv+g37W5suLLLxwwniTSc=
-github.com/qdm12/reprint v0.0.0-20200326205758-722754a53494/go.mod h1:yipyliwI08eQ6XwDm1fEwKPdF/xdbkiHtrU+1Hg+vc4=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -121,7 +113,6 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -218,7 +209,6 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/schema/schemas b/schema/schemas
@@ -1 +1 @@
-Subproject commit 6f3489449b68bc086916513be6a331c730928b3c
+Subproject commit 50ca067d6b9d248bf9dea2d78060e6f42a9c2c0e
diff --git a/testdata/cases/server72/conf-tests.json b/testdata/cases/server72/conf-tests.json
@@ -1,12 +1,12 @@
 [
     {
-        "Source":"testdata/cases/server71/server71.conf",
-        "Destination":"testdata/cases/server71/server71-res-.yaml",
-        "Expected":"testdata/cases/server71/server71.yaml",
-        "Arguments":["convert","--aerospike-version","7.1.0.0","--format","asconfig","--output","testdata/cases/server71/server71-res-.yaml"],
+        "Source":"testdata/cases/server72/server72.conf",
+        "Destination":"testdata/cases/server72/server72-res-.yaml",
+        "Expected":"testdata/cases/server72/server72.yaml",
+        "Arguments":["convert","--aerospike-version","7.2.0.0","--format","asconfig","--output","testdata/cases/server72/server72-res-.yaml"],
         "SkipServerTest":false,
         "ServerErrorAllowList":null,
-        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.1.0.0-rc3",
+        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.2.0.0-rc3",
         "DockerAuth":{"Username":"ASC_DOCKER_USER","Password":"ASC_DOCKER_PASS"}
     }
 ]
diff --git a/testdata/cases/server72/server72.conf b/testdata/cases/server72/server72.conf
@@ -96,8 +96,8 @@ xdr {
 		node-address-port 127.0.0.1 3000
 		namespace ns1 {
 			remote-namespace ns2
-			restrict-version-skipping true
-			skip-versions-within 2M
+			ship-versions-interval 2M
+			ship-versions-policy interval
 		}
 	}
 }
diff --git a/testdata/cases/server72/server72.yaml b/testdata/cases/server72/server72.yaml
@@ -68,7 +68,7 @@ xdr:
           namespaces:
             - name: ns1
               remote-namespace: ns2
-              restrict-version-skipping: true
-              skip-versions-within: 120
+              ship-versions-interval: 120
+              ship-versions-policy: interval
           node-address-ports:
             - 127.0.0.1:3000
diff --git a/testdata/cases/server72/yaml-tests.json b/testdata/cases/server72/yaml-tests.json
@@ -6,7 +6,7 @@
         "Arguments":["convert","--aerospike-version","7.2.0.0","--format","yaml","--output","testdata/cases/server72/server72-res-.conf"],
         "SkipServerTest":false,
         "ServerErrorAllowList":null,
-        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.2.0.0-rc1",
+        "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.2.0.0-rc3",
         "DockerAuth":{"Username":"ASC_DOCKER_USER","Password":"ASC_DOCKER_PASS"}
     }
 ]

Original file line number	Diff line number	Diff line change
`@@ -27,3 +27,4 @@ pkg/*`
`27`	`27`
`28`	`28`	`# Meta files`
`29`	`29`	`.DS_Store`
	`30`	`+testdata/*.log`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "Source":"testdata/cases/server71/server71.conf",`
`4`		`- "Destination":"testdata/cases/server71/server71-res-.yaml",`
`5`		`- "Expected":"testdata/cases/server71/server71.yaml",`
`6`		`- "Arguments":["convert","--aerospike-version","7.1.0.0","--format","asconfig","--output","testdata/cases/server71/server71-res-.yaml"],`
	`3`	`+ "Source":"testdata/cases/server72/server72.conf",`
	`4`	`+ "Destination":"testdata/cases/server72/server72-res-.yaml",`
	`5`	`+ "Expected":"testdata/cases/server72/server72.yaml",`
	`6`	`+ "Arguments":["convert","--aerospike-version","7.2.0.0","--format","asconfig","--output","testdata/cases/server72/server72-res-.yaml"],`
`7`	`7`	`"SkipServerTest":false,`
`8`	`8`	`"ServerErrorAllowList":null,`
`9`		`- "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.1.0.0-rc3",`
	`9`	`+ "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.2.0.0-rc3",`
`10`	`10`	`"DockerAuth":{"Username":"ASC_DOCKER_USER","Password":"ASC_DOCKER_PASS"}`
`11`	`11`	`}`
`12`	`12`	`]`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ xdr {`
`96`	`96`	`node-address-port 127.0.0.1 3000`
`97`	`97`	`namespace ns1 {`
`98`	`98`	`remote-namespace ns2`
`99`		`- restrict-version-skipping true`
`100`		`- skip-versions-within 2M`
	`99`	`+ ship-versions-interval 2M`
	`100`	`+ ship-versions-policy interval`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"Arguments":["convert","--aerospike-version","7.2.0.0","--format","yaml","--output","testdata/cases/server72/server72-res-.conf"],`
`7`	`7`	`"SkipServerTest":false,`
`8`	`8`	`"ServerErrorAllowList":null,`
`9`		`- "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.2.0.0-rc1",`
	`9`	`+ "ServerImage":"aerospike.jfrog.io/docker-remote/aerospike/aerospike-server-enterprise-rc:7.2.0.0-rc3",`
`10`	`10`	`"DockerAuth":{"Username":"ASC_DOCKER_USER","Password":"ASC_DOCKER_PASS"}`
`11`	`11`	`}`
`12`	`12`	`]`