Merge pull request #18 from Keyfactor/v1.3.2-patch

asmith236 · web-flow · commit a2e8c7e6fc3a · 2023-04-05T21:43:51.000-07:00
v1.3.2 Patch
diff --git a/api/certificate.go b/api/certificate.go
@@ -241,7 +241,7 @@ func (c *Client) RevokeCert(rvargs *RevokeCertArgs) error {
 		return errors.New("invalid or nonexistent values required for certificate revocation")
 	}
 
-	if rvargs.EffectiveDate == "" {
+	if rvargs.EffectiveDate == "" || rvargs.EffectiveDate == "{null}" || rvargs.EffectiveDate == "null" {
 		rvargs.EffectiveDate = getTimestamp()
 	}
 
diff --git a/api/security.go b/api/security.go
@@ -111,7 +111,7 @@ func (c *Client) DeleteSecurityIdentity(id int) error {
 	return nil
 }
 
-func (c *Client) GetSecurityRoles() ([]GetSecurityRolesResponse, error) {
+func (c *Client) GetSecurityRoles() (GetSecurityRolesResponse, error) {
 	log.Println("[INFO] Getting list of Keyfactor security roles")
 
 	// Set Keyfactor-specific headers
@@ -134,7 +134,7 @@ func (c *Client) GetSecurityRoles() ([]GetSecurityRolesResponse, error) {
 		return nil, err
 	}
 
-	var jsonResp []GetSecurityRolesResponse
+	var jsonResp GetSecurityRolesResponse
 	err = json.NewDecoder(resp.Body).Decode(&jsonResp)
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ func (c Client) RevokeCert(rvargs RevokeCertArgs) error {`
`241`	`241`	`return errors.New("invalid or nonexistent values required for certificate revocation")`
`242`	`242`	`}`
`243`	`243`
`244`		`- if rvargs.EffectiveDate == "" {`
	`244`	`+ if rvargs.EffectiveDate == "" \|\| rvargs.EffectiveDate == "{null}" \|\| rvargs.EffectiveDate == "null" {`
`245`	`245`	`rvargs.EffectiveDate = getTimestamp()`
`246`	`246`	`}`
`247`	`247`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func (c *Client) DeleteSecurityIdentity(id int) error {`
`111`	`111`	`return nil`
`112`	`112`	`}`
`113`	`113`
`114`		`-func (c *Client) GetSecurityRoles() ([]GetSecurityRolesResponse, error) {`
	`114`	`+func (c *Client) GetSecurityRoles() (GetSecurityRolesResponse, error) {`
`115`	`115`	`log.Println("[INFO] Getting list of Keyfactor security roles")`
`116`	`116`
`117`	`117`	`// Set Keyfactor-specific headers`
`@@ -134,7 +134,7 @@ func (c *Client) GetSecurityRoles() ([]GetSecurityRolesResponse, error) {`
`134`	`134`	`return nil, err`
`135`	`135`	`}`
`136`	`136`
`137`		`- var jsonResp []GetSecurityRolesResponse`
	`137`	`+ var jsonResp GetSecurityRolesResponse`
`138`	`138`	`err = json.NewDecoder(resp.Body).Decode(&jsonResp)`
`139`	`139`	`if err != nil {`
`140`	`140`	`return nil, err`