Skip to content

Fail on sync calls if specified #1634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IvanBorislavovDimitrov merged 1 commit into from
May 20, 2025
Merged

Fail on sync calls if specified #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions ...org/cloudfoundry/multiapps/controller/client/lib/domain/CloudServiceInstanceExtended.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,13 @@ public boolean shouldSkipSyslogUrlUpdate() {
return false;
}

@Value.Default
public boolean shouldFailOnParametersUpdateFailure() {
return false;
}
@Nullable
public abstract Boolean shouldFailOnParametersUpdateFailure();

@Value.Default
public boolean shouldFailOnPlanUpdateFailure() {
return false;
}
@Nullable
public abstract Boolean shouldFailOnPlanUpdateFailure();

@Value.Default
public boolean shouldFailOnTagsUpdateFailure() {
return false;
}
@Nullable
public abstract Boolean shouldFailOnTagsUpdateFailure();

}
12 changes: 6 additions & 6 deletions ...main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ServicesCloudModelBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,16 +201,16 @@ private boolean shouldSkipSyslogUrlUpdate() {
return shouldSkipUpdates.getOrDefault("syslog-drain-url", false);
}

private boolean failOnServiceParametersUpdateFailure() {
return failOnServiceUpdateFailure.getOrDefault("parameters", false);
private Boolean failOnServiceParametersUpdateFailure() {
return failOnServiceUpdateFailure.get("parameters");
}

private boolean failOnServiceTagsUpdateFailure() {
return failOnServiceUpdateFailure.getOrDefault("tags", false);
private Boolean failOnServiceTagsUpdateFailure() {
return failOnServiceUpdateFailure.get("tags");
}

private boolean failOnServicePlanUpdateFailure() {
return failOnServiceUpdateFailure.getOrDefault("plan", false);
private Boolean failOnServicePlanUpdateFailure() {
return failOnServiceUpdateFailure.get("plan");
}

}
Expand Down
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/devxdi/services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand All @@ -45,8 +42,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/devxdi/xs2-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand All @@ -45,8 +42,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
5 changes: 1 addition & 4 deletions multiapps-controller-core/src/test/resources/mta/devxwebide/services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
"shouldSkipParametersUpdate": false,
"shouldSkipTagsUpdate": false,
"shouldSkipPlanUpdate": false,
"shouldSkipSyslogUrlUpdate": false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate": false
}
]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/javahelloworld/services-ns-1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand Down Expand Up @@ -55,8 +52,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/javahelloworld/services-ns-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand Down Expand Up @@ -55,8 +52,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/javahelloworld/services-ns-3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand Down Expand Up @@ -55,8 +52,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/javahelloworld/services-patch-ns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand Down Expand Up @@ -55,8 +52,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/javahelloworld/services-patch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand All @@ -51,8 +48,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/javahelloworld/services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand All @@ -51,8 +48,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/javahelloworld/xs2-services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand Down Expand Up @@ -54,8 +51,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/sample/services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand All @@ -49,8 +46,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
10 changes: 2 additions & 8 deletions multiapps-controller-core/src/test/resources/mta/shine/services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
}, {
"isOptional" : false,
"isManaged" : true,
Expand All @@ -56,8 +53,5 @@
"shouldSkipParametersUpdate" : false,
"shouldSkipPlanUpdate" : false,
"shouldSkipTagsUpdate" : false,
"shouldSkipSyslogUrlUpdate" : false,
"shouldFailOnParametersUpdateFailure" : false,
"shouldFailOnPlanUpdateFailure" : false,
"shouldFailOnTagsUpdateFailure" : false
"shouldSkipSyslogUrlUpdate" : false
} ]
Loading