Merge branch 'main' into TOOLS-2752-conf-support

aerospike · Feb 1, 2024 · c71dc73 · c71dc73
2 parents 2cd7982 + cfa5d8c
commit c71dc73
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "schemas"]
 	path = schema/schemas
-	url = https://github.com/aerospike/schemas
+	url = https://github.com/aerospike/schemas # Tools build fails if ssh is used
+	ignore = dirty
diff --git a/cmd/generate.go b/cmd/generate.go
@@ -67,7 +67,7 @@ func newGenerateCmd() *cobra.Command {
 				return errors.Join(fmt.Errorf("unable to generate config file"), err)
 			}
 
-			asconfig, err := asconfig.NewMapAsConfig(mgmtLibLogger, generatedConf.Version, generatedConf.Conf)
+			asconfig, err := asconfig.NewMapAsConfig(mgmtLibLogger, generatedConf.Conf)
 			if err != nil {
 				return errors.Join(fmt.Errorf("unable to parse the generated conf file"), err)
 			}

diff --git a/conf/loader.go b/conf/loader.go
@@ -40,7 +40,6 @@ func NewASConfigFromBytes(log logr.Logger, src []byte, srcFmt Format) (*asconfig
 
 	cfg, err = asconfig.NewMapAsConfig(
 		log,
-		"", // TODO: Remove when management lib merges PR #41
 		*cmap,
 	)
 
@@ -58,7 +57,6 @@ func loadYAML(log logr.Logger, src []byte) (*asconfig.AsConfig, error) {
 
 	c, err := asconfig.NewMapAsConfig(
 		log,
-		"", // TODO: Remove when management lib merges PR #41
 		data,
 	)
 
@@ -94,7 +92,6 @@ func loadAsConf(log logr.Logger, src []byte) (*asconfig.AsConfig, error) {
 
 	c, err = asconfig.NewMapAsConfig(
 		log,
-		"", // TODO: Remove when management lib merges PR #41
 		cmap,
 	)
 

diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/aerospike/aerospike-client-go/v6 v6.14.1
-	github.com/aerospike/aerospike-management-lib v1.1.0
+	github.com/aerospike/aerospike-management-lib v1.2.1-0.20240131023930-e7454a7e0866
 	github.com/aerospike/tools-common-go v0.0.0-20240201223104-9536b835c556
 	github.com/bombsimon/logrusr/v4 v4.1.0
 	github.com/docker/docker v24.0.7+incompatible

diff --git a/go.sum b/go.sum
@@ -4,8 +4,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/aerospike/aerospike-client-go/v6 v6.14.1 h1:1DB9rgbPcCSjR7QS+2CL4MM4atdVcRiWa2AVKO7ydyY=
 github.com/aerospike/aerospike-client-go/v6 v6.14.1/go.mod h1:/0Wm81GhMqem+9flWcpazPKoRfjFeG6WrQdXGiMNi0A=
-github.com/aerospike/aerospike-management-lib v1.1.0 h1:QchwRIzxxqwnjKHkqbvdDjYl6zHTXiFpmWcN3dSPPuI=
-github.com/aerospike/aerospike-management-lib v1.1.0/go.mod h1:NwegUX6or8xmwVMIueBmGTW7lfKlZ9XDQoCuhnQKMCA=
+github.com/aerospike/aerospike-management-lib v1.2.1-0.20240131023930-e7454a7e0866 h1:h7rAmIJG/z+pq5hQ2Zi0xHbgG3pNdea/hSH4l5ay9FE=
+github.com/aerospike/aerospike-management-lib v1.2.1-0.20240131023930-e7454a7e0866/go.mod h1:NwegUX6or8xmwVMIueBmGTW7lfKlZ9XDQoCuhnQKMCA=
 github.com/aerospike/tools-common-go v0.0.0-20240201223104-9536b835c556 h1:JUzUI3n6zZBd3QvGNAdQR6c9ZJOGJc/Uo882uStRKZ0=
 github.com/aerospike/tools-common-go v0.0.0-20240201223104-9536b835c556/go.mod h1:vUWN5pPNk1P9fGmW0bvmLCdIV6CqEA8iCyhxb8t3MTE=
 github.com/bombsimon/logrusr/v4 v4.1.0 h1:uZNPbwusB0eUXlO8hIUwStE6Lr5bLN6IgYgG+75kuh4=