Add cluster name and description to CyberArk Discovery and Context snapshot

- Add ClusterName and ClusterDescription fields to Snapshot struct
- Populate these fields from Options in PostDataReadingsWithOptions

Signed-off-by: Richard Wall <[email protected]>

Author: wallrj-cyberark

internal/cyberark/dataupload/dataupload.go

@@ -51,6 +51,10 @@ type Snapshot struct {
 	AgentVersion string `json:"agent_version"`
 	// ClusterID is the unique ID of the Kubernetes cluster which this snapshot was taken from.
 	ClusterID string `json:"cluster_id"`
+	// ClusterName is the name of the Kubernetes cluster which this snapshot was taken from.
+	ClusterName string `json:"cluster_name"`
+	// ClusterDescription is an optional description of the Kubernetes cluster which this snapshot was taken from.
+	ClusterDescription string `json:"cluster_description,omitempty"`
 	// K8SVersion is the version of Kubernetes which the cluster is running.
 	K8SVersion string `json:"k8s_version"`
 	// Secrets is a list of Secret resources in the cluster. Not all Secret

pkg/client/client_cyberark.go

@@ -52,18 +52,20 @@ func NewCyberArk(httpClient *http.Client) (*CyberArkClient, error) {
 // It initializes a data upload client with the configured HTTP client and credentials,
 // then uploads a snapshot.
 // The supplied Options are not used by this publisher.
-func (o *CyberArkClient) PostDataReadingsWithOptions(ctx context.Context, readings []*api.DataReading, _ Options) error {
+func (o *CyberArkClient) PostDataReadingsWithOptions(ctx context.Context, readings []*api.DataReading, opts Options) error {
 	log := klog.FromContext(ctx)
-	var snapshot dataupload.Snapshot
+	snapshot := dataupload.Snapshot{
+		ClusterName:        opts.ClusterName,
+		ClusterDescription: opts.ClusterDescription,
+		AgentVersion:       version.PreflightVersion,
+	}
 	if err := convertDataReadings(defaultExtractorFunctions, readings, &snapshot); err != nil {
 		return fmt.Errorf("while converting data readings: %s", err)
 	}
 
 	// Minimize the snapshot to reduce size and improve privacy
 	minimizeSnapshot(log.V(logs.Debug), &snapshot)
 
-	snapshot.AgentVersion = version.PreflightVersion
-
 	cfg, err := o.configLoader()
 	if err != nil {
 		return err