Skip to content

Commit d26b2d3

Browse files
committed
fix lint issues and format with npm run lint:fix
1 parent fb94b6a commit d26b2d3

File tree

7 files changed

+20
-21
lines changed

7 files changed

+20
-21
lines changed

packages/resource-detector-gcp/src/detectors/faas.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export async function faasVersion(): Promise<string> {
6161
export async function faasInstance(): Promise<string> {
6262
// May be a bignumber.js BigNumber which can just be converted with toString(). See
6363
// https://github.com/googleapis/gcp-metadata#take-care-with-large-number-valued-properties
64-
const id = await metadata.instance<number | Object>(ID_METADATA_ATTR);
64+
const id = await metadata.instance<number | object>(ID_METADATA_ATTR);
6565
return id.toString();
6666
}
6767

packages/resource-detector-gcp/src/detectors/gce.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/blob/v1.8.0/detectors/gcp/gce.go
2121
*/
2222

23-
import {diag} from '@opentelemetry/api';
23+
import { diag } from '@opentelemetry/api';
2424
import * as metadata from 'gcp-metadata';
2525

2626
const MACHINE_TYPE_METADATA_ATTR = 'machine-type';
@@ -36,7 +36,7 @@ export async function onGce(): Promise<boolean> {
3636
diag.debug(
3737
'Could not fetch metadata attribute %s, assuming not on GCE. Error was %s',
3838
MACHINE_TYPE_METADATA_ATTR,
39-
err,
39+
err
4040
);
4141
return false;
4242
}
@@ -57,7 +57,7 @@ export async function hostType(): Promise<string> {
5757
export async function hostId(): Promise<string> {
5858
// May be a bignumber.js BigNumber which can just be converted with toString(). See
5959
// https://github.com/googleapis/gcp-metadata#take-care-with-large-number-valued-properties
60-
const id = await metadata.instance<number | Object>(ID_METADATA_ATTR);
60+
const id = await metadata.instance<number | object>(ID_METADATA_ATTR);
6161
return id.toString();
6262
}
6363

@@ -82,12 +82,12 @@ export async function availabilityZoneAndRegion(): Promise<{
8282
// Format described in
8383
// https://cloud.google.com/compute/docs/metadata/default-metadata-values#vm_instance_metadata
8484
const re = /projects\/\d+\/zones\/(?<zone>(?<region>\w+-\w+)-\w+)/;
85-
const {zone, region} = fullZone.match(re)?.groups ?? {};
85+
const { zone, region } = fullZone.match(re)?.groups ?? {};
8686
if (!zone || !region) {
8787
throw new Error(
88-
`zone was not in the expected format: projects/PROJECT_NUM/zones/COUNTRY-REGION-ZONE. Got ${fullZone}`,
88+
`zone was not in the expected format: projects/PROJECT_NUM/zones/COUNTRY-REGION-ZONE. Got ${fullZone}`
8989
);
9090
}
9191

92-
return {zone, region};
92+
return { zone, region };
9393
}

packages/resource-detector-gcp/src/detectors/gke.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ export async function availabilityZoneOrRegion(): Promise<{
5656
value: string;
5757
}> {
5858
const clusterLocation = await metadata.instance<string>(
59-
CLUSTER_LOCATION_METADATA_ATTR,
59+
CLUSTER_LOCATION_METADATA_ATTR
6060
);
6161
switch (countChar(clusterLocation, '-')) {
6262
case 1:
63-
return {type: 'region', value: clusterLocation};
63+
return { type: 'region', value: clusterLocation };
6464
case 2:
65-
return {type: 'zone', value: clusterLocation};
65+
return { type: 'zone', value: clusterLocation };
6666
default:
6767
throw new Error(
68-
`unrecognized format for cluster location: ${clusterLocation}`,
68+
`unrecognized format for cluster location: ${clusterLocation}`
6969
);
7070
}
7171
}

packages/resource-detector-gcp/test/detectors/GcpDetector.test.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ import * as sinon from 'sinon';
1919
import * as metadata from 'gcp-metadata';
2020

2121
import { gcpDetector } from '../../src/';
22-
import {
23-
detectResources,
24-
ResourceDetector,
25-
Resource,
26-
} from '@opentelemetry/resources';
22+
import { detectResources, Resource } from '@opentelemetry/resources';
2723
import * as assert from 'assert';
2824

2925
async function detectAndWait(): Promise<Resource> {

packages/resource-detector-gcp/test/detectors/faas.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import * as metadata from 'gcp-metadata';
2020

2121
import * as faas from '../../src/detectors/faas';
2222
import * as assert from 'assert';
23-
import {BigNumber} from 'bignumber.js';
23+
import { BigNumber } from 'bignumber.js';
2424

2525
describe('FaaS (Cloud Run/Functions)', () => {
2626
let metadataStub: sinon.SinonStubbedInstance<typeof metadata>;

packages/resource-detector-gcp/test/detectors/gce.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import * as metadata from 'gcp-metadata';
2020

2121
import * as gce from '../../src/detectors/gce';
2222
import * as assert from 'assert';
23-
import {BigNumber} from 'bignumber.js';
23+
import { BigNumber } from 'bignumber.js';
2424

2525
describe('GCE', () => {
2626
let metadataStub: sinon.SinonStubbedInstance<typeof metadata>;
@@ -102,7 +102,7 @@ describe('GCE', () => {
102102

103103
await assert.rejects(
104104
gce.availabilityZoneAndRegion(),
105-
/zone was not in the expected format/,
105+
/zone was not in the expected format/
106106
);
107107
});
108108
});

packages/resource-detector-gcp/test/detectors/gke.test.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ describe('GKE', () => {
6767
.resolves('us-east4');
6868

6969
const zoneOrRegion = await gke.availabilityZoneOrRegion();
70-
assert.deepStrictEqual(zoneOrRegion, {type: 'region', value: 'us-east4'});
70+
assert.deepStrictEqual(zoneOrRegion, {
71+
type: 'region',
72+
value: 'us-east4',
73+
});
7174
});
7275

7376
it('detects zone', async () => {
@@ -89,7 +92,7 @@ describe('GKE', () => {
8992

9093
await assert.rejects(
9194
gke.availabilityZoneOrRegion(),
92-
/unrecognized format for cluster location/,
95+
/unrecognized format for cluster location/
9396
);
9497
});
9598
});

0 commit comments

Comments
 (0)