Move schema version to dataReading element

Moves the schemaVersion field to reading elements rather than the agent
reading post element.

Signed-off-by: oluwole.fadeyi <[email protected]>

Author: oluwole.fadeyi

api/datareading.go

@@ -11,17 +11,17 @@ type DataReadingsPost struct {
 	// DataGatherTime represents the time that the data readings were gathered
 	DataGatherTime time.Time      `json:"data_gather_time"`
 	DataReadings   []*DataReading `json:"data_readings"`
-	SchemaVersion  string         `json:"schema_version"`
 }
 
 // DataReading is the output of a DataGatherer.
 type DataReading struct {
 	// ClusterID is optional as it can be infered from the agent
 	// token when using basic authentication.
-	ClusterID    string      `json:"cluster_id,omitempty"`
-	DataGatherer string      `json:"data-gatherer"`
-	Timestamp    Time        `json:"timestamp"`
-	Data         interface{} `json:"data"`
+	ClusterID     string      `json:"cluster_id,omitempty"`
+	DataGatherer  string      `json:"data-gatherer"`
+	Timestamp     Time        `json:"timestamp"`
+	Data          interface{} `json:"data"`
+	SchemaVersion string      `json:"schema_version"`
 }
 
 // GatheredResource wraps the raw k8s resource that is sent to the jetstack secure backend

pkg/agent/run.go

@@ -47,6 +47,14 @@ var BackoffMaxTime time.Duration
 // StrictMode flag causes the agent to fail at the first attempt
 var StrictMode bool
 
+// schema version of the data sent by the agent.
+// The new default version is v2.
+// In v2 the agent posts data readings using api.gathereredResources
+// Any requests without a schema version set will be interpreted
+// as using v1 by the backend. In v1 the agent sends
+// raw resource data of unstructuredList
+const schemaVersion string = "v2.0.0"
+
 // Run starts the agent process
 func Run(cmd *cobra.Command, args []string) {
 	ctx, cancel := context.WithCancel(context.Background())
@@ -291,10 +299,11 @@ func gatherData(ctx context.Context, config Config, dataGatherers map[string]dat
 			log.Printf("successfully gathered data from %q datagatherer", k)
 
 			readings = append(readings, &api.DataReading{
-				ClusterID:    config.ClusterID,
-				DataGatherer: k,
-				Timestamp:    api.Time{Time: time.Now()},
-				Data:         dgData,
+				ClusterID:     config.ClusterID,
+				DataGatherer:  k,
+				Timestamp:     api.Time{Time: time.Now()},
+				Data:          dgData,
+				SchemaVersion: schemaVersion,
 			})
 		}
 	}

pkg/client/client.go

@@ -16,14 +16,6 @@ var ClientID string
 var ClientSecret string
 var AuthServerDomain string
 
-// schema version of the data sent by the agent.
-// The new default version is v2.
-// In v2 the agent posts data readings using api.gathereredResources
-// Any requests without a schema version set will be interpreted
-// as using v1 by the backend. In v1 the agent sends
-// raw resource data of unstructuredList
-const schemaVersion string = "v2.0.0"
-
 // PreflightClient can be used to talk to the Preflight backend.
 type PreflightClient struct {
 	// OAuth2
@@ -89,7 +81,6 @@ func (c *PreflightClient) PostDataReadings(orgID string, readings []*api.DataRea
 		AgentMetadata:  c.agentMetadata,
 		DataGatherTime: time.Now().UTC(),
 		DataReadings:   readings,
-		SchemaVersion:  schemaVersion,
 	}
 	data, err := json.Marshal(payload)
 	if err != nil {