(aws-elasticsearch): `Domain.fromDomainEndpoint` returning incorrect ARN

When using the Domain.fromDomainEndpoint function to retrieve an ES Instance and reference in the rest of the Stack, it returns an incorrect ARN. When I output the ARN, it gives the following results:

ACTUAL ARN -> arn:aws:es:[region]:[accountId]:domain/infrast-elasti-...
OUTPUTTED  -> arn:aws:es:[region]:[accountId]:domain/search-infrast-elasti-...

Reproduction Steps

• Have an existing ElasticSearch Service Instance running
• Import it from the CDK

const esDomain = Domain.fromDomainEndpoint(
  this,
  `${id}ESDomain`,
  'https://search-infrast-elasti-....[region].es.amazonaws.com/'
);

new CfnOutput(this, `ElasticSearchArn`, {
  value: esDomain.domainArn,
  exportName: `ElasticSearchArn`,
});

• Compare the actual ARN and the ARN returned

What did you expect to happen?

The provided ARN should be the correct ARN

What actually happened?

The provided ARN was incorrect

Environment

• CDK CLI Version : 1.91.0
• Framework Version: 1.91.0
• Node.js Version: 12.20.1
• OS : Ubuntu 20
• Language (Version): TypeScript (3.9.7)

Other

---

This is 🐛 Bug Report

[iliapolo]

@justindra Thanks for reporting this.

Looks like we neglected to consider the search- prefix.

Note to self: Given that users can also specify custom endpoints, this makes me think we shouldn’t try to deduce the ARN from the endpoint, and instead just provide a Domain.fromDomainArn function and thats it.

[neovasili]

Found the same issue in @aws-cdk/aws-opensearchservice using the fromDomainEndpoint method (cdk v1.50.0).

May I suggest to add a method fromDomainName and deprecate the other one? since looks like ARN is composed by appending domain name at the end.