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

fix(opensearchservice): imported domain's domainendpoint is a url not an endpoint #18027

Merged
merged 8 commits into from Dec 21, 2021
Merged

fix(opensearchservice): imported domain's domainendpoint is a url not an endpoint #18027

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b441429
stripped https
joejegan Dec 15, 2021
bc72117
removed blank lines
joejegan Dec 15, 2021
baf8ffd
resolved typo
joejegan Dec 15, 2021
52c3c17
minor nit
kaizencc Dec 17, 2021
cdc8818
removed trailing spaces
joejegan Dec 17, 2021
c4fd2c8
Merge branch 'master' into es-domainEndpoint
kaizencc Dec 17, 2021
e589e2a
Merge branch 'master' into es-domainEndpoint
kaizencc Dec 20, 2021
f1bc543
Merge branch 'master' into es-domainEndpoint
mergify[bot] Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-elasticsearch/lib/domain.ts
View file
Open in desktop
Expand Up @@ -1218,7 +1218,7 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable {
return new class extends DomainBase {
public readonly domainArn = domainArn;
public readonly domainName = domainName;
public readonly domainEndpoint = domainEndpoint;
public readonly domainEndpoint = domainEndpoint.replace(/^https?:\/\//, '');

constructor() { super(scope, id); }
};
Expand Down
8 changes: 6 additions & 2 deletions packages/@aws-cdk/aws-elasticsearch/test/domain.test.ts
View file
Open in desktop
Expand Up @@ -928,26 +928,30 @@ describe('import', () => {

test('static fromDomainEndpoint(endpoint) allows importing an external/existing domain', () => {
const domainName = 'test-domain-2w2x2u3tifly';
const domainEndpoint = `https://${domainName}-jcjotrt6f7otem4sqcwbch3c4u.testregion.es.amazonaws.com`;
const domainEndpointWithoutHttps = `${domainName}-jcjotrt6f7otem4sqcwbch3c4u.testregion.es.amazonaws.com`;
const domainEndpoint = `https://${domainEndpointWithoutHttps}`;
const imported = Domain.fromDomainEndpoint(stack, 'Domain', domainEndpoint);

expect(imported.domainName).toEqual(domainName);
expect(imported.domainArn).toMatch(RegExp(`es:testregion:1234:domain/${domainName}$`));
expect(imported.domainEndpoint).toEqual(domainEndpointWithoutHttps);

expect(stack).not.toHaveResource('AWS::Elasticsearch::Domain');
});

test('static fromDomainAttributes(attributes) allows importing an external/existing domain', () => {
const domainName = 'test-domain-2w2x2u3tifly';
const domainArn = `arn:aws:es:testregion:1234:domain/${domainName}`;
const domainEndpoint = `https://${domainName}-jcjotrt6f7otem4sqcwbch3c4u.testregion.es.amazonaws.com`;
const domainEndpointWithoutHttps = `${domainName}-jcjotrt6f7otem4sqcwbch3c4u.testregion.es.amazonaws.com`;
const domainEndpoint = `https://${domainEndpointWithoutHttps}`;
const imported = Domain.fromDomainAttributes(stack, 'Domain', {
domainArn,
domainEndpoint,
});

expect(imported.domainName).toEqual(domainName);
expect(imported.domainArn).toEqual(domainArn);
expect(imported.domainEndpoint).toEqual(domainEndpointWithoutHttps);

expect(stack).not.toHaveResource('AWS::Elasticsearch::Domain');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-opensearchservice/lib/domain.ts
View file
Open in desktop
Expand Up @@ -1148,7 +1148,7 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable {
public readonly domainArn = domainArn;
public readonly domainName = domainName;
public readonly domainId = domainName;
public readonly domainEndpoint = domainEndpoint;
public readonly domainEndpoint = domainEndpoint.replace(/^https?:\/\//, '');

constructor() { super(scope, id); }
};
Expand Down
8 changes: 6 additions & 2 deletions packages/@aws-cdk/aws-opensearchservice/test/domain.test.ts
View file
Open in desktop
Expand Up @@ -930,26 +930,30 @@ describe('import', () => {

test('static fromDomainEndpoint(endpoint) allows importing an external/existing domain', () => {
const domainName = 'test-domain-2w2x2u3tifly';
const domainEndpoint = `https://${domainName}-jcjotrt6f7otem4sqcwbch3c4u.testregion.es.amazonaws.com`;
const domainEndpointWithoutHttps = `${domainName}-jcjotrt6f7otem4sqcwbch3c4u.testregion.es.amazonaws.com`;
const domainEndpoint = `https://${domainEndpointWithoutHttps}`;
const imported = Domain.fromDomainEndpoint(stack, 'Domain', domainEndpoint);

expect(imported.domainName).toEqual(domainName);
expect(imported.domainArn).toMatch(RegExp(`es:testregion:1234:domain/${domainName}$`));
expect(imported.domainEndpoint).toEqual(domainEndpointWithoutHttps);

expect(stack).not.toHaveResource('AWS::OpenSearchService::Domain');
});

test('static fromDomainAttributes(attributes) allows importing an external/existing domain', () => {
const domainName = 'test-domain-2w2x2u3tifly';
const domainArn = `arn:aws:es:testregion:1234:domain/${domainName}`;
const domainEndpoint = `https://${domainName}-jcjotrt6f7otem4sqcwbch3c4u.testregion.es.amazonaws.com`;
const domainEndpointWithoutHttps = `${domainName}-jcjotrt6f7otem4sqcwbch3c4u.testregion.es.amazonaws.com`;
const domainEndpoint = `https://${domainEndpointWithoutHttps}`;
const imported = Domain.fromDomainAttributes(stack, 'Domain', {
domainArn,
domainEndpoint,
});

expect(imported.domainName).toEqual(domainName);
expect(imported.domainArn).toEqual(domainArn);
expect(imported.domainEndpoint).toEqual(domainEndpointWithoutHttps);

expect(stack).not.toHaveResource('AWS::OpenSearchService::Domain');
});
Expand Down