Merge pull request #4 from rschmied/dev

node configuration change
rschmied · Mar 23, 2023 · aa1f771 · aa1f771
2 parents 7b5085b + 508e47d
commit aa1f771
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 Lists the changes in the gocmlclient package.
 
+## Version 0.0.15
+
+- made node configuration a pointer to differentiate between
+  "no configuration" (null), "empty configuration" and "specific
+  configuration". With a null configuration, the default configuration
+  from the node definition will be inserted if there is one
+- added Version var/func, moved NewClient() to New()
+- bump go to 1.19 and vendor deps
+
 ## Version 0.0.12
 
 - Realized that the empty tags removal from 0.0.11 caused a regression.

diff --git a/README.md b/README.md
@@ -4,4 +4,4 @@
 
 A CML2 Client in Golang
 
-(c) Ralph Schmieder  2022
+(c) Ralph Schmieder  2022, 2023
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/Masterminds/semver/v3 v3.2.0
 	github.com/rschmied/mockresponder v1.0.3
-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.8.2
 	golang.org/x/sync v0.1.0
 )
 

diff --git a/go.sum b/go.sum
@@ -9,9 +9,11 @@ github.com/rschmied/mockresponder v1.0.3 h1:HvYHzzVEzW4HmzFR5y3BiYTg2RTuFBKztFQC
 github.com/rschmied/mockresponder v1.0.3/go.mod h1:pwohppdT8/A4hR2r7LzRspvbOk9jdLpO83zm4SDMNpc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

diff --git a/node.go b/node.go
@@ -71,7 +71,7 @@ type Node struct {
 	Y               int            `json:"y"`
 	NodeDefinition  string         `json:"node_definition"`
 	ImageDefinition string         `json:"image_definition"`
-	Configuration   string         `json:"configuration"`
+	Configuration   *string        `json:"configuration"`
 	CPUs            int            `json:"cpus"`
 	CPUlimit        int            `json:"cpu_limit"`
 	RAM             int            `json:"ram"`
@@ -94,7 +94,7 @@ type nodePatchPostAlias struct {
 	Y               int      `json:"y"`
 	NodeDefinition  string   `json:"node_definition,omitempty"`
 	ImageDefinition string   `json:"image_definition,omitempty"`
-	Configuration   string   `json:"configuration,omitempty"`
+	Configuration   *string  `json:"configuration,omitempty"`
 	CPUs            int      `json:"cpus,omitempty"`
 	CPUlimit        int      `json:"cpu_limit,omitempty"`
 	RAM             int      `json:"ram,omitempty"`

diff --git a/vendor/github.com/stretchr/testify/assert/assertions.go b/vendor/github.com/stretchr/testify/assert/assertions.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -10,7 +10,7 @@ github.com/pmezard/go-difflib/difflib
 # github.com/rschmied/mockresponder v1.0.3
 ## explicit; go 1.18
 github.com/rschmied/mockresponder
-# github.com/stretchr/testify v1.8.0
+# github.com/stretchr/testify v1.8.2
 ## explicit; go 1.13
 github.com/stretchr/testify/assert
 # golang.org/x/sync v0.1.0