Use REMOTE_CLUSTER_PROFILE for linked project connections when CPS is enabled #135964
Conversation
… enabled Currently the presence of credentials for a linked project alias determines if the RCS2.0 REMOTE_CLUSTER_PROFILE is used for the transport profile. For CPS we want to use the REMOTE_CLUSTER_PROFILE, but will not be using the credentials manager. This PR adds a check to see if CPS is enabled and if so the REMOTE_CLUSTER_PROFILE is used when constructing RemoteClusterConnection instances. Resolves: ES-13109
JeremyDahlgren
added
>non-issue
:Distributed Coordination/Network
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
elasticsearchmachine
added
the
serverless-linked
| RemoteClusterCredentialsManager credentialsManager, | ||
| boolean hasCredentials, |
There was a problem hiding this comment.
It feels a bit awkward to me that hasCredentials is essentially redundant. I'd personally prefer passing crossProjectEnabled instead and still resolve the transport profile here. Both low and high level profiles are connection specific concepts. It feels natural to me that they are decided inside the connection? Also, I wonder whether we might need crossProjectEnabled in future for other things in this class, e.g. returning it somehow in getConnectionInfo?
There was a problem hiding this comment.
Understood. I refactored to pass crossProjectEnabled.
server/src/main/java/org/elasticsearch/transport/RemoteClusterConnection.java
Outdated
Show resolved
Hide resolved
|
Note: The serverless checks are now failing which seem related. You may need to adjust some of the integration tests (probably mute for now). |
Currently the presence of credentials for a linked project alias determines if the RCS2.0
REMOTE_CLUSTER_PROFILEis used for the transport profile. For CPS we want to use theREMOTE_CLUSTER_PROFILE, but will not be using the credentials manager. This PR adds a check to see if CPS is enabled and if so theREMOTE_CLUSTER_PROFILEis used when constructing RemoteClusterConnection instances.I wanted to keep the knowledge of CPS limited to the
RemoteClusterService, so the transport profile name and a boolean for if the alias has credentials are now passed to theRemoteClusterConnectionconstructor. An additional unit test case has been added to verify thatREMOTE_CLUSTER_PROFILEis used when CPS is enabled.Resolves: ES-13109