Include the AgentVersion and clusterID when requesting a presigned URL

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

Author: wallrj

pkg/internal/cyberark/dataupload/dataupload.go

@@ -15,6 +15,7 @@ import (
 	"k8s.io/client-go/transport"
 
 	"github.com/jetstack/preflight/api"
+	"github.com/jetstack/preflight/pkg/clusteruid"
 	"github.com/jetstack/preflight/pkg/version"
 )
 
@@ -97,13 +98,15 @@ func (c *CyberArkClient) retrievePresignedUploadURL(ctx context.Context, checksu
 	}
 
 	request := struct {
-		ClusterID          string `json:"cluster_id"`
-		ClusterDescription string `json:"cluster_description"`
-		Checksum           string `json:"checksum_sha256"`
+		ClusterID string `json:"cluster_id"`
+		// ClusterDescription string `json:"cluster_description"`
+		Checksum     string `json:"checksum_sha256"`
+		AgentVersion string `json:"agent_version"`
 	}{
-		ClusterID:          opts.ClusterName,
-		ClusterDescription: opts.ClusterDescription,
-		Checksum:           checksum,
+		ClusterID: clusteruid.ClusterUIDFromContext(ctx),
+		// ClusterDescription: opts.ClusterDescription,
+		Checksum:     checksum,
+		AgentVersion: version.PreflightVersion,
 	}
 
 	encodedBody := &bytes.Buffer{}