Skip to content
This repository has been archived by the owner on Jul 4, 2024. It is now read-only.

Commit

Permalink
Use notification report from details (#3475)
Browse files Browse the repository at this point in the history 
* use notification status report

* adjust PR version

* cleanup

* typo

* address comments

* make lint happy

* add comment

* add unit tests

* addapt constraint template in tests

* addapt constraint template in tests
  • Loading branch information
@StanislavStefanov
StanislavStefanov authored Nov 22, 2023
1 parent 7993447 commit 6e053dd
Show file tree
Hide file tree
Showing 31 changed files with 1,839 additions and 1,198 deletions.
12 changes: 6 additions & 6 deletions chart/compass/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ global:
version: "v20231121-e91239f0"
name: compass-pairing-adapter
director:
dir: prod/incubator/
version: "v20231121-e91239f0"
dir: dev/incubator/
version: "PR-3475"
name: compass-director
hydrator:
dir: prod/incubator/
Expand Down Expand Up @@ -216,16 +216,16 @@ global:
dir:
version: "0a651695"
external_services_mock:
dir: prod/incubator/
version: "v20231121-e91239f0"
dir: dev/incubator/
version: "PR-3475"
name: compass-external-services-mock
console:
dir: prod/incubator/
version: "v20230421-e8840c18"
name: compass-console
e2e_tests:
dir: prod/incubator/
version: "v20231120-ff84f4d5"
dir: dev/incubator/
version: "PR-3475"
name: compass-e2e-tests
isLocalEnv: false
isForTesting: false
Expand Down
18 changes: 9 additions & 9 deletions components/director/internal/domain/formationassignment/automock/fa_notification_service.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions components/director/internal/domain/formationassignment/automock/status_service.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 20 additions & 14 deletions components/director/internal/domain/formationassignment/fixtures_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const (
TestFormationTemplateID = "jjc0bd01-2441-4ca1-9b5e-a54e74fd7773"
TestTenantID = "b4d1bd32-dd07-4141-9655-42bc33a4ae37"
TestSource = "05e10560-2259-4adf-bb3e-6aee0518f573"
TestSourceType = "application"
TestSourceType = "APPLICATION"
TestTarget = "1c22035a-72e4-4a78-9025-bbcb1f87760b"
TestTargetType = "runtimeContext"
TestStateInitial = "INITIAL"
Expand Down Expand Up @@ -348,6 +348,14 @@ func fixAssignmentMappingPairWithAssignment(assignment *model.FormationAssignmen
}

func fixAssignmentMappingPairWithAssignmentAndRequest(assignment *model.FormationAssignment, req *webhookclient.FormationAssignmentNotificationRequest) *formationassignment.AssignmentMappingPairWithOperation {
return fixAssignmentMappingPair(assignment, req, model.AssignFormation)
}

func fixAssignmentMappingPairWithUnassignOperation(assignment *model.FormationAssignment, req *webhookclient.FormationAssignmentNotificationRequest) *formationassignment.AssignmentMappingPairWithOperation {
return fixAssignmentMappingPair(assignment, req, model.UnassignFormation)
}

func fixAssignmentMappingPair(assignment *model.FormationAssignment, req *webhookclient.FormationAssignmentNotificationRequest, operation model.FormationOperation) *formationassignment.AssignmentMappingPairWithOperation {
return &formationassignment.AssignmentMappingPairWithOperation{
AssignmentMappingPair: &formationassignment.AssignmentMappingPair{
AssignmentReqMapping: &formationassignment.FormationAssignmentRequestMapping{
Expand All @@ -356,7 +364,7 @@ func fixAssignmentMappingPairWithAssignmentAndRequest(assignment *model.Formatio
},
ReverseAssignmentReqMapping: nil,
},
Operation: model.AssignFormation,
Operation: operation,
}
}

Expand Down Expand Up @@ -786,19 +794,17 @@ func fixNotificationRequestAndReverseRequest(objectID, object2ID string, partici
return []*webhookclient.FormationAssignmentNotificationRequest{request, requestReverse}, templateInput, templateInputReverse
}

func fixNotificationStatusReturnedDetails(resourceType model.ResourceType, resourceSubtype string, fa, reverseFa *model.FormationAssignment, location formationconstraint.JoinPointLocation, lastFormationAssignmentState, lastFormationAssignmentConfig, tenantID string, notificationStatusReport *statusreport.NotificationStatusReport) *formationconstraint.NotificationStatusReturnedOperationDetails {
func fixNotificationStatusReturnedDetails(resourceType model.ResourceType, resourceSubtype string, fa, reverseFa *model.FormationAssignment, location formationconstraint.JoinPointLocation, tenantID string, notificationStatusReport *statusreport.NotificationStatusReport) *formationconstraint.NotificationStatusReturnedOperationDetails {
return &formationconstraint.NotificationStatusReturnedOperationDetails{
ResourceType: resourceType,
ResourceSubtype: resourceSubtype,
Location: location,
Tenant: tenantID,
Operation: assignOperation,
FormationAssignment: fa,
ReverseFormationAssignment: reverseFa,
LastFormationAssignmentState: lastFormationAssignmentState,
LastFormationAssignmentConfiguration: lastFormationAssignmentConfig,
NotificationStatusReport: notificationStatusReport,
Formation: formation,
ResourceType: resourceType,
ResourceSubtype: resourceSubtype,
Location: location,
Tenant: tenantID,
Operation: assignOperation,
FormationAssignment: fa,
ReverseFormationAssignment: reverseFa,
NotificationStatusReport: notificationStatusReport,
Formation: formation,
}
}

Expand Down
22 changes: 10 additions & 12 deletions components/director/internal/domain/formationassignment/notifications.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (fan *formationAssignmentNotificationService) GenerateFormationAssignmentNo
}

// PrepareDetailsForNotificationStatusReturned creates NotificationStatusReturnedOperationDetails by given tenantID, formation assignment and formation operation
func (fan *formationAssignmentNotificationService) PrepareDetailsForNotificationStatusReturned(ctx context.Context, tenantID string, fa *model.FormationAssignment, operation model.FormationOperation, lastFormationAssignmentState, lastFormationAssignmentConfiguration string, notificationStatusReport *statusreport.NotificationStatusReport) (*formationconstraint.NotificationStatusReturnedOperationDetails, error) {
func (fan *formationAssignmentNotificationService) PrepareDetailsForNotificationStatusReturned(ctx context.Context, tenantID string, fa *model.FormationAssignment, operation model.FormationOperation, notificationStatusReport *statusreport.NotificationStatusReport) (*formationconstraint.NotificationStatusReturnedOperationDetails, error) {
var targetType model.ResourceType
switch fa.TargetType {
case model.FormationAssignmentTypeApplication:
Expand Down Expand Up @@ -138,17 +138,15 @@ func (fan *formationAssignmentNotificationService) PrepareDetailsForNotification
}

return &formationconstraint.NotificationStatusReturnedOperationDetails{
ResourceType: targetType,
ResourceSubtype: targetSubtype,
NotificationStatusReport: notificationStatusReport,
LastFormationAssignmentState: lastFormationAssignmentState,
LastFormationAssignmentConfiguration: lastFormationAssignmentConfiguration,
Tenant: tenantID,
FormationAssignmentTemplateInput: formationAssignmentTemplateInput,
Operation: operation,
FormationAssignment: fa,
ReverseFormationAssignment: reverseFa,
Formation: formation,
ResourceType: targetType,
ResourceSubtype: targetSubtype,
NotificationStatusReport: notificationStatusReport,
Tenant: tenantID,
FormationAssignmentTemplateInput: formationAssignmentTemplateInput,
Operation: operation,
FormationAssignment: fa,
ReverseFormationAssignment: reverseFa,
Formation: formation,
}, nil
}

Expand Down
13 changes: 5 additions & 8 deletions components/director/internal/domain/formationassignment/notifications_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,6 @@ var (
}
applicationTypeLabel = &model.Label{Value: appSubtype}
runtimeTypeLabel = &model.Label{Value: rtmSubtype}

lastFormationAssignmentState = configPendingState
lastFormationAssignmentConfiguration = "{}"
)

func Test_GenerateFormationAssignmentNotification(t *testing.T) {
Expand Down Expand Up @@ -1962,16 +1959,16 @@ func Test_PrepareDetailsForNotificationStatusReturned(t *testing.T) {

notificationStatusReport := fixNotificationStatusReport()

expectedDetailsForApp := fixNotificationStatusReturnedDetails(model.ApplicationResourceType, appSubtype, faWithTargetTypeApplication, reverseFaWithTargetTypeApplication, formationconstraint.JoinPointLocation{}, lastFormationAssignmentState, lastFormationAssignmentConfiguration, TestTenantID, notificationStatusReport)
expectedDetailsForApp := fixNotificationStatusReturnedDetails(model.ApplicationResourceType, appSubtype, faWithTargetTypeApplication, reverseFaWithTargetTypeApplication, formationconstraint.JoinPointLocation{}, TestTenantID, notificationStatusReport)
expectedDetailsForApp.FormationAssignmentTemplateInput = testAppNotificationReqWithTenantMappingType.Object

expectedDetailsForAppWithoutReverseAssignment := fixNotificationStatusReturnedDetails(model.ApplicationResourceType, appSubtype, faWithTargetTypeApplication, nil, formationconstraint.JoinPointLocation{}, lastFormationAssignmentState, lastFormationAssignmentConfiguration, TestTenantID, notificationStatusReport)
expectedDetailsForAppWithoutReverseAssignment := fixNotificationStatusReturnedDetails(model.ApplicationResourceType, appSubtype, faWithTargetTypeApplication, nil, formationconstraint.JoinPointLocation{}, TestTenantID, notificationStatusReport)
expectedDetailsForAppWithoutReverseAssignment.FormationAssignmentTemplateInput = testAppNotificationReqWithTenantMappingTypeWithoutReverseAssignment.Object

expectedDetailsForRuntime := fixNotificationStatusReturnedDetails(model.RuntimeResourceType, rtmSubtype, faWithTargetTypeRuntime, reverseFaWithTargetTypeRuntime, formationconstraint.JoinPointLocation{}, lastFormationAssignmentState, lastFormationAssignmentConfiguration, TestTenantID, notificationStatusReport)
expectedDetailsForRuntime := fixNotificationStatusReturnedDetails(model.RuntimeResourceType, rtmSubtype, faWithTargetTypeRuntime, reverseFaWithTargetTypeRuntime, formationconstraint.JoinPointLocation{}, TestTenantID, notificationStatusReport)
expectedDetailsForRuntime.FormationAssignmentTemplateInput = testRuntimeNotificationReqWithConfigurationChangedType.Object

expectedDetailsForRuntimeContext := fixNotificationStatusReturnedDetails(model.RuntimeContextResourceType, rtmSubtype, faWithTargetTypeRuntimeCtx, reverseFaWithTargetTypeRuntimeCtx, formationconstraint.JoinPointLocation{}, lastFormationAssignmentState, lastFormationAssignmentConfiguration, TestTenantID, notificationStatusReport)
expectedDetailsForRuntimeContext := fixNotificationStatusReturnedDetails(model.RuntimeContextResourceType, rtmSubtype, faWithTargetTypeRuntimeCtx, reverseFaWithTargetTypeRuntimeCtx, formationconstraint.JoinPointLocation{}, TestTenantID, notificationStatusReport)
expectedDetailsForRuntimeContext.FormationAssignmentTemplateInput = testRuntimeContextNotificationReqWithConfigurationChangedType.Object

details := &formationconstraint.GenerateFormationAssignmentNotificationOperationDetails{}
Expand Down Expand Up @@ -2319,7 +2316,7 @@ func Test_PrepareDetailsForNotificationStatusReturned(t *testing.T) {
faNotificationSvc := formationassignment.NewFormationAssignmentNotificationService(faRepo, nil, webhookRepo, tenantRepo, webhookDataInputBuilder, formationRepo, notificationBuilder, rtmCtxSvc, labelSvc, rtmTypeLabelKey, appTypeLabelKey)

// WHEN
notificationStatusReturnedDetails, err := faNotificationSvc.PrepareDetailsForNotificationStatusReturned(emptyCtx, TestTenantID, tCase.formationAssignment, model.AssignFormation, lastFormationAssignmentState, lastFormationAssignmentConfiguration, tCase.notificationStatusReport)
notificationStatusReturnedDetails, err := faNotificationSvc.PrepareDetailsForNotificationStatusReturned(emptyCtx, TestTenantID, tCase.formationAssignment, model.AssignFormation, tCase.notificationStatusReport)

// THEN
if tCase.expectedErrMsg != "" {
Expand Down
Loading

0 comments on commit 6e053dd

Please sign in to comment.