Skip to content

Commit a51bbbd

Browse files
vreynoldsdyladan
andauthored
fix: await http response in AWS EKS detector (#2076)
* previously missing await on a promise response * update tests to reflect current behavior Co-authored-by: Daniel Dyla <[email protected]>
1 parent 64c8ef5 commit a51bbbd

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

packages/opentelemetry-resource-detector-aws/src/detectors/AwsEksDetector.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class AwsEksDetector implements Detector {
6666
await AwsEksDetector.fileAccessAsync(this.K8S_TOKEN_PATH);
6767
const k8scert = await AwsEksDetector.readFileAsync(this.K8S_CERT_PATH);
6868

69-
if (!this._isEks(k8scert)) {
69+
if (!(await this._isEks(k8scert))) {
7070
return Resource.empty();
7171
}
7272

packages/opentelemetry-resource-detector-aws/test/detectors/AwsEksDetector.test.ts

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,7 @@ describe('awsEksDetector', () => {
247247
});
248248

249249
describe('on unsuccesful request', () => {
250-
it('should throw when receiving error response code', async () => {
251-
const expectedError = new Error('EKS metadata api request timed out.');
250+
it('should return an empty resource when timed out', async () => {
252251
fileStub = sinon
253252
.stub(AwsEksDetector, 'fileAccessAsync' as any)
254253
.resolves();
@@ -265,17 +264,14 @@ describe('awsEksDetector', () => {
265264
.delayConnection(2500)
266265
.reply(200, () => mockedAwsAuth);
267266

268-
try {
269-
await awsEksDetector.detect();
270-
} catch (err) {
271-
assert.deepStrictEqual(err, expectedError);
272-
}
273-
267+
const resource: Resource = await awsEksDetector.detect();
274268
scope.done();
275-
});
276269

277-
it('should return an empty resource when timed out', async () => {
278-
const expectedError = new Error('Failed to load page, status code: 404');
270+
assert.ok(resource);
271+
assertEmptyResource(resource);
272+
}).timeout(awsEksDetector.TIMEOUT_MS + 100);
273+
274+
it('should return an empty resource when receiving error response code', async () => {
279275
fileStub = sinon
280276
.stub(AwsEksDetector, 'fileAccessAsync' as any)
281277
.resolves();
@@ -291,13 +287,11 @@ describe('awsEksDetector', () => {
291287
.matchHeader('Authorization', k8s_token)
292288
.reply(404, () => new Error());
293289

294-
try {
295-
await awsEksDetector.detect();
296-
} catch (err) {
297-
assert.deepStrictEqual(err, expectedError);
298-
}
299-
290+
const resource: Resource = await awsEksDetector.detect();
300291
scope.done();
292+
293+
assert.ok(resource);
294+
assertEmptyResource(resource);
301295
});
302296
});
303297
});

0 commit comments

Comments
 (0)