Merge pull request #29 from Keyfactor/store_types_depends_on_null

Store types depends on null
Keyfactor · Oct 3, 2023 · d7e00db · d7e00db
2 parents e932e22 + 44def5a
commit d7e00db
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -1,9 +1,9 @@
 module github.com/Keyfactor/keyfactor-go-client
 
-go 1.18
+go 1.20
 
 require (
-	github.com/Keyfactor/keyfactor-go-client-sdk v1.0.1
+	github.com/Keyfactor/keyfactor-go-client-sdk v1.0.2
 	github.com/spbsoluble/go-pkcs12 v0.3.3
 	go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352
 )

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/Keyfactor/keyfactor-go-client-sdk v1.0.1 h1:cs8hhvsY3MJ2o1K11HLTRCjRT8SbsKhhi73Y4By2CI0=
-github.com/Keyfactor/keyfactor-go-client-sdk v1.0.1/go.mod h1:Z5pSk8YFGXHbKeQ1wTzVN8A4P/fZmtAwqu3NgBHbDOs=
+github.com/Keyfactor/keyfactor-go-client-sdk v1.0.2 h1:caLlzFCz2L4Dth/9wh+VlypFATmOMmCSQkCPKOKMxw8=
+github.com/Keyfactor/keyfactor-go-client-sdk v1.0.2/go.mod h1:Z5pSk8YFGXHbKeQ1wTzVN8A4P/fZmtAwqu3NgBHbDOs=
 github.com/spbsoluble/go-pkcs12 v0.3.3 h1:3nh7IKn16RDpmrSMtOu1JvbB0XHYq1j+IsICdU1c7J4=
 github.com/spbsoluble/go-pkcs12 v0.3.3/go.mod h1:MAxKIUEIl/QVcua/I1L4Otyxl9UvLCCIktce2Tjz6Nw=
 go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 h1:CCriYyAfq1Br1aIYettdHZTy8mBTIPo7We18TuO/bak=

diff --git a/v2/api/store_models.go b/v2/api/store_models.go
@@ -13,14 +13,14 @@ type CreateStoreFctArgs struct {
 	// automatically populated by the CreateStore method. However, if configured, this field will be used.
 	PropertiesString string `json:"Properties,omitempty"`
 	// Mapped name-value pair field used to configure properties.
-	Properties            map[string]string    `json:"-"`
-	AgentId               string               `json:"AgentId"`
-	AgentAssigned         *bool                `json:"AgentAssigned,omitempty"`
-	ContainerName         *string              `json:"ContainerName,omitempty"`
-	InventorySchedule     *InventorySchedule   `json:"InventorySchedule,omitempty"`
-	ReEnrollmentStatus    *ReEnrollmnentConfig `json:"ReEnrollmentStatus,omitempty"`
-	SetNewPasswordAllowed *bool                `json:"SetNewPasswordAllowed,omitempty"`
-	Password              *StorePasswordConfig `json:"Password"`
+	Properties            map[string]interface{} `json:"-"`
+	AgentId               string                 `json:"AgentId"`
+	AgentAssigned         *bool                  `json:"AgentAssigned,omitempty"`
+	ContainerName         *string                `json:"ContainerName,omitempty"`
+	InventorySchedule     *InventorySchedule     `json:"InventorySchedule,omitempty"`
+	ReEnrollmentStatus    *ReEnrollmnentConfig   `json:"ReEnrollmentStatus,omitempty"`
+	SetNewPasswordAllowed *bool                  `json:"SetNewPasswordAllowed,omitempty"`
+	Password              *StorePasswordConfig   `json:"Password"`
 }
 
 // UpdateStoreFctArgs holds the function arguments used for calling the UpdateStore method.

diff --git a/v2/api/store_type_models.go b/v2/api/store_type_models.go
@@ -58,17 +58,17 @@ type StoreTypePropertyDefinitionGeneric struct {
 	Name         string      `json:"Name"`
 	DisplayName  string      `json:"DisplayName"`
 	Type         string      `json:"Type"`
-	DependsOn    string      `json:"DependsOn"`
+	DependsOn    interface{} `json:"DependsOn"`
 	DefaultValue interface{} `json:"DefaultValue"`
 	Required     bool        `json:"Required"`
 }
 
 type StoreTypePropertyDefinition struct {
-	StoreTypeID  int         `json:"StoreTypeId;omitempty"`
+	StoreTypeID  int         `json:"StoreTypeId"`
 	Name         string      `json:"Name"`
 	DisplayName  string      `json:"DisplayName"`
 	Type         string      `json:"Type"`
-	DependsOn    string      `json:"DependsOn"`
+	DependsOn    interface{} `json:"DependsOn"`
 	DefaultValue interface{} `json:"DefaultValue"`
 	Required     bool        `json:"Required"`
 }