Skip to content

Commit 43a512d

Browse files
authored
Change python eks expected-data-template to match with latest add-on. (#32)
1 parent 5c643e5 commit 43a512d

File tree

4 files changed

+45
-45
lines changed

4 files changed

+45
-45
lines changed

validator/src/main/resources/expected-data-template/python/eks/aws-sdk-call-trace.mustache

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
18-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
19-
"aws_local_operation": "^GET aws-sdk-call$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
18+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
19+
"aws.local.operation": "^GET aws-sdk-call$"
2020
},
2121
"metadata": {
2222
"default": {
@@ -39,13 +39,13 @@
3939
"operation": "^GetBucketLocation$"
4040
},
4141
"annotations": {
42-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
43-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
44-
"aws_local_service": "^{{serviceName}}$",
45-
"aws_local_operation": "^GET aws-sdk-call$",
46-
"aws_remote_service": "^AWS\\.SDK\\.S3$",
47-
"aws_remote_operation": "GetBucketLocation",
48-
"aws_remote_target": "::s3:::e2e-test-bucket-name"
42+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
43+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
44+
"aws.local.service": "^{{serviceName}}$",
45+
"aws.local.operation": "^GET aws-sdk-call$",
46+
"aws.remote.service": "^AWS\\.SDK\\.S3$",
47+
"aws.remote.operation": "GetBucketLocation",
48+
"aws.remote.target": "::s3:::e2e-test-bucket-name"
4949
},
5050
"metadata": {
5151
"default": {

validator/src/main/resources/expected-data-template/python/eks/client-call-trace.mustache

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[{
22
"name": "^{{serviceName}}$",
33
"annotations": {
4-
"aws_local_service": "^{{serviceName}}$",
5-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
6-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
7-
"aws_local_operation": "^InternalOperation$"
4+
"aws.local.service": "^{{serviceName}}$",
5+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
6+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
7+
"aws.local.operation": "^InternalOperation$"
88
},
99
"metadata": {
1010
"default": {
@@ -23,12 +23,12 @@
2323
}
2424
},
2525
"annotations": {
26-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
27-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
28-
"aws_local_service": "^{{serviceName}}$",
29-
"aws_local_operation": "^InternalOperation$",
30-
"aws_remote_service": "^local-root-client-call$",
31-
"aws_remote_operation": "GET /"
26+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
27+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
28+
"aws.local.service": "^{{serviceName}}$",
29+
"aws.local.operation": "^InternalOperation$",
30+
"aws.remote.service": "^local-root-client-call$",
31+
"aws.remote.operation": "GET /"
3232
},
3333
"metadata": {
3434
"default": {
@@ -51,7 +51,7 @@
5151
}
5252
},
5353
"annotations": {
54-
"aws_local_service": "^local-root-client-call$",
55-
"aws_local_operation": "^GET /$"
54+
"aws.local.service": "^local-root-client-call$",
55+
"aws.local.operation": "^GET /$"
5656
}
5757
}]

validator/src/main/resources/expected-data-template/python/eks/outgoing-http-call-trace.mustache

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
18-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
19-
"aws_local_operation": "^GET outgoing-http-call$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
18+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
19+
"aws.local.operation": "^GET outgoing-http-call$"
2020
},
2121
"metadata": {
2222
"default": {
@@ -36,12 +36,12 @@
3636
}
3737
},
3838
"annotations": {
39-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
40-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
41-
"aws_local_service": "^{{serviceName}}$",
42-
"aws_local_operation": "^GET outgoing-http-call$",
43-
"aws_remote_service": "^www.amazon.com$",
44-
"aws_remote_operation": "^GET /$"
39+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
40+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
41+
"aws.local.service": "^{{serviceName}}$",
42+
"aws.local.operation": "^GET outgoing-http-call$",
43+
"aws.remote.service": "^www.amazon.com$",
44+
"aws.remote.operation": "^GET /$"
4545
},
4646
"metadata": {
4747
"default": {

validator/src/main/resources/expected-data-template/python/eks/remote-service-trace.mustache

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"account_id": "^{{accountId}}$"
1414
},
1515
"annotations": {
16-
"aws_local_service": "^{{serviceName}}$",
17-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
18-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
19-
"aws_local_operation": "^GET remote-service$"
16+
"aws.local.service": "^{{serviceName}}$",
17+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
18+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
19+
"aws.local.operation": "^GET remote-service$"
2020
},
2121
"metadata": {
2222
"default": {
@@ -36,10 +36,10 @@
3636
}
3737
},
3838
"annotations": {
39-
"aws_local_service": "^{{serviceName}}$",
40-
"aws_local_operation": "^GET remote-service$",
41-
"aws_remote_service": "^{{remoteServiceDeploymentName}}$",
42-
"aws_remote_operation": "^GET /healthcheck$"
39+
"aws.local.service": "^{{serviceName}}$",
40+
"aws.local.operation": "^GET remote-service$",
41+
"aws.remote.service": "^{{remoteServiceDeploymentName}}$",
42+
"aws.remote.operation": "^GET /healthcheck$"
4343
},
4444
"metadata": {
4545
"default": {
@@ -59,10 +59,10 @@
5959
}
6060
},
6161
"annotations": {
62-
"aws_local_service": "^{{remoteServiceDeploymentName}}$",
63-
"HostedIn_K8s_Namespace": "^{{appNamespace}}$",
64-
"HostedIn_EKS_Cluster": "^{{platformInfo}}$",
65-
"aws_local_operation": "^GET healthcheck$"
62+
"aws.local.service": "^{{remoteServiceDeploymentName}}$",
63+
"HostedIn.K8s.Namespace": "^{{appNamespace}}$",
64+
"HostedIn.EKS.Cluster": "^{{platformInfo}}$",
65+
"aws.local.operation": "^GET healthcheck$"
6666
},
6767
"metadata": {
6868
"default": {

0 commit comments

Comments
 (0)