test: use clustermachineconfig sha for omni upgrade e2e test

Save `ClusterMachineConfigStatus.ClusterMachineConfigSha256` on SaveClusterStatus e2e test. We will later compare this with actual value on AssertClusterStatus e2e test.

Signed-off-by: Oguz Kilcan <[email protected]>

Author: oguzkilcan

internal/backend/grpc/support.go

@@ -295,6 +295,10 @@ func (s *managementServer) collectClusterResources(ctx context.Context, cluster
 			rt:          omni.RedactedClusterMachineConfigType,
 			listOptions: clusterQuery,
 		},
+		{
+			rt:          omni.ClusterMachineConfigStatusType,
+			listOptions: clusterQuery,
+		},
 		{
 			rt:          omni.ClusterMachineTalosVersionType,
 			listOptions: clusterQuery,

internal/backend/runtime/omni/state_access.go

@@ -57,7 +57,6 @@ var (
 	// clusterLabelTypeSet is the set of resource types which have the related cluster's ID as a label.
 	clusterLabelTypeSet = xslices.ToSet([]resource.Type{
 		omni.ClusterMachineConfigType,
-		omni.ClusterMachineConfigStatusType,
 		omni.ClusterMachineIdentityType,
 		omni.ClusterMachineType,
 		omni.ClusterMachineConfigPatchesType,
@@ -382,6 +381,7 @@ func filterAccess(ctx context.Context, access state.Access) error {
 		omni.ClusterMachineTalosVersionType,
 		omni.ClusterMachineType,
 		omni.ClusterMachineConfigPatchesType,
+		omni.ClusterMachineConfigStatusType,
 		omni.ClusterMachineTemplateType,
 		omni.ClusterStatusType,
 		omni.ClusterDiagnosticsType,
@@ -546,6 +546,7 @@ func filterAccessByType(access state.Access) error {
 		omni.ClusterMachineTalosVersionType,
 		omni.ClusterMachineType,
 		omni.ClusterMachineConfigPatchesType,
+		omni.ClusterMachineConfigStatusType,
 		omni.ClusterMachineTemplateType,
 		omni.ClusterStatusMetricsType,
 		omni.ClusterStatusType,

internal/integration/auth_test.go

@@ -804,6 +804,10 @@ func AssertResourceAuthz(rootCtx context.Context, rootCli *client.Client, client
 				resource:       omni.NewClusterMachine(resources.DefaultNamespace, uuid.New().String()),
 				allowedVerbSet: readOnlyVerbSet,
 			},
+			{
+				resource:       omni.NewClusterMachineConfigStatus(resources.DefaultNamespace, uuid.New().String()),
+				allowedVerbSet: readOnlyVerbSet,
+			},
 			{
 				resource:       omni.NewClusterMachineRequestStatus(resources.DefaultNamespace, uuid.New().String()),
 				allowedVerbSet: readOnlyVerbSet,
@@ -1082,9 +1086,6 @@ func AssertResourceAuthz(rootCtx context.Context, rootCli *client.Client, client
 			{
 				resource: authres.NewPublicKey(resources.DefaultNamespace, uuid.New().String()),
 			},
-			{
-				resource: omni.NewClusterMachineConfigStatus(resources.DefaultNamespace, uuid.New().String()),
-			},
 			{
 				resource: omni.NewEtcdAuditResult(resources.DefaultNamespace, uuid.New().String()),
 			},

internal/integration/omni_upgrade_test.go

@@ -31,8 +31,9 @@ import (
 const annotationSnapshot = "snapshot"
 
 type clusterSnapshot struct {
-	Versions  map[string]string
+	Versions  map[string]string // TODO: remove after we switch to sha sums
 	BootTimes map[string]time.Time
+	ShaSums   map[string]string
 }
 
 func (vs clusterSnapshot) saveVersion(res resource.Resource) {
@@ -45,6 +46,16 @@ func (vs clusterSnapshot) getVersion(res resource.Resource) (string, bool) {
 	return val, ok
 }
 
+func (vs clusterSnapshot) saveShaSum(res resource.Resource, shaSum string) {
+	vs.ShaSums[res.Metadata().Type()+"/"+res.Metadata().ID()] = shaSum
+}
+
+func (vs clusterSnapshot) getShaSum(res resource.Resource) (string, bool) {
+	val, ok := vs.ShaSums[res.Metadata().Type()+"/"+res.Metadata().ID()]
+
+	return val, ok
+}
+
 // SaveClusterSnapshot saves resources versions as the annotations for the given cluster.
 func SaveClusterSnapshot(testCtx context.Context, client *client.Client, clusterName string) TestFunc {
 	return func(t *testing.T) {
@@ -56,6 +67,7 @@ func SaveClusterSnapshot(testCtx context.Context, client *client.Client, cluster
 		snapshot := clusterSnapshot{
 			Versions:  map[string]string{},
 			BootTimes: map[string]time.Time{},
+			ShaSums:   map[string]string{},
 		}
 
 		ids := rtestutils.ResourceIDs[*omni.RedactedClusterMachineConfig](ctx, t, st,
@@ -66,6 +78,14 @@ func SaveClusterSnapshot(testCtx context.Context, client *client.Client, cluster
 			snapshot.saveVersion(res)
 		})
 
+		cmcss := rtestutils.ResourceIDs[*omni.ClusterMachineConfigStatus](ctx, t, st,
+			state.WithLabelQuery(resource.LabelEqual(omni.LabelCluster, clusterName)),
+		)
+
+		rtestutils.AssertResources(ctx, t, st, cmcss, func(res *omni.ClusterMachineConfigStatus, _ *assert.Assertions) {
+			snapshot.saveShaSum(res, res.TypedSpec().Value.ClusterMachineConfigSha256)
+		})
+
 		require := require.New(t)
 		assert := assert.New(t)