#81 fix bug while serializing sensitive config diff

Sensitive Config diff was only serialized if there also was normal dogu config diff
cloudogu · Nov 5, 2024 · 0a3d14f · 0a3d14f
1 parent 62fae7e
commit 0a3d14f
Show file tree

Hide file tree

Showing 2 changed files with 71 additions and 3 deletions.
diff --git a/pkg/adapter/kubernetes/blueprintcr/v1/stateDiff.go b/pkg/adapter/kubernetes/blueprintcr/v1/stateDiff.go
@@ -37,7 +37,7 @@ func ConvertToStateDiffDTO(domainModel domain.StateDiff) StateDiff {
 	var doguConfigDiffByDogu map[common.SimpleDoguName]DoguConfigDiff
 	var sensitiveDoguConfigDiff map[common.SimpleDoguName]SensitiveDoguConfigDiff
 
-	if len(domainModel.DoguConfigDiffs) != 0 {
+	if len(domainModel.DoguConfigDiffs) != 0 || len(domainModel.SensitiveDoguConfigDiffs) != 0 {
 		combinedConfigDiffs = make(map[string]CombinedDoguConfigDiff)
 		for doguName, doguConfigDiff := range domainModel.DoguConfigDiffs {
 			doguConfigDiffByDogu = make(map[common.SimpleDoguName]DoguConfigDiff)

diff --git a/pkg/adapter/kubernetes/blueprintcr/v1/stateDiff_test.go b/pkg/adapter/kubernetes/blueprintcr/v1/stateDiff_test.go
@@ -19,6 +19,8 @@ var (
 	testVersionLow     = semver.MustParse(testVersionLowRaw)
 	testVersionHighRaw = "2.3.4"
 	testVersionHigh    = semver.MustParse(testVersionHighRaw)
+	testDogu           = common.SimpleDoguName("testDogu")
+	testDoguKey1       = common.DoguConfigKey{DoguName: testDogu, Key: "key1"}
 )
 
 func TestConvertToDTO(t *testing.T) {
@@ -554,7 +556,8 @@ func TestConvertToDomainModel(t *testing.T) {
 			wantErr: func(t assert.TestingT, err error, i ...interface{}) bool {
 				return assert.NoError(t, err)
 			},
-		}, {
+		},
+		{
 			name: "succeed for multiple component diffs",
 			dto: StateDiff{
 				ComponentDiffs: map[string]ComponentDiff{
@@ -588,7 +591,8 @@ func TestConvertToDomainModel(t *testing.T) {
 			wantErr: func(t assert.TestingT, err error, i ...interface{}) bool {
 				return assert.NoError(t, err)
 			},
-		}, {
+		},
+		{
 			name: "fail for multiple component diffs",
 			dto: StateDiff{
 				ComponentDiffs: map[string]ComponentDiff{
@@ -636,3 +640,67 @@ func TestConvertToDomainModel(t *testing.T) {
 		})
 	}
 }
+
+func TestConvertToStateDiffDTO(t *testing.T) {
+
+	tests := []struct {
+		name  string
+		model domain.StateDiff
+		want  StateDiff
+	}{
+		{
+			name: "ok",
+			model: domain.StateDiff{
+				DoguDiffs:       nil,
+				ComponentDiffs:  nil,
+				DoguConfigDiffs: map[common.SimpleDoguName]domain.DoguConfigDiffs{},
+				SensitiveDoguConfigDiffs: map[common.SimpleDoguName]domain.SensitiveDoguConfigDiffs{
+					testDogu: {
+						{
+							Key: testDoguKey1,
+							Actual: domain.DoguConfigValueState{
+								Value:  "123",
+								Exists: true,
+							},
+							Expected: domain.DoguConfigValueState{
+								Value:  "123",
+								Exists: true,
+							},
+							NeededAction: domain.ConfigActionSet,
+						},
+					},
+				},
+				GlobalConfigDiffs: nil,
+			},
+			want: StateDiff{
+				DoguDiffs:      map[string]DoguDiff{},
+				ComponentDiffs: map[string]ComponentDiff{},
+				DoguConfigDiffs: map[string]CombinedDoguConfigDiff{
+					testDogu.String(): {
+						DoguConfigDiff: DoguConfigDiff(nil),
+						SensitiveDoguConfigDiff: SensitiveDoguConfigDiff{
+							DoguConfigEntryDiff{
+								Key: testDoguKey1.Key.String(),
+								Actual: DoguConfigValueState{
+									Value:  "123",
+									Exists: true,
+								},
+								Expected: DoguConfigValueState{
+									Value:  "123",
+									Exists: true,
+								},
+								NeededAction: ConfigAction("set"),
+							},
+						},
+					},
+				},
+				GlobalConfigDiff: nil,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			assert.Equalf(t, tt.want, ConvertToStateDiffDTO(tt.model), "ConvertToStateDiffDTO(%v)", tt.model)
+		})
+	}
+}