Skip to content
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

Jump to bottom

Enable IdentityServicesPropertySourceFactory to Map More Than Two XSUAA Service Instances [3.x] #1343

Merged
merged 15 commits into from
Dec 12, 2023
Merged

Enable IdentityServicesPropertySourceFactory to Map More Than Two XSUAA Service Instances [3.x] #1343

merged 15 commits into from
Dec 12, 2023

Conversation

clnative
Copy link
Member

@clnative clnative commented Nov 7, 2023

Double maintenance of #1334 into main (3.x) branch

clnative and others added 7 commits November 3, 2023 16:59
@clnative
Base-Double Maintenance of SAP#1334
c0956ff
@clnative
Improve resource name after refactoring
47a91b1
@finkmanAtSap @clnative
Refactor IdentityServicesPropertySourceFactory#mapXsuaaProperties
f10718c 
Conflicts:
	spring-security/src/main/java/com/sap/cloud/security/spring/config/IdentityServicesPropertySourceFactory.java
@finkmanAtSap @clnative
For backward compatibility, adjust
a3fa622 
HybridIdentityServicesAutoConfiguration#hybridJwtDecoderMultiXsuaaServices
to only use the primary APPLICATION plan configuration and an optional
BROKER plan configuration like before

Conflicts:
	spring-security/src/main/java/com/sap/cloud/security/spring/autoconfig/HybridIdentityServicesAutoConfiguration.java
@finkmanAtSap @clnative
Small renaming of variable
7b1e3bd
@finkmanAtSap @clnative
Bugfix out of bounds exception
c9ef1a7 
Conflicts:
	spring-security/src/main/java/com/sap/cloud/security/spring/autoconfig/HybridIdentityServicesAutoConfiguration.java
@finkmanAtSap @clnative
fix casing in equals check
a726d00 
Conflicts:
	spring-security/src/main/java/com/sap/cloud/security/spring/autoconfig/HybridIdentityServicesAutoConfiguration.java
@clnative
Copy link
Member Author

clnative commented Nov 7, 2023 

3:17:05.714 [main] DEBUG org.apache.http.impl.conn.PoolingHttpClientConnectionManager -- Connection released: [id: 2][route: {s}->https://www.sap.com:443][total/ available: 0; route allocated: 0 of 20; total allocated: 0 of 200]
Error:  Tests run: 6, Failures: 1, Errors: 0, Skipped: 1, Time elapsed: 3.103 s <<< FAILURE! -- in com.sap.cloud.security.client.DefaultHttpClientFactoryTest
Error:  com.sap.cloud.security.client.DefaultHttpClientFactoryTest.closeHttpClient -- Time elapsed: 0.277 s <<< FAILURE!
org.opentest4j.AssertionFailedError: expected: <200> but was: <403>

Looks familiar from #1334 - perhaps some double maintenance missing here as well...
@finkmanAtSap May I trigger you on this aspect here?

@clnative clnative marked this pull request as ready for review November 7, 2023 14:34
@finkmanAtSap finkmanAtSap merged commit d27e885 into SAP:main Dec 12, 2023
5 checks passed
@clnative clnative deleted the main-3.x-multiInstanceIdentityServicesPropertySourceFactory branch December 19, 2023 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@finkmanAtSap finkmanAtSap finkmanAtSap approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@clnative @finkmanAtSap @liga-oz