refactor(dataprotection): simplify target version env name

Author: leon-ape

pkg/dataprotection/restore/builder.go

@@ -317,7 +317,7 @@ func (r *restoreJobBuilder) overridePostReadyTargetEnv(targetEnv []corev1.EnvVar
 	env := make([]corev1.EnvVar, 0, len(r.env)+len(targetEnv))
 	for i := range r.env {
 		if r.env[i].Name == dptypes.DPTargetClusterTopology ||
-			r.env[i].Name == dptypes.DPTargetComponentServiceVersion {
+			r.env[i].Name == dptypes.DPTargetServiceVersion {
 			continue
 		}
 		env = append(env, r.env[i])

pkg/dataprotection/restore/builder_test.go

@@ -33,11 +33,11 @@ func TestRestoreJobBuilderOverridePostReadyTargetEnv(t *testing.T) {
 		{Name: "KEEP", Value: "kept"},
 		{Name: dptypes.DPTargetClusterTopology, Value: "restore-value"},
 		{Name: dptypes.DPTargetClusterTopology, Value: "pod-value"},
-		{Name: dptypes.DPTargetComponentServiceVersion, Value: "spoofed-version"},
+		{Name: dptypes.DPTargetServiceVersion, Value: "spoofed-version"},
 	}}
 	builder.overridePostReadyTargetEnv([]corev1.EnvVar{
 		{Name: dptypes.DPTargetClusterTopology, Value: "shared-nothing"},
-		{Name: dptypes.DPTargetComponentServiceVersion, Value: "3.4.0"},
+		{Name: dptypes.DPTargetServiceVersion, Value: "3.4.0"},
 	})
 
 	values := func(name string) []string {
@@ -51,5 +51,5 @@ func TestRestoreJobBuilderOverridePostReadyTargetEnv(t *testing.T) {
 	}
 	require.Equal(t, []string{"kept"}, values("KEEP"))
 	require.Equal(t, []string{"shared-nothing"}, values(dptypes.DPTargetClusterTopology))
-	require.Equal(t, []string{"3.4.0"}, values(dptypes.DPTargetComponentServiceVersion))
+	require.Equal(t, []string{"3.4.0"}, values(dptypes.DPTargetServiceVersion))
 }

pkg/dataprotection/restore/manager.go

@@ -702,7 +702,7 @@ func (r *RestoreManager) postReadyTargetEnv(reqCtx intctrlutil.RequestCtx, cli c
 	}
 	return []corev1.EnvVar{
 		{Name: dptypes.DPTargetClusterTopology, Value: cluster.Spec.Topology},
-		{Name: dptypes.DPTargetComponentServiceVersion, Value: serviceVersion},
+		{Name: dptypes.DPTargetServiceVersion, Value: serviceVersion},
 	}, nil
 }
 

pkg/dataprotection/restore/manager_test.go

@@ -119,7 +119,7 @@ func TestRestoreManagerPostReadyTargetEnv(t *testing.T) {
 			require.NoError(t, err)
 			require.Equal(t, []corev1.EnvVar{
 				{Name: dptypes.DPTargetClusterTopology, Value: "shared-nothing"},
-				{Name: dptypes.DPTargetComponentServiceVersion, Value: tt.wantVersion},
+				{Name: dptypes.DPTargetServiceVersion, Value: tt.wantVersion},
 			}, env)
 		})
 	}
@@ -623,7 +623,7 @@ var _ = Describe("RestoreManager Test", func() {
 			})
 			restoreMGR.Restore.Spec.Env = append(restoreMGR.Restore.Spec.Env,
 				corev1.EnvVar{Name: dptypes.DPTargetClusterTopology, Value: "spoofed-topology"},
-				corev1.EnvVar{Name: dptypes.DPTargetComponentServiceVersion, Value: "spoofed-version"})
+				corev1.EnvVar{Name: dptypes.DPTargetServiceVersion, Value: "spoofed-version"})
 
 			By("create cluster to restore")
 			clusterInfo := testdp.NewFakeCluster(&testCtx)
@@ -656,7 +656,7 @@ var _ = Describe("RestoreManager Test", func() {
 			// count of job should equal to 1
 			Expect(len(jobs)).Should(Equal(1))
 			Expect(postReadyJobEnvValues(jobs[0], dptypes.DPTargetClusterTopology)).Should(Equal([]string{"shared-nothing"}))
-			Expect(postReadyJobEnvValues(jobs[0], dptypes.DPTargetComponentServiceVersion)).Should(Equal([]string{"3.4.0"}))
+			Expect(postReadyJobEnvValues(jobs[0], dptypes.DPTargetServiceVersion)).Should(Equal([]string{"3.4.0"}))
 			// test timeZone transform
 			var backupStopTimeEnv string
 			for _, v := range jobs[0].Spec.Template.Spec.Containers[0].Env {

pkg/dataprotection/types/constant.go

@@ -122,8 +122,8 @@ const (
 	DPTargetPodRole = "DP_TARGET_POD_ROLE"
 	// DPTargetClusterTopology is the topology of the restore target Cluster.
 	DPTargetClusterTopology = "DP_TARGET_CLUSTER_TOPOLOGY"
-	// DPTargetComponentServiceVersion is the expected serviceVersion of the restore target Component instance.
-	DPTargetComponentServiceVersion = "DP_TARGET_COMPONENT_SERVICE_VERSION"
+	// DPTargetServiceVersion is the expected serviceVersion of the restore target instance.
+	DPTargetServiceVersion = "DP_TARGET_SERVICE_VERSION"
 	// DPBackupBasePath the base path for backup data in the storage
 	// In a backup action pod, it equals ${DP_BACKUP_ROOT_PATH}/${DP_BACKUP_NAME}/${DP_TARGET_RELATIVE_PATH}
 	DPBackupBasePath = "DP_BACKUP_BASE_PATH"