Skip to content

Conversation

cmaune
Copy link

@cmaune cmaune commented Mar 26, 2025

@ryanjbaxter
Copy link
Contributor

We should add a test to cover this

@ryanjbaxter
Copy link
Contributor

ryanjbaxter commented Mar 26, 2025

Also could you make the PR against the 3.1.x branch? I will merge it forward

@wind57
Copy link
Contributor

wind57 commented Mar 27, 2025

As a matter of fact, the pipeline fails in a unit test :) so just fix that one, and we should be good to go.

I was thinking to change the unit test also, just a tiny bit:

	@Test
	void multipleLabelsLabel() {
		Map<String, String> labels = new LinkedHashMap<>();
		labels.put("a", "b");
		labels.put("c", "d");
		String result = KubernetesCatalogWatchContext.labelSelector(labels);
		Assertions.assertEquals("a=b,c=d", result);
	}

@cmaune cmaune changed the base branch from main to 3.1.x March 27, 2025 09:05
@wind57
Copy link
Contributor

wind57 commented Mar 27, 2025

you will have to create the PR from scratch against branch 3.1.x, because otherwise you will bring lots of un-related changes

@cmaune
Copy link
Author

cmaune commented Mar 27, 2025

@wind57 thx, hopefully this should be fine now.
@ryanjbaxter recreated to point against 3.1.x

And sorry for the inconvenience, i had not cloned the project and did the initial PR just via edit from github ui, so i havnt seen the test.

@wind57
Copy link
Contributor

wind57 commented Mar 27, 2025

no worries at all! thank you for the excellent explanation in the bug description and the investigation! I dont have the right to approve the build, but my guess is that Ryan will, in a few hours.

@ryanjbaxter
Copy link
Contributor

@cmaune
Copy link
Author

cmaune commented Mar 27, 2025

Updated the fix for the failed tests in last run, if there are still some more, ill come back later on when i got spare time and have setup the project locally to build and run all tests locally

Signed-off-by: cmaune <you@example.com>
@ryanjbaxter ryanjbaxter merged commit fef9e61 into spring-cloud:3.1.x Mar 27, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Wrong delimiter '&' in "labelSelector" of KubernetesCatalogWatchContext (spring-cloud-kubernetes-client-discovery)
4 participants