Skip to content

Commit c2df062

Browse files
IvanBorislavovDimitrovIvanBorislavovDimitrov
committed
Fail on sync calls if specified
LMCROSSITXSADEPLOY-3200
1 parent ad8971a commit c2df062

File tree

22 files changed

+185
-189
lines changed

22 files changed

+185
-189
lines changed

‎multiapps-controller-client/src/main/java/org/cloudfoundry/multiapps/controller/client/lib/domain/CloudServiceInstanceExtended.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,13 @@ public boolean shouldSkipSyslogUrlUpdate() {
4444
return false;
4545
}
4646

47-
@Value.Default
48-
public boolean shouldFailOnParametersUpdateFailure() {
49-
return false;
50-
}
47+
@Nullable
48+
public abstract Boolean shouldFailOnParametersUpdateFailure();
5149

52-
@Value.Default
53-
public boolean shouldFailOnPlanUpdateFailure() {
54-
return false;
55-
}
50+
@Nullable
51+
public abstract Boolean shouldFailOnPlanUpdateFailure();
5652

57-
@Value.Default
58-
public boolean shouldFailOnTagsUpdateFailure() {
59-
return false;
60-
}
53+
@Nullable
54+
public abstract Boolean shouldFailOnTagsUpdateFailure();
6155

6256
}

‎multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/v2/ServicesCloudModelBuilder.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,16 +201,16 @@ private boolean shouldSkipSyslogUrlUpdate() {
201201
return shouldSkipUpdates.getOrDefault("syslog-drain-url", false);
202202
}
203203

204-
private boolean failOnServiceParametersUpdateFailure() {
205-
return failOnServiceUpdateFailure.getOrDefault("parameters", false);
204+
private Boolean failOnServiceParametersUpdateFailure() {
205+
return failOnServiceUpdateFailure.get("parameters");
206206
}
207207

208-
private boolean failOnServiceTagsUpdateFailure() {
209-
return failOnServiceUpdateFailure.getOrDefault("tags", false);
208+
private Boolean failOnServiceTagsUpdateFailure() {
209+
return failOnServiceUpdateFailure.get("tags");
210210
}
211211

212-
private boolean failOnServicePlanUpdateFailure() {
213-
return failOnServiceUpdateFailure.getOrDefault("plan", false);
212+
private Boolean failOnServicePlanUpdateFailure() {
213+
return failOnServiceUpdateFailure.get("plan");
214214
}
215215

216216
}

‎multiapps-controller-core/src/test/resources/mta/devxdi/services.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
"shouldSkipParametersUpdate" : false,
1919
"shouldSkipPlanUpdate" : false,
2020
"shouldSkipTagsUpdate" : false,
21-
"shouldSkipSyslogUrlUpdate" : false,
22-
"shouldFailOnParametersUpdateFailure" : false,
23-
"shouldFailOnPlanUpdateFailure" : false,
24-
"shouldFailOnTagsUpdateFailure" : false
21+
"shouldSkipSyslogUrlUpdate" : false
2522
}, {
2623
"isOptional" : false,
2724
"isManaged" : true,
@@ -45,8 +42,5 @@
4542
"shouldSkipParametersUpdate" : false,
4643
"shouldSkipPlanUpdate" : false,
4744
"shouldSkipTagsUpdate" : false,
48-
"shouldSkipSyslogUrlUpdate" : false,
49-
"shouldFailOnParametersUpdateFailure" : false,
50-
"shouldFailOnPlanUpdateFailure" : false,
51-
"shouldFailOnTagsUpdateFailure" : false
45+
"shouldSkipSyslogUrlUpdate" : false
5246
} ]

‎multiapps-controller-core/src/test/resources/mta/devxdi/xs2-services.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
"shouldSkipParametersUpdate" : false,
1919
"shouldSkipPlanUpdate" : false,
2020
"shouldSkipTagsUpdate" : false,
21-
"shouldSkipSyslogUrlUpdate" : false,
22-
"shouldFailOnParametersUpdateFailure" : false,
23-
"shouldFailOnPlanUpdateFailure" : false,
24-
"shouldFailOnTagsUpdateFailure" : false
21+
"shouldSkipSyslogUrlUpdate" : false
2522
}, {
2623
"isOptional" : false,
2724
"isManaged" : true,
@@ -45,8 +42,5 @@
4542
"shouldSkipParametersUpdate" : false,
4643
"shouldSkipPlanUpdate" : false,
4744
"shouldSkipTagsUpdate" : false,
48-
"shouldSkipSyslogUrlUpdate" : false,
49-
"shouldFailOnParametersUpdateFailure" : false,
50-
"shouldFailOnPlanUpdateFailure" : false,
51-
"shouldFailOnTagsUpdateFailure" : false
45+
"shouldSkipSyslogUrlUpdate" : false
5246
} ]

‎multiapps-controller-core/src/test/resources/mta/devxwebide/services.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
"shouldSkipParametersUpdate": false,
2020
"shouldSkipTagsUpdate": false,
2121
"shouldSkipPlanUpdate": false,
22-
"shouldSkipSyslogUrlUpdate": false,
23-
"shouldFailOnParametersUpdateFailure" : false,
24-
"shouldFailOnPlanUpdateFailure" : false,
25-
"shouldFailOnTagsUpdateFailure" : false
22+
"shouldSkipSyslogUrlUpdate": false
2623
}
2724
]

‎multiapps-controller-core/src/test/resources/mta/javahelloworld/services-ns-1.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
"shouldSkipParametersUpdate" : false,
2424
"shouldSkipPlanUpdate" : false,
2525
"shouldSkipTagsUpdate" : false,
26-
"shouldSkipSyslogUrlUpdate" : false,
27-
"shouldFailOnParametersUpdateFailure" : false,
28-
"shouldFailOnPlanUpdateFailure" : false,
29-
"shouldFailOnTagsUpdateFailure" : false
26+
"shouldSkipSyslogUrlUpdate" : false
3027
}, {
3128
"isOptional" : false,
3229
"isManaged" : true,
@@ -55,8 +52,5 @@
5552
"shouldSkipParametersUpdate" : false,
5653
"shouldSkipPlanUpdate" : false,
5754
"shouldSkipTagsUpdate" : false,
58-
"shouldSkipSyslogUrlUpdate" : false,
59-
"shouldFailOnParametersUpdateFailure" : false,
60-
"shouldFailOnPlanUpdateFailure" : false,
61-
"shouldFailOnTagsUpdateFailure" : false
55+
"shouldSkipSyslogUrlUpdate" : false
6256
} ]

‎multiapps-controller-core/src/test/resources/mta/javahelloworld/services-ns-2.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
"shouldSkipParametersUpdate" : false,
2424
"shouldSkipPlanUpdate" : false,
2525
"shouldSkipTagsUpdate" : false,
26-
"shouldSkipSyslogUrlUpdate" : false,
27-
"shouldFailOnParametersUpdateFailure" : false,
28-
"shouldFailOnPlanUpdateFailure" : false,
29-
"shouldFailOnTagsUpdateFailure" : false
26+
"shouldSkipSyslogUrlUpdate" : false
3027
}, {
3128
"isOptional" : false,
3229
"isManaged" : true,
@@ -55,8 +52,5 @@
5552
"shouldSkipParametersUpdate" : false,
5653
"shouldSkipPlanUpdate" : false,
5754
"shouldSkipTagsUpdate" : false,
58-
"shouldSkipSyslogUrlUpdate" : false,
59-
"shouldFailOnParametersUpdateFailure" : false,
60-
"shouldFailOnPlanUpdateFailure" : false,
61-
"shouldFailOnTagsUpdateFailure" : false
55+
"shouldSkipSyslogUrlUpdate" : false
6256
} ]

‎multiapps-controller-core/src/test/resources/mta/javahelloworld/services-ns-3.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
"shouldSkipParametersUpdate" : false,
2424
"shouldSkipPlanUpdate" : false,
2525
"shouldSkipTagsUpdate" : false,
26-
"shouldSkipSyslogUrlUpdate" : false,
27-
"shouldFailOnParametersUpdateFailure" : false,
28-
"shouldFailOnPlanUpdateFailure" : false,
29-
"shouldFailOnTagsUpdateFailure" : false
26+
"shouldSkipSyslogUrlUpdate" : false
3027
}, {
3128
"isOptional" : false,
3229
"isManaged" : true,
@@ -55,8 +52,5 @@
5552
"shouldSkipParametersUpdate" : false,
5653
"shouldSkipPlanUpdate" : false,
5754
"shouldSkipTagsUpdate" : false,
58-
"shouldSkipSyslogUrlUpdate" : false,
59-
"shouldFailOnParametersUpdateFailure" : false,
60-
"shouldFailOnPlanUpdateFailure" : false,
61-
"shouldFailOnTagsUpdateFailure" : false
55+
"shouldSkipSyslogUrlUpdate" : false
6256
} ]

‎multiapps-controller-core/src/test/resources/mta/javahelloworld/services-patch-ns.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
"shouldSkipParametersUpdate" : false,
2424
"shouldSkipPlanUpdate" : false,
2525
"shouldSkipTagsUpdate" : false,
26-
"shouldSkipSyslogUrlUpdate" : false,
27-
"shouldFailOnParametersUpdateFailure" : false,
28-
"shouldFailOnPlanUpdateFailure" : false,
29-
"shouldFailOnTagsUpdateFailure" : false
26+
"shouldSkipSyslogUrlUpdate" : false
3027
}, {
3128
"isOptional" : false,
3229
"isManaged" : true,
@@ -55,8 +52,5 @@
5552
"shouldSkipParametersUpdate" : false,
5653
"shouldSkipPlanUpdate" : false,
5754
"shouldSkipTagsUpdate" : false,
58-
"shouldSkipSyslogUrlUpdate" : false,
59-
"shouldFailOnParametersUpdateFailure" : false,
60-
"shouldFailOnPlanUpdateFailure" : false,
61-
"shouldFailOnTagsUpdateFailure" : false
55+
"shouldSkipSyslogUrlUpdate" : false
6256
} ]

‎multiapps-controller-core/src/test/resources/mta/javahelloworld/services-patch.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
"shouldSkipParametersUpdate" : false,
2222
"shouldSkipPlanUpdate" : false,
2323
"shouldSkipTagsUpdate" : false,
24-
"shouldSkipSyslogUrlUpdate" : false,
25-
"shouldFailOnParametersUpdateFailure" : false,
26-
"shouldFailOnPlanUpdateFailure" : false,
27-
"shouldFailOnTagsUpdateFailure" : false
24+
"shouldSkipSyslogUrlUpdate" : false
2825
}, {
2926
"isOptional" : false,
3027
"isManaged" : true,
@@ -51,8 +48,5 @@
5148
"shouldSkipParametersUpdate" : false,
5249
"shouldSkipPlanUpdate" : false,
5350
"shouldSkipTagsUpdate" : false,
54-
"shouldSkipSyslogUrlUpdate" : false,
55-
"shouldFailOnParametersUpdateFailure" : false,
56-
"shouldFailOnPlanUpdateFailure" : false,
57-
"shouldFailOnTagsUpdateFailure" : false
51+
"shouldSkipSyslogUrlUpdate" : false
5852
} ]

‎multiapps-controller-core/src/test/resources/mta/javahelloworld/services.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
"shouldSkipParametersUpdate" : false,
2222
"shouldSkipPlanUpdate" : false,
2323
"shouldSkipTagsUpdate" : false,
24-
"shouldSkipSyslogUrlUpdate" : false,
25-
"shouldFailOnParametersUpdateFailure" : false,
26-
"shouldFailOnPlanUpdateFailure" : false,
27-
"shouldFailOnTagsUpdateFailure" : false
24+
"shouldSkipSyslogUrlUpdate" : false
2825
}, {
2926
"isOptional" : false,
3027
"isManaged" : true,
@@ -51,8 +48,5 @@
5148
"shouldSkipParametersUpdate" : false,
5249
"shouldSkipPlanUpdate" : false,
5350
"shouldSkipTagsUpdate" : false,
54-
"shouldSkipSyslogUrlUpdate" : false,
55-
"shouldFailOnParametersUpdateFailure" : false,
56-
"shouldFailOnPlanUpdateFailure" : false,
57-
"shouldFailOnTagsUpdateFailure" : false
51+
"shouldSkipSyslogUrlUpdate" : false
5852
} ]

‎multiapps-controller-core/src/test/resources/mta/javahelloworld/xs2-services.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
"shouldSkipParametersUpdate" : false,
2222
"shouldSkipPlanUpdate" : false,
2323
"shouldSkipTagsUpdate" : false,
24-
"shouldSkipSyslogUrlUpdate" : false,
25-
"shouldFailOnParametersUpdateFailure" : false,
26-
"shouldFailOnPlanUpdateFailure" : false,
27-
"shouldFailOnTagsUpdateFailure" : false
24+
"shouldSkipSyslogUrlUpdate" : false
2825
}, {
2926
"isOptional" : false,
3027
"isManaged" : true,
@@ -54,8 +51,5 @@
5451
"shouldSkipParametersUpdate" : false,
5552
"shouldSkipPlanUpdate" : false,
5653
"shouldSkipTagsUpdate" : false,
57-
"shouldSkipSyslogUrlUpdate" : false,
58-
"shouldFailOnParametersUpdateFailure" : false,
59-
"shouldFailOnPlanUpdateFailure" : false,
60-
"shouldFailOnTagsUpdateFailure" : false
54+
"shouldSkipSyslogUrlUpdate" : false
6155
} ]

‎multiapps-controller-core/src/test/resources/mta/sample/services.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
"shouldSkipParametersUpdate" : false,
2222
"shouldSkipPlanUpdate" : false,
2323
"shouldSkipTagsUpdate" : false,
24-
"shouldSkipSyslogUrlUpdate" : false,
25-
"shouldFailOnParametersUpdateFailure" : false,
26-
"shouldFailOnPlanUpdateFailure" : false,
27-
"shouldFailOnTagsUpdateFailure" : false
24+
"shouldSkipSyslogUrlUpdate" : false
2825
}, {
2926
"isOptional" : false,
3027
"isManaged" : true,
@@ -49,8 +46,5 @@
4946
"shouldSkipParametersUpdate" : false,
5047
"shouldSkipPlanUpdate" : false,
5148
"shouldSkipTagsUpdate" : false,
52-
"shouldSkipSyslogUrlUpdate" : false,
53-
"shouldFailOnParametersUpdateFailure" : false,
54-
"shouldFailOnPlanUpdateFailure" : false,
55-
"shouldFailOnTagsUpdateFailure" : false
49+
"shouldSkipSyslogUrlUpdate" : false
5650
} ]

‎multiapps-controller-core/src/test/resources/mta/shine/services.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@
2626
"shouldSkipParametersUpdate" : false,
2727
"shouldSkipPlanUpdate" : false,
2828
"shouldSkipTagsUpdate" : false,
29-
"shouldSkipSyslogUrlUpdate" : false,
30-
"shouldFailOnParametersUpdateFailure" : false,
31-
"shouldFailOnPlanUpdateFailure" : false,
32-
"shouldFailOnTagsUpdateFailure" : false
29+
"shouldSkipSyslogUrlUpdate" : false
3330
}, {
3431
"isOptional" : false,
3532
"isManaged" : true,
@@ -56,8 +53,5 @@
5653
"shouldSkipParametersUpdate" : false,
5754
"shouldSkipPlanUpdate" : false,
5855
"shouldSkipTagsUpdate" : false,
59-
"shouldSkipSyslogUrlUpdate" : false,
60-
"shouldFailOnParametersUpdateFailure" : false,
61-
"shouldFailOnPlanUpdateFailure" : false,
62-
"shouldFailOnTagsUpdateFailure" : false
56+
"shouldSkipSyslogUrlUpdate" : false
6357
} ]

0 commit comments

Comments
 (0)