Skip to content

Commit 397cc5c

Browse files
csviricsviri
committed
revert renaming
1 parent 3ce7e78 commit 397cc5c

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ private R updateCustomResourceWithFinalizer(R resource) {
311311
log.debug(
312312
"Adding finalizer for resource: {} version: {}", getUID(resource), getVersion(resource));
313313
resource.addFinalizer(configuration().getFinalizerName());
314-
return customResourceFacade.updateResource(resource);
314+
return customResourceFacade.replaceResourceWithLock(resource);
315315
}
316316

317317
private Optional<R> updateCustomResource(R resource, R originalResource, boolean onlyOnChange) {
@@ -321,7 +321,7 @@ private Optional<R> updateCustomResource(R resource, R originalResource, boolean
321321

322322
log.debug("Updating resource: {} with version: {}", getUID(resource), getVersion(resource));
323323
log.trace("Resource before update: {}", resource);
324-
return Optional.of(customResourceFacade.updateResource(resource));
324+
return Optional.of(customResourceFacade.replaceResourceWithLock(resource));
325325
}
326326

327327
ControllerConfiguration<R> configuration() {
@@ -339,7 +339,7 @@ public R removeFinalizer(R resource, String finalizer) {
339339
if (!removed) {
340340
return resource;
341341
}
342-
return customResourceFacade.updateResource(resource);
342+
return customResourceFacade.replaceResourceWithLock(resource);
343343
} catch (KubernetesClientException e) {
344344
log.trace("Exception during finalizer removal for resource: {}", resource);
345345
retryIndex++;
@@ -392,7 +392,7 @@ public R getResource(String namespace, String name) {
392392
return resourceOperation.inNamespace(namespace).withName(name).get();
393393
}
394394

395-
public R updateResource(R resource) {
395+
public R replaceResourceWithLock(R resource) {
396396
log.debug(
397397
"Trying to replace resource {}, version: {}",
398398
getName(resource),

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void addFinalizerOnNewResource() {
130130
verify(reconciler, never())
131131
.reconcile(ArgumentMatchers.eq(testCustomResource), any());
132132
verify(customResourceFacade, times(1))
133-
.updateResource(
133+
.replaceResourceWithLock(
134134
argThat(testCustomResource -> testCustomResource.hasFinalizer(DEFAULT_FINALIZER)));
135135
assertThat(testCustomResource.hasFinalizer(DEFAULT_FINALIZER)).isTrue();
136136
}
@@ -152,20 +152,20 @@ void updatesOnlyStatusSubResourceIfFinalizerSet() {
152152
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
153153

154154
verify(customResourceFacade, times(1)).patchStatus(eq(testCustomResource), any());
155-
verify(customResourceFacade, never()).updateResource(any());
155+
verify(customResourceFacade, never()).replaceResourceWithLock(any());
156156
}
157157

158158
@Test
159159
void updatesBothResourceAndStatusIfFinalizerSet() {
160160
testCustomResource.addFinalizer(DEFAULT_FINALIZER);
161161

162162
reconciler.reconcile = (r, c) -> UpdateControl.updateResourceAndStatus(testCustomResource);
163-
when(customResourceFacade.updateResource(testCustomResource))
163+
when(customResourceFacade.replaceResourceWithLock(testCustomResource))
164164
.thenReturn(testCustomResource);
165165

166166
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
167167

168-
verify(customResourceFacade, times(1)).updateResource(testCustomResource);
168+
verify(customResourceFacade, times(1)).replaceResourceWithLock(testCustomResource);
169169
verify(customResourceFacade, times(1)).updateStatus(testCustomResource);
170170
}
171171

@@ -179,7 +179,7 @@ void patchesStatus() {
179179

180180
verify(customResourceFacade, times(1)).patchStatus(eq(testCustomResource), any());
181181
verify(customResourceFacade, never()).updateStatus(any());
182-
verify(customResourceFacade, never()).updateResource(any());
182+
verify(customResourceFacade, never()).replaceResourceWithLock(any());
183183
}
184184

185185
@Test
@@ -211,7 +211,7 @@ void removesDefaultFinalizerOnDeleteIfSet() {
211211
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
212212

213213
assertThat(postExecControl.isFinalizerRemoved()).isTrue();
214-
verify(customResourceFacade, times(1)).updateResource(testCustomResource);
214+
verify(customResourceFacade, times(1)).replaceResourceWithLock(testCustomResource);
215215
}
216216

217217
@Test
@@ -220,7 +220,7 @@ void retriesFinalizerRemovalWithFreshResource() {
220220
markForDeletion(testCustomResource);
221221
var resourceWithFinalizer = TestUtils.testCustomResource();
222222
resourceWithFinalizer.addFinalizer(DEFAULT_FINALIZER);
223-
when(customResourceFacade.updateResource(testCustomResource))
223+
when(customResourceFacade.replaceResourceWithLock(testCustomResource))
224224
.thenThrow(new KubernetesClientException(null, 409, null))
225225
.thenReturn(testCustomResource);
226226
when(customResourceFacade.getResource(any(), any())).thenReturn(resourceWithFinalizer);
@@ -229,15 +229,15 @@ void retriesFinalizerRemovalWithFreshResource() {
229229
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
230230

231231
assertThat(postExecControl.isFinalizerRemoved()).isTrue();
232-
verify(customResourceFacade, times(2)).updateResource(any());
232+
verify(customResourceFacade, times(2)).replaceResourceWithLock(any());
233233
verify(customResourceFacade, times(1)).getResource(any(), any());
234234
}
235235

236236
@Test
237237
void throwsExceptionIfFinalizerRemovalRetryExceeded() {
238238
testCustomResource.addFinalizer(DEFAULT_FINALIZER);
239239
markForDeletion(testCustomResource);
240-
when(customResourceFacade.updateResource(any()))
240+
when(customResourceFacade.replaceResourceWithLock(any()))
241241
.thenThrow(new KubernetesClientException(null, 409, null));
242242
when(customResourceFacade.getResource(any(), any()))
243243
.thenAnswer((Answer<TestCustomResource>) invocationOnMock -> createResourceWithFinalizer());
@@ -249,7 +249,7 @@ void throwsExceptionIfFinalizerRemovalRetryExceeded() {
249249
assertThat(postExecControl.getRuntimeException()).isPresent();
250250
assertThat(postExecControl.getRuntimeException().get())
251251
.isInstanceOf(OperatorException.class);
252-
verify(customResourceFacade, times(MAX_FINALIZER_REMOVAL_RETRY)).updateResource(any());
252+
verify(customResourceFacade, times(MAX_FINALIZER_REMOVAL_RETRY)).replaceResourceWithLock(any());
253253
verify(customResourceFacade, times(MAX_FINALIZER_REMOVAL_RETRY - 1)).getResource(any(),
254254
any());
255255
}
@@ -258,15 +258,15 @@ void throwsExceptionIfFinalizerRemovalRetryExceeded() {
258258
void throwsExceptionIfFinalizerRemovalClientExceptionIsNotConflict() {
259259
testCustomResource.addFinalizer(DEFAULT_FINALIZER);
260260
markForDeletion(testCustomResource);
261-
when(customResourceFacade.updateResource(any()))
261+
when(customResourceFacade.replaceResourceWithLock(any()))
262262
.thenThrow(new KubernetesClientException(null, 400, null));
263263

264264
var res =
265265
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
266266

267267
assertThat(res.getRuntimeException()).isPresent();
268268
assertThat(res.getRuntimeException().get()).isInstanceOf(KubernetesClientException.class);
269-
verify(customResourceFacade, times(1)).updateResource(any());
269+
verify(customResourceFacade, times(1)).replaceResourceWithLock(any());
270270
verify(customResourceFacade, never()).getResource(any(), any());
271271
}
272272

@@ -312,7 +312,7 @@ void doesNotRemovesTheSetFinalizerIfTheDeleteNotMethodInstructsIt() {
312312
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
313313

314314
assertEquals(1, testCustomResource.getMetadata().getFinalizers().size());
315-
verify(customResourceFacade, never()).updateResource(any());
315+
verify(customResourceFacade, never()).replaceResourceWithLock(any());
316316
}
317317

318318
@Test
@@ -322,21 +322,21 @@ void doesNotUpdateTheResourceIfNoUpdateUpdateControlIfFinalizerSet() {
322322
reconciler.reconcile = (r, c) -> UpdateControl.noUpdate();
323323

324324
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
325-
verify(customResourceFacade, never()).updateResource(any());
325+
verify(customResourceFacade, never()).replaceResourceWithLock(any());
326326
verify(customResourceFacade, never()).updateStatus(testCustomResource);
327327
}
328328

329329
@Test
330330
void addsFinalizerIfNotMarkedForDeletionAndEmptyCustomResourceReturned() {
331331
removeFinalizers(testCustomResource);
332332
reconciler.reconcile = (r, c) -> UpdateControl.noUpdate();
333-
when(customResourceFacade.updateResource(any())).thenReturn(testCustomResource);
333+
when(customResourceFacade.replaceResourceWithLock(any())).thenReturn(testCustomResource);
334334

335335
var postExecControl =
336336
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
337337

338338
assertEquals(1, testCustomResource.getMetadata().getFinalizers().size());
339-
verify(customResourceFacade, times(1)).updateResource(any());
339+
verify(customResourceFacade, times(1)).replaceResourceWithLock(any());
340340
assertThat(postExecControl.updateIsStatusPatch()).isFalse();
341341
assertThat(postExecControl.getUpdatedCustomResource()).isPresent();
342342
}
@@ -348,7 +348,7 @@ void doesNotCallDeleteIfMarkedForDeletionButNotOurFinalizer() {
348348

349349
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
350350

351-
verify(customResourceFacade, never()).updateResource(any());
351+
verify(customResourceFacade, never()).replaceResourceWithLock(any());
352352
verify(reconciler, never()).cleanup(eq(testCustomResource), any());
353353
}
354354

@@ -474,7 +474,7 @@ void updateObservedGenerationOnCustomResourceUpdate() throws Exception {
474474
when(config.isGenerationAware()).thenReturn(true);
475475
when(reconciler.reconcile(any(), any()))
476476
.thenReturn(UpdateControl.updateResource(observedGenResource));
477-
when(facade.updateResource(any())).thenReturn(observedGenResource);
477+
when(facade.replaceResourceWithLock(any())).thenReturn(observedGenResource);
478478
when(facade.updateStatus(observedGenResource)).thenReturn(observedGenResource);
479479
var dispatcher = init(observedGenResource, reconciler, config, facade, true);
480480

@@ -640,7 +640,7 @@ void noRequestOnConditionalUpdates() {
640640
@Test
641641
void conditionalUpdateSpecChangedNoStatus() {
642642
testCustomResource.addFinalizer(DEFAULT_FINALIZER);
643-
when(customResourceFacade.updateResource(any())).thenAnswer(a -> a.getArguments()[0]);
643+
when(customResourceFacade.replaceResourceWithLock(any())).thenAnswer(a -> a.getArguments()[0]);
644644

645645
reconciler.reconcile = (r, c) -> {
646646
// in this test the cloning is turned off for easier verification, but required here
@@ -652,7 +652,7 @@ void conditionalUpdateSpecChangedNoStatus() {
652652
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
653653

654654
verify(customResourceFacade, never()).patchStatus(any(), any());
655-
verify(customResourceFacade, times(1)).updateResource(any());
655+
verify(customResourceFacade, times(1)).replaceResourceWithLock(any());
656656
}
657657

658658
private void checkConditionalUpdate(
@@ -664,7 +664,7 @@ private void checkConditionalUpdate(
664664
reconciliationDispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
665665

666666
verify(customResourceFacade, never()).patchStatus(any(), any());
667-
verify(customResourceFacade, never()).updateResource(any());
667+
verify(customResourceFacade, never()).replaceResourceWithLock(any());
668668
verify(customResourceFacade, never()).updateStatus(any());
669669
}
670670

0 commit comments

Comments
 (0)