Skip to content

Commit 6d204d4

Browse files
general-kroll-4-lifegeneral-kroll-4-life
committed
- Cater for windows.
1 parent d575983 commit 6d204d4

File tree

2 files changed

+158
-1
lines changed

2 files changed

+158
-1
lines changed

‎test/assets/expected/aws/ce/ca-cast-real-windows.txt‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
|------------|------------|--------------------------------|-----------------------|------|
2+
| beginning | ending | keyz | amount | unit |
3+
|------------|------------|--------------------------------|-----------------------|------|
4+
| 2024-11-01 | 2024-11-30 | ["AWS CloudFormation"] | 0 | USD |
5+
|------------|------------|--------------------------------|-----------------------|------|
6+
| 2024-08-01 | 2024-09-01 | ["AWS Glue"] | 0 | USD |
7+
|------------|------------|--------------------------------|-----------------------|------|
8+
| 2024-09-01 | 2024-10-01 | ["AWS Glue"] | 0 | USD |
9+
|------------|------------|--------------------------------|-----------------------|------|
10+
| 2024-10-01 | 2024-11-01 | ["AWS Glue"] | 0 | USD |
11+
|------------|------------|--------------------------------|-----------------------|------|
12+
| 2024-11-01 | 2024-11-30 | ["AWS Glue"] | 0 | USD |
13+
|------------|------------|--------------------------------|-----------------------|------|
14+
| 2024-11-01 | 2024-11-30 | ["AWS Lambda"] | 0 | USD |
15+
|------------|------------|--------------------------------|-----------------------|------|
16+
| 2024-08-01 | 2024-09-01 | ["AWS Secrets Manager"] | 0 | USD |
17+
|------------|------------|--------------------------------|-----------------------|------|
18+
| 2024-09-01 | 2024-10-01 | ["AWS Secrets Manager"] | 0 | USD |
19+
|------------|------------|--------------------------------|-----------------------|------|
20+
| 2024-10-01 | 2024-11-01 | ["AWS Secrets Manager"] | 0 | USD |
21+
|------------|------------|--------------------------------|-----------------------|------|
22+
| 2024-11-01 | 2024-11-30 | ["AWS Secrets Manager"] | 0 | USD |
23+
|------------|------------|--------------------------------|-----------------------|------|
24+
| 2024-08-01 | 2024-09-01 | ["Amazon Simple Notification | 0 | USD |
25+
| | | Service"] | | |
26+
|------------|------------|--------------------------------|-----------------------|------|
27+
| 2024-09-01 | 2024-10-01 | ["Amazon Simple Notification | 0 | USD |
28+
| | | Service"] | | |
29+
|------------|------------|--------------------------------|-----------------------|------|
30+
| 2024-10-01 | 2024-11-01 | ["Amazon Simple Notification | 0 | USD |
31+
| | | Service"] | | |
32+
|------------|------------|--------------------------------|-----------------------|------|
33+
| 2024-11-01 | 2024-11-30 | ["Amazon Simple Notification | 0 | USD |
34+
| | | Service"] | | |
35+
|------------|------------|--------------------------------|-----------------------|------|
36+
| 2024-08-01 | 2024-09-01 | ["Amazon Simple Queue | 0 | USD |
37+
| | | Service"] | | |
38+
|------------|------------|--------------------------------|-----------------------|------|
39+
| 2024-09-01 | 2024-10-01 | ["Amazon Simple Queue | 0 | USD |
40+
| | | Service"] | | |
41+
|------------|------------|--------------------------------|-----------------------|------|
42+
| 2024-10-01 | 2024-11-01 | ["Amazon Simple Queue | 0 | USD |
43+
| | | Service"] | | |
44+
|------------|------------|--------------------------------|-----------------------|------|
45+
| 2024-11-01 | 2024-11-30 | ["Amazon Simple Queue | 0 | USD |
46+
| | | Service"] | | |
47+
|------------|------------|--------------------------------|-----------------------|------|
48+
| 2024-08-01 | 2024-09-01 | ["AmazonCloudWatch"] | 0 | USD |
49+
|------------|------------|--------------------------------|-----------------------|------|
50+
| 2024-09-01 | 2024-10-01 | ["AmazonCloudWatch"] | 0 | USD |
51+
|------------|------------|--------------------------------|-----------------------|------|
52+
| 2024-10-01 | 2024-11-01 | ["AmazonCloudWatch"] | 0 | USD |
53+
|------------|------------|--------------------------------|-----------------------|------|
54+
| 2024-11-01 | 2024-11-30 | ["AmazonCloudWatch"] | 0 | USD |
55+
|------------|------------|--------------------------------|-----------------------|------|
56+
| 2024-11-01 | 2024-11-30 | ["AWS CloudShell"] | 2.152e-07 | USD |
57+
|------------|------------|--------------------------------|-----------------------|------|
58+
| 2024-11-01 | 2024-11-30 | ["Amazon Location Service"] | 0.0014550000000000001 | USD |
59+
|------------|------------|--------------------------------|-----------------------|------|
60+
| 2024-09-01 | 2024-10-01 | ["Amazon Location Service"] | 0.0015540000000000003 | USD |
61+
|------------|------------|--------------------------------|-----------------------|------|
62+
| 2024-08-01 | 2024-09-01 | ["Amazon Location Service"] | 0.001584 | USD |
63+
|------------|------------|--------------------------------|-----------------------|------|
64+
| 2024-10-01 | 2024-11-01 | ["Amazon Location Service"] | 0.001653 | USD |
65+
|------------|------------|--------------------------------|-----------------------|------|
66+
| 2024-08-01 | 2024-09-01 | ["Amazon DynamoDB"] | 0.0051069546 | USD |
67+
|------------|------------|--------------------------------|-----------------------|------|
68+
| 2024-08-01 | 2024-09-01 | ["Amazon Simple Storage | 0.0473099157 | USD |
69+
| | | Service"] | | |
70+
|------------|------------|--------------------------------|-----------------------|------|
71+
| 2024-11-01 | 2024-11-30 | ["Amazon EC2 Container | 0.0611570328 | USD |
72+
| | | Registry (ECR)"] | | |
73+
|------------|------------|--------------------------------|-----------------------|------|
74+
| 2024-08-01 | 2024-09-01 | ["Amazon EC2 Container | 0.0632658912 | USD |
75+
| | | Registry (ECR)"] | | |
76+
|------------|------------|--------------------------------|-----------------------|------|
77+
| 2024-10-01 | 2024-11-01 | ["Amazon EC2 Container | 0.0632658912 | USD |
78+
| | | Registry (ECR)"] | | |
79+
|------------|------------|--------------------------------|-----------------------|------|
80+
| 2024-09-01 | 2024-10-01 | ["Amazon EC2 Container | 0.063265896 | USD |
81+
| | | Registry (ECR)"] | | |
82+
|------------|------------|--------------------------------|-----------------------|------|
83+
| 2024-11-01 | 2024-11-30 | ["Amazon DynamoDB"] | 0.06669150500000001 | USD |
84+
|------------|------------|--------------------------------|-----------------------|------|
85+
| 2024-09-01 | 2024-10-01 | ["Amazon DynamoDB"] | 0.0787472044 | USD |
86+
|------------|------------|--------------------------------|-----------------------|------|
87+
| 2024-10-01 | 2024-11-01 | ["Amazon DynamoDB"] | 0.1278523226 | USD |
88+
|------------|------------|--------------------------------|-----------------------|------|
89+
| 2024-09-01 | 2024-10-01 | ["Amazon Simple Storage | 0.3545428953 | USD |
90+
| | | Service"] | | |
91+
|------------|------------|--------------------------------|-----------------------|------|
92+
| 2024-10-01 | 2024-11-01 | ["Amazon Simple Storage | 0.3908839969 | USD |
93+
| | | Service"] | | |
94+
|------------|------------|--------------------------------|-----------------------|------|
95+
| 2024-11-01 | 2024-11-30 | ["Amazon Simple Storage | 0.6006374463 | USD |
96+
| | | Service"] | | |
97+
|------------|------------|--------------------------------|-----------------------|------|
98+
| 2024-08-01 | 2024-09-01 | ["AWS Key Management Service"] | 0.9999999840000001 | USD |
99+
|------------|------------|--------------------------------|-----------------------|------|
100+
| 2024-11-01 | 2024-11-30 | ["AWS Config"] | 1.6789999999999998 | USD |
101+
|------------|------------|--------------------------------|-----------------------|------|
102+
| 2024-09-01 | 2024-10-01 | ["AWS Config"] | 1.759 | USD |
103+
|------------|------------|--------------------------------|-----------------------|------|
104+
| 2024-10-01 | 2024-11-01 | ["AWS Config"] | 1.8059999999999998 | USD |
105+
|------------|------------|--------------------------------|-----------------------|------|
106+
| 2024-08-01 | 2024-09-01 | ["EC2 - Other"] | 1.8325932937 | USD |
107+
|------------|------------|--------------------------------|-----------------------|------|
108+
| 2024-08-01 | 2024-09-01 | ["AWS Config"] | 1.982 | USD |
109+
|------------|------------|--------------------------------|-----------------------|------|
110+
| 2024-10-01 | 2024-11-01 | ["EC2 - Other"] | 2.3042661799 | USD |
111+
|------------|------------|--------------------------------|-----------------------|------|
112+
| 2024-09-01 | 2024-10-01 | ["EC2 - Other"] | 2.3043115302 | USD |
113+
|------------|------------|--------------------------------|-----------------------|------|
114+
| 2024-08-01 | 2024-09-01 | ["Tax"] | 3.4200000000000004 | USD |
115+
|------------|------------|--------------------------------|-----------------------|------|
116+
| 2024-09-01 | 2024-10-01 | ["AWS Key Management Service"] | 4.1631550079999995 | USD |
117+
|------------|------------|--------------------------------|-----------------------|------|
118+
| 2024-09-01 | 2024-10-01 | ["Tax"] | 4.58 | USD |
119+
|------------|------------|--------------------------------|-----------------------|------|
120+
| 2024-10-01 | 2024-11-01 | ["Tax"] | 4.9399999999999995 | USD |
121+
|------------|------------|--------------------------------|-----------------------|------|
122+
| 2024-10-01 | 2024-11-01 | ["AWS Key Management Service"] | 6.383010812000001 | USD |
123+
|------------|------------|--------------------------------|-----------------------|------|
124+
| 2024-11-01 | 2024-11-30 | ["AWS Key Management Service"] | 6.4058586744 | USD |
125+
|------------|------------|--------------------------------|-----------------------|------|
126+
| 2024-08-01 | 2024-09-01 | ["Amazon Virtual Private | 8.857988885000001 | USD |
127+
| | | Cloud"] | | |
128+
|------------|------------|--------------------------------|-----------------------|------|
129+
| 2024-09-01 | 2024-10-01 | ["Amazon Virtual Private | 10.800799999999999 | USD |
130+
| | | Cloud"] | | |
131+
|------------|------------|--------------------------------|-----------------------|------|
132+
| 2024-10-01 | 2024-11-01 | ["Amazon Virtual Private | 11.16 | USD |
133+
| | | Cloud"] | | |
134+
|------------|------------|--------------------------------|-----------------------|------|
135+
| 2024-11-01 | 2024-11-30 | ["Tax"] | 14.040000000000001 | USD |
136+
|------------|------------|--------------------------------|-----------------------|------|
137+
| 2024-08-01 | 2024-09-01 | ["Amazon Elastic Compute Cloud | 20.445401999999998 | USD |
138+
| | | - Compute"] | | |
139+
|------------|------------|--------------------------------|-----------------------|------|
140+
| 2024-09-01 | 2024-10-01 | ["Amazon Elastic Compute Cloud | 26.2821332206 | USD |
141+
| | | - Compute"] | | |
142+
|------------|------------|--------------------------------|-----------------------|------|
143+
| 2024-10-01 | 2024-11-01 | ["Amazon Elastic Compute Cloud | 27.126799999999996 | USD |
144+
| | | - Compute"] | | |
145+
|------------|------------|--------------------------------|-----------------------|------|
146+
| 2024-11-01 | 2024-11-30 | ["Amazon Elastic Compute Cloud | 27.1546234373 | USD |
147+
| | | - Compute"] | | |
148+
|------------|------------|--------------------------------|-----------------------|------|
149+
| 2024-11-01 | 2024-11-30 | ["Amazon Virtual Private | 47.5634987792 | USD |
150+
| | | Cloud"] | | |
151+
|------------|------------|--------------------------------|-----------------------|------|
152+
| 2024-11-01 | 2024-11-30 | ["EC2 - Other"] | 50.9307417991 | USD |
153+
|------------|------------|--------------------------------|-----------------------|------|

‎test/robot/functional/stackql_mocked_from_cmd_line.robot‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7532,7 +7532,11 @@ AWS Materialized View and Cast and Multiple Function Query on Resource Costs Exe
75327532
${inputStr} = Set Variable If "${SQL_BACKEND}" == "postgres_tcp" ${postgresInputStr} ${sqliteInputStr}
75337533
${outputStrSQLite} = Get File ${REPOSITORY_ROOT}${/}test${/}assets${/}expected${/}aws${/}ce${/}ce-cast-real.txt
75347534
${outputStrPostgres} = Get File ${REPOSITORY_ROOT}${/}test${/}assets${/}expected${/}aws${/}ce${/}ce-cast-real-postgres.txt
7535-
${outputStr} = Set Variable If "${SQL_BACKEND}" == "postgres_tcp" ${outputStrPostgres} ${outputStrSQLite}
7535+
${outputStrWindows} = Get File ${REPOSITORY_ROOT}${/}test${/}assets${/}expected${/}aws${/}ce${/}ce-cast-real-windows.txt
7536+
${outputStr} = Set Variable If
7537+
... "${SQL_BACKEND}" == "postgres_tcp" ${outputStrPostgres}
7538+
... "${IS_WINDOWS}" == "1" ${outputStrWindows}
7539+
... ${outputStrSQLite}
75367540
Should Stackql Exec Inline Equal Both Streams
75377541
... ${STACKQL_EXE}
75387542
... ${OKTA_SECRET_STR}

0 commit comments

Comments
 (0)