Skip to content

Commit fcebd6f

Browse files
garysassanogarysassano
committed
reinstate ifs
1 parent f243570 commit fcebd6f

File tree

2 files changed

+164
-112
lines changed

2 files changed

+164
-112
lines changed

‎detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetector.test.ts‎

Lines changed: 82 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -71,66 +71,92 @@ const assertEcsResource = (
7171
resource.attributes[ATTR_CLOUD_PROVIDER],
7272
CLOUD_PROVIDER_VALUE_AWS
7373
);
74-
assert.strictEqual(
75-
resource.attributes[ATTR_CLOUD_ACCOUNT_ID],
76-
validations.accountId
77-
);
78-
assert.strictEqual(
79-
resource.attributes[ATTR_CLOUD_REGION],
80-
validations.region
81-
);
82-
assert.strictEqual(
83-
resource.attributes[ATTR_CLOUD_AVAILABILITY_ZONE],
84-
validations.zone
85-
);
8674
assert.strictEqual(
8775
resource.attributes[ATTR_CLOUD_PLATFORM],
8876
CLOUD_PLATFORM_VALUE_AWS_ECS
8977
);
90-
assert.strictEqual(
91-
resource.attributes[ATTR_AWS_ECS_CONTAINER_ARN],
92-
validations.containerArn
93-
);
94-
assert.strictEqual(
95-
resource.attributes[ATTR_CLOUD_RESOURCE_ID],
96-
validations.containerArn
97-
);
98-
assert.strictEqual(
99-
resource.attributes[ATTR_AWS_ECS_CLUSTER_ARN],
100-
validations.clusterArn
101-
);
102-
assert.strictEqual(
103-
resource.attributes[ATTR_AWS_ECS_LAUNCHTYPE],
104-
validations.launchType
105-
);
106-
assert.strictEqual(
107-
resource.attributes[ATTR_AWS_ECS_TASK_ARN],
108-
validations.taskArn
109-
);
110-
assert.strictEqual(
111-
resource.attributes[ATTR_AWS_ECS_TASK_FAMILY],
112-
validations.taskFamily
113-
);
114-
assert.strictEqual(
115-
resource.attributes[ATTR_AWS_ECS_TASK_REVISION],
116-
validations.taskRevision
117-
);
118-
assert.deepEqual(
119-
resource.attributes[ATTR_AWS_LOG_GROUP_NAMES],
120-
validations.logGroupNames
121-
);
122-
assert.deepEqual(
123-
resource.attributes[ATTR_AWS_LOG_GROUP_ARNS],
124-
validations.logGroupArns
125-
);
126-
assert.deepEqual(
127-
resource.attributes[ATTR_AWS_LOG_STREAM_NAMES],
128-
validations.logStreamNames
129-
);
130-
assert.deepEqual(
131-
resource.attributes[ATTR_AWS_LOG_STREAM_ARNS],
132-
validations.logStreamArns
133-
);
78+
if (validations.accountId) {
79+
assert.strictEqual(
80+
resource.attributes[ATTR_CLOUD_ACCOUNT_ID],
81+
validations.accountId
82+
);
83+
}
84+
if (validations.region) {
85+
assert.strictEqual(
86+
resource.attributes[ATTR_CLOUD_REGION],
87+
validations.region
88+
);
89+
}
90+
if (validations.zone) {
91+
assert.strictEqual(
92+
resource.attributes[ATTR_CLOUD_AVAILABILITY_ZONE],
93+
validations.zone
94+
);
95+
}
96+
if (validations.containerArn) {
97+
assert.strictEqual(
98+
resource.attributes[ATTR_AWS_ECS_CONTAINER_ARN],
99+
validations.containerArn
100+
);
101+
assert.strictEqual(
102+
resource.attributes[ATTR_CLOUD_RESOURCE_ID],
103+
validations.containerArn
104+
);
105+
}
106+
if (validations.clusterArn) {
107+
assert.strictEqual(
108+
resource.attributes[ATTR_AWS_ECS_CLUSTER_ARN],
109+
validations.clusterArn
110+
);
111+
}
112+
if (validations.launchType) {
113+
assert.strictEqual(
114+
resource.attributes[ATTR_AWS_ECS_LAUNCHTYPE],
115+
validations.launchType
116+
);
117+
}
118+
if (validations.taskArn) {
119+
assert.strictEqual(
120+
resource.attributes[ATTR_AWS_ECS_TASK_ARN],
121+
validations.taskArn
122+
);
123+
}
124+
if (validations.taskFamily) {
125+
assert.strictEqual(
126+
resource.attributes[ATTR_AWS_ECS_TASK_FAMILY],
127+
validations.taskFamily
128+
);
129+
}
130+
if (validations.taskRevision) {
131+
assert.strictEqual(
132+
resource.attributes[ATTR_AWS_ECS_TASK_REVISION],
133+
validations.taskRevision
134+
);
135+
}
136+
if (validations.logGroupNames) {
137+
assert.deepEqual(
138+
resource.attributes[ATTR_AWS_LOG_GROUP_NAMES],
139+
validations.logGroupNames
140+
);
141+
}
142+
if (validations.logGroupArns) {
143+
assert.deepEqual(
144+
resource.attributes[ATTR_AWS_LOG_GROUP_ARNS],
145+
validations.logGroupArns
146+
);
147+
}
148+
if (validations.logStreamNames) {
149+
assert.deepEqual(
150+
resource.attributes[ATTR_AWS_LOG_STREAM_NAMES],
151+
validations.logStreamNames
152+
);
153+
}
154+
if (validations.logStreamArns) {
155+
assert.deepEqual(
156+
resource.attributes[ATTR_AWS_LOG_STREAM_ARNS],
157+
validations.logStreamArns
158+
);
159+
}
134160
};
135161

136162
describe('AwsEcsResourceDetector', () => {

‎detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsEcsDetectorSync.test.ts‎

Lines changed: 82 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -71,66 +71,92 @@ const assertEcsResource = (
7171
resource.attributes[ATTR_CLOUD_PROVIDER],
7272
CLOUD_PROVIDER_VALUE_AWS
7373
);
74-
assert.strictEqual(
75-
resource.attributes[ATTR_CLOUD_ACCOUNT_ID],
76-
validations.accountId
77-
);
78-
assert.strictEqual(
79-
resource.attributes[ATTR_CLOUD_REGION],
80-
validations.region
81-
);
82-
assert.strictEqual(
83-
resource.attributes[ATTR_CLOUD_AVAILABILITY_ZONE],
84-
validations.zone
85-
);
8674
assert.strictEqual(
8775
resource.attributes[ATTR_CLOUD_PLATFORM],
8876
CLOUD_PLATFORM_VALUE_AWS_ECS
8977
);
90-
assert.strictEqual(
91-
resource.attributes[ATTR_AWS_ECS_CONTAINER_ARN],
92-
validations.containerArn
93-
);
94-
assert.strictEqual(
95-
resource.attributes[ATTR_CLOUD_RESOURCE_ID],
96-
validations.containerArn
97-
);
98-
assert.strictEqual(
99-
resource.attributes[ATTR_AWS_ECS_CLUSTER_ARN],
100-
validations.clusterArn
101-
);
102-
assert.strictEqual(
103-
resource.attributes[ATTR_AWS_ECS_LAUNCHTYPE],
104-
validations.launchType
105-
);
106-
assert.strictEqual(
107-
resource.attributes[ATTR_AWS_ECS_TASK_ARN],
108-
validations.taskArn
109-
);
110-
assert.strictEqual(
111-
resource.attributes[ATTR_AWS_ECS_TASK_FAMILY],
112-
validations.taskFamily
113-
);
114-
assert.strictEqual(
115-
resource.attributes[ATTR_AWS_ECS_TASK_REVISION],
116-
validations.taskRevision
117-
);
118-
assert.deepEqual(
119-
resource.attributes[ATTR_AWS_LOG_GROUP_NAMES],
120-
validations.logGroupNames
121-
);
122-
assert.deepEqual(
123-
resource.attributes[ATTR_AWS_LOG_GROUP_ARNS],
124-
validations.logGroupArns
125-
);
126-
assert.deepEqual(
127-
resource.attributes[ATTR_AWS_LOG_STREAM_NAMES],
128-
validations.logStreamNames
129-
);
130-
assert.deepEqual(
131-
resource.attributes[ATTR_AWS_LOG_STREAM_ARNS],
132-
validations.logStreamArns
133-
);
78+
if (validations.accountId) {
79+
assert.strictEqual(
80+
resource.attributes[ATTR_CLOUD_ACCOUNT_ID],
81+
validations.accountId
82+
);
83+
}
84+
if (validations.region) {
85+
assert.strictEqual(
86+
resource.attributes[ATTR_CLOUD_REGION],
87+
validations.region
88+
);
89+
}
90+
if (validations.zone) {
91+
assert.strictEqual(
92+
resource.attributes[ATTR_CLOUD_AVAILABILITY_ZONE],
93+
validations.zone
94+
);
95+
}
96+
if (validations.containerArn) {
97+
assert.strictEqual(
98+
resource.attributes[ATTR_AWS_ECS_CONTAINER_ARN],
99+
validations.containerArn
100+
);
101+
assert.strictEqual(
102+
resource.attributes[ATTR_CLOUD_RESOURCE_ID],
103+
validations.containerArn
104+
);
105+
}
106+
if (validations.clusterArn) {
107+
assert.strictEqual(
108+
resource.attributes[ATTR_AWS_ECS_CLUSTER_ARN],
109+
validations.clusterArn
110+
);
111+
}
112+
if (validations.launchType) {
113+
assert.strictEqual(
114+
resource.attributes[ATTR_AWS_ECS_LAUNCHTYPE],
115+
validations.launchType
116+
);
117+
}
118+
if (validations.taskArn) {
119+
assert.strictEqual(
120+
resource.attributes[ATTR_AWS_ECS_TASK_ARN],
121+
validations.taskArn
122+
);
123+
}
124+
if (validations.taskFamily) {
125+
assert.strictEqual(
126+
resource.attributes[ATTR_AWS_ECS_TASK_FAMILY],
127+
validations.taskFamily
128+
);
129+
}
130+
if (validations.taskRevision) {
131+
assert.strictEqual(
132+
resource.attributes[ATTR_AWS_ECS_TASK_REVISION],
133+
validations.taskRevision
134+
);
135+
}
136+
if (validations.logGroupNames) {
137+
assert.deepEqual(
138+
resource.attributes[ATTR_AWS_LOG_GROUP_NAMES],
139+
validations.logGroupNames
140+
);
141+
}
142+
if (validations.logGroupArns) {
143+
assert.deepEqual(
144+
resource.attributes[ATTR_AWS_LOG_GROUP_ARNS],
145+
validations.logGroupArns
146+
);
147+
}
148+
if (validations.logStreamNames) {
149+
assert.deepEqual(
150+
resource.attributes[ATTR_AWS_LOG_STREAM_NAMES],
151+
validations.logStreamNames
152+
);
153+
}
154+
if (validations.logStreamArns) {
155+
assert.deepEqual(
156+
resource.attributes[ATTR_AWS_LOG_STREAM_ARNS],
157+
validations.logStreamArns
158+
);
159+
}
134160
};
135161

136162
describe('AwsEcsResourceDetectorSync', () => {

0 commit comments

Comments
 (0)