Cruise Control mock refactoring #10056
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scholzj
requested changes
May 5, 2024
...t/java/io/strimzi/operator/cluster/operator/assembly/KafkaRebalanceAssemblyOperatorTest.java
Outdated
Show resolved
Hide resolved
operator-common/src/main/java/io/strimzi/operator/common/Util.java
Outdated
Show resolved
Hide resolved
operator-common/src/main/java/io/strimzi/operator/common/Util.java
Outdated
Show resolved
Hide resolved
operator-common/src/main/java/io/strimzi/operator/common/Util.java
Outdated
Show resolved
Hide resolved
...va/io/strimzi/operator/common/operator/resource/cruisecontrol/AbstractMockCruiseControl.java
Outdated
Show resolved
Hide resolved
fvaleri
changed the title
This is part of the refactoring mentioned in the RF change proposal. Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
ppatierno
reviewed
May 6, 2024
...ava/io/strimzi/operator/cluster/operator/resource/cruisecontrol/CruiseControlClientTest.java
Show resolved
Hide resolved
scholzj
reviewed
May 6, 2024
| @@ -114,16 +121,26 @@ public static void beforeAll() { | |||
|
|
|||
| vertx = Vertx.vertx(); | |||
| sharedWorkerExecutor = vertx.createSharedWorkerExecutor("kubernetes-ops-pool"); | |||
|
|
|||
| // Configure Cruise Control mock | |||
| serverPort = CruiseControl.REST_API_PORT; | |||
There was a problem hiding this comment.
As you are changing this, would it make sense to change it everywhere the same way or not at all?
- Here you create a static variable but assign it a fixed value
- In
KafkaRebalanceStateMachineTestyou keep usingCruiseControl.REST_API_PORTdirectly - In
CruiseControlClientTestyou seem to change it to using static variable andTestUtils.getFreePort()=> this seems to me like the best variant
If you are alread changing it, it seems like it might make sense to change it the same way everywhere.
There was a problem hiding this comment.
The problem with those tests is that they don't use the CC client directly, but through KafkaRebalanceAssemblyOperator where CC port is hard coded to CruiseControl.REST_API_PORT. I didn't changed it to keep the PR focused on tests, but I can do it if you prefer.
...t/java/io/strimzi/operator/cluster/operator/assembly/KafkaRebalanceAssemblyOperatorTest.java
Outdated
Show resolved
Hide resolved
topic-operator/src/test/java/io/strimzi/operator/topic/TopicOperatorTestUtil.java
Outdated
Show resolved
Hide resolved
|
/azp run regression |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
scholzj
approved these changes
May 7, 2024
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
|
@scholzj I added one more small commit to share the basic auth value method, which was in the first commit, but not complete. Sorry. |
scholzj
requested changes
May 7, 2024
operator-common/src/main/java/io/strimzi/operator/common/Util.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Federico Valeri <fedevaleri@gmail.com>
scholzj
approved these changes
May 7, 2024
|
/azp run regression |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is part of the refactoring mentioned in the RF change proposal. Next PRs: share CC client logic, replacing Vertx with Java HTTP client.