#81 WIP: fix tests and merge 2 version

cloudogu · Nov 4, 2024 · fda21af · fda21af
1 parent 9c2576a
commit fda21af
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 157 deletions.
diff --git a/pkg/adapter/kubernetes/blueprintcr/v1/componentDiff.go b/pkg/adapter/kubernetes/blueprintcr/v1/componentDiff.go
@@ -7,7 +7,7 @@ import (
 	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/adapter/serializer"
 	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/domain"
 	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/domain/common"
-	"github.com/cloudogu/k8s-blueprint-operator/pkg/domain/ecosystem"
+	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/domain/ecosystem"
 )
 
 // ComponentDiff is the comparison of a Component's desired state vs. its cluster state.

diff --git a/pkg/adapter/serializer/targetComponent.go b/pkg/adapter/serializer/targetComponent.go
@@ -7,7 +7,7 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/domain"
 	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/domain/common"
-	"github.com/cloudogu/k8s-blueprint-operator/pkg/domain/ecosystem"
+	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/domain/ecosystem"
 	"github.com/cloudogu/k8s-blueprint-operator/v2/pkg/util"
 )
 

diff --git a/pkg/domain/events_test.go b/pkg/domain/events_test.go
@@ -122,22 +122,24 @@ func TestEvents(t *testing.T) {
 		},
 		{
 			name: "dogu config diff determined",
-			event: DoguConfigDiffDeterminedEvent{CombinedDogusConfigDiffs: map[common.SimpleDoguName]CombinedDoguConfigDiffs{
-				"dogu1": {
-					DoguConfigDiff: []DoguConfigEntryDiff{
+			event: DoguConfigDiffDeterminedEvent{
+				DoguConfigDiffs: map[common.SimpleDoguName]DoguConfigDiffs{
+					"dogu1": []DoguConfigEntryDiff{
 						{NeededAction: ConfigActionNone},
 						{NeededAction: ConfigActionSet},
 						{NeededAction: ConfigActionRemove},
 					},
-					SensitiveDoguConfigDiff: []SensitiveDoguConfigEntryDiff{
+				},
+				SensitiveDoguConfigDiffs: map[common.SimpleDoguName]SensitiveDoguConfigDiffs{
+					"dogu1": []SensitiveDoguConfigEntryDiff{
 						{NeededAction: ConfigActionNone},
 						{NeededAction: ConfigActionSet},
 						{NeededAction: ConfigActionRemove},
 					},
 				},
-			}},
+			},
 			expectedName:    "DoguConfigDiffDetermined",
-			expectedMessage: "dogu config diff determined: 6 actions (\"none\": 2, \"remove\": 2, \"set\": 2)",
+			expectedMessage: "dogu config diff determined: 3 actions (\"none\": 1, \"remove\": 1, \"set\": 1) \nsensitive dogu config diff determined: 3 actions (\"none\": 1, \"remove\": 1, \"set\": 1)",
 		},
 		{
 			name:            "blueprint application pre-processed",