feat(agent): Agent's can be looked up by GUID or ClientMachine name.

feat(store): Certificate stores can be looked up using a combination of ClientMachine name and StorePath.
feat(model): Adding `DisplayName` to `GetCertificateStoreResponse`
fix(model): `CreateStoreResponse` now uses correct JSON element `CertStoreType`
feat(model): Added the following to accommodate updating Command reserved store parameters via PUT: `SpecialPropertiesSecretValue`,`SecretParamValue`, `SpecialPropertiesValue`

Author: spbsoluble

main.go

@@ -9,10 +9,7 @@ import (
 func main() {
 	var showVersion bool
 
-	version := os.Getenv("GITHUB_REF_NAME")
-	if version == "" {
-		version = "1.0.0"
-	}
+	version := "2.0.0"
 	flag.BoolVar(&showVersion, "version", false, "Print version information.")
 	flag.BoolVar(&showVersion, "v", false, "Print version information.")
 	flag.Parse()

v2/api/agent.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"regexp"
 )
 
 // GetAgentList returns a list of orchestrators registered in the Keyfactor instance
@@ -51,9 +52,16 @@ func (c *Client) GetAgent(id string) ([]Agent, error) {
 	query := apiQuery{
 		Query: []StringTuple{},
 	}
-	query.Query = append(query.Query, StringTuple{
-		"pq.queryString", fmt.Sprintf(`ClientMachine -eq "%s"`, id),
-	})
+
+	if isGUID(id) {
+		query.Query = append(query.Query, StringTuple{
+			"pq.queryString", fmt.Sprintf("AgentId -eq \"%s\"", id),
+		})
+	} else {
+		query.Query = append(query.Query, StringTuple{
+			"pq.queryString", fmt.Sprintf("ClientMachine -eq \"%s\"", id),
+		})
+	}
 
 	keyfactorAPIStruct := &request{
 		Method:   "GET",
@@ -216,3 +224,9 @@ func (c *Client) FetchAgentLogs(id string) (string, error) {
 	}
 	return jsonResp, nil
 }
+
+func isGUID(input string) bool {
+	guidPattern := `^[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}$`
+	match, _ := regexp.MatchString(guidPattern, input)
+	return match
+}

v2/api/store.go

@@ -302,6 +302,97 @@ func (c *Client) GetCertificateStoreByContainerID(containerID interface{}) (*[]G
 	return jsonResp, nil
 }
 
+func (c *Client) GetCertificateStoreByClientAndStorePath(clientMachine string, storePath, containerID interface{}) (*[]GetCertificateStoreResponse, error) {
+
+	query := apiQuery{
+		Query: []StringTuple{},
+	}
+
+	fullQueryString := ""
+	switch containerID.(type) {
+	case int, int64:
+		contIdInt := int(containerID.(int64))
+		if contIdInt > 0 {
+			//query.Query = append(query.Query, StringTuple{
+			//	"certificateStoreQuery.queryString", fmt.Sprintf(`ContainerId -eq "%d"`, containerID),
+			//})
+			//append to fullQueryString
+			fullQueryString = fmt.Sprintf(`ContainerId -eq "%d"`, contIdInt)
+		}
+	case string:
+		//ct, ctErr := c.GetStoreContainer(containerID.(string))
+		//if ctErr != nil {
+		//	return nil, ctErr
+		//}
+		//query.Query = append(query.Query, StringTuple{
+		//	"certificateStoreQuery.queryString", fmt.Sprintf(`ContainerId -eq %d`, *ct.Id),
+		//})
+		//append to fullQueryString
+		fullQueryString = fmt.Sprintf(`ContainerId -eq "%s"`, containerID)
+	}
+
+	if storePath != nil {
+		if fullQueryString != "" {
+			fullQueryString = fmt.Sprintf(`%s AND StorePath -eq "%s"`, fullQueryString, storePath)
+		} else {
+			fullQueryString = fmt.Sprintf(`StorePath -eq "%s"`, storePath)
+		}
+	}
+
+	if clientMachine != "" {
+		if fullQueryString != "" {
+			fullQueryString = fmt.Sprintf(`%s AND ClientMachine -eq "%s"`, fullQueryString, clientMachine)
+		} else {
+			fullQueryString = fmt.Sprintf(`ClientMachine -eq "%s"`, clientMachine)
+		}
+	}
+
+	if fullQueryString != "" {
+		query.Query = append(query.Query, StringTuple{
+			"certificateStoreQuery.queryString", fullQueryString,
+		})
+	}
+
+	// Set Keyfactor-specific headers
+	headers := &apiHeaders{
+		Headers: []StringTuple{
+			{"x-keyfactor-api-version", "1"},
+			{"x-keyfactor-requested-with", "APIClient"},
+		},
+	}
+
+	endpoint := "CertificateStores"
+
+	var keyfactorAPIStruct *request
+	if query.Query != nil {
+		keyfactorAPIStruct = &request{
+			Method:   "GET",
+			Endpoint: endpoint,
+			Headers:  headers,
+			Query:    &query,
+		}
+	} else {
+		keyfactorAPIStruct = &request{
+			Method:   "GET",
+			Endpoint: endpoint,
+			Headers:  headers,
+		}
+	}
+
+	resp, err := c.sendRequest(keyfactorAPIStruct)
+	if err != nil {
+		return nil, err
+	}
+
+	jsonResp := &[]GetCertificateStoreResponse{}
+	err = json.NewDecoder(resp.Body).Decode(&jsonResp)
+	if err != nil {
+		return nil, err
+	}
+	//jsonResp.Properties = unmarshalPropertiesString(jsonResp.PropertiesString)
+	return jsonResp, nil
+}
+
 // AddCertificateToStores takes argument for a AddCertificateToStore structure and is used to remove a configured certificate
 // from one or more certificate stores.
 func (c *Client) AddCertificateToStores(config *AddCertificateToStore) ([]string, error) {

v2/api/store_models.go

@@ -163,6 +163,7 @@ type GetCertificateStoreResponse struct {
 	ReenrollmentStatus      ReEnrollmnentConfig    `json:"ReenrollmentStatus,omitempty"`
 	SetNewPasswordAllowed   bool                   `json:"SetNewPasswordAllowed,omitempty"`
 	Password                StorePasswordConfig    `json:"Password,omitempty"`
+	DisplayName             string                 `json:"DisplayName,omitempty"`
 }
 
 // PropertyDefinition defines property fields associated with a certificate store type, and is returned by the
@@ -184,7 +185,7 @@ type CreateStoreResponse struct {
 	ClientMachine           string              `json:"ClientMachine"`
 	Storepath               string              `json:"Storepath"`
 	CertStoreInventoryJobId string              `json:"CertStoreInventoryJobId"`
-	CertStoreType           int                 `json:"cert_store_type"`
+	CertStoreType           int                 `json:"CertStoreType"`
 	Approved                bool                `json:"Approved"`
 	CreateIfMissing         bool                `json:"CreateIfMissing"`
 	PropertiesString        string              `json:"Properties"`
@@ -296,3 +297,15 @@ type EntryPassword struct {
 	// An integer that identifies the PAM provider used to store the password.
 	Provider int `json:"Provider,omitempty"`
 }
+
+type SpecialPropertiesSecretValue struct {
+	Value SecretParamValue `json:"value"`
+}
+
+type SpecialPropertiesValue struct {
+	Value interface{} `json:"value"`
+}
+
+type SecretParamValue struct {
+	SecretValue string `json:"SecretValue"`
+}