Skip to content

Commit

Permalink
Update internal deps (#31)
Browse files Browse the repository at this point in the history
* deps: Update schemas submodule

* deps: Upgrade tools-common-go and mgmt-lib 1.2.0
  • Loading branch information
Jesse S authored Jan 26, 2024
1 parent b00ca57 commit f49627c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "schemas"]
path = schema/schemas
url = https://github.com/aerospike/schemas
url = [email protected]:aerospike/schemas
ignore = dirty
2 changes: 1 addition & 1 deletion cmd/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,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)
}
Expand Down
3 changes: 0 additions & 3 deletions conf/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand All @@ -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,
)

Expand Down Expand Up @@ -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,
)

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ 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/tools-common-go v0.0.0-20240119223231-5879272be88e
github.com/aerospike/aerospike-management-lib v1.2.0
github.com/aerospike/tools-common-go v0.0.0-20240126183151-d9f720a5507f
github.com/bombsimon/logrusr/v4 v4.1.0
github.com/docker/docker v24.0.7+incompatible
github.com/go-logr/logr v1.4.1
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ 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.0 h1:aBs6ZTJeVAlWZGUyxAwEBorqQG2aqQh4Ut3yxpQlV9k=
github.com/aerospike/aerospike-management-lib v1.2.0/go.mod h1:NwegUX6or8xmwVMIueBmGTW7lfKlZ9XDQoCuhnQKMCA=
github.com/aerospike/tools-common-go v0.0.0-20240119223231-5879272be88e h1:0XSLj7JHg3gXanQwUqE4my2scwrpFor9vJdqHGXvNsI=
github.com/aerospike/tools-common-go v0.0.0-20240119223231-5879272be88e/go.mod h1:JaDR4z9G/GsYx7N33UBmKY0Bm0QlKpCzX23Kub1FOVo=
github.com/aerospike/tools-common-go v0.0.0-20240126183151-d9f720a5507f h1:GzMQfBG2KyZ8reYhrYqPnGDMWbxiuaQjnzrs7Y9gRQY=
github.com/aerospike/tools-common-go v0.0.0-20240126183151-d9f720a5507f/go.mod h1:JaDR4z9G/GsYx7N33UBmKY0Bm0QlKpCzX23Kub1FOVo=
github.com/bombsimon/logrusr/v4 v4.1.0 h1:uZNPbwusB0eUXlO8hIUwStE6Lr5bLN6IgYgG+75kuh4=
github.com/bombsimon/logrusr/v4 v4.1.0/go.mod h1:pjfHC5e59CvjTBIU3V3sGhFWFAnsnhOR03TRc6im0l8=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
Expand Down

0 comments on commit f49627c

Please sign in to comment.