Merge pull request #2 from hic-infra/csv-header-accountname

CSV header: Expect `START,END,ACCOUNTNAME,Proj$,COST`
hic-infra · Jul 4, 2024 · 313e687 · 313e687
2 parents caff3bc + 7aca86e
commit 313e687
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/aws_project_costs/project_costs.py b/aws_project_costs/project_costs.py
@@ -118,7 +118,7 @@ def allocate_costs(
 ) -> list[tuple[str, str, str, Any, str, Any]]:
     account_cfg = _get_account_cfg(config, accountname)
 
-    costs = df[(df["START"] == start) & (df["accountname"] == accountname)]
+    costs = df[(df["START"] == start) & (df["ACCOUNTNAME"] == accountname)]
     billing_type = account_cfg["billing-type"]
 
     costs_dict = costs.to_dict(orient="records")
@@ -167,7 +167,7 @@ def analyse_costs_csv(
 ) -> None:
     df = pd.read_csv(
         costs_csv_filename,
-        dtype={"accountname": str, f"{PROJECT_TAG}$": str, "COST": float},
+        dtype={"ACCOUNTNAME": str, f"{PROJECT_TAG}$": str, "COST": float},
         parse_dates=["START", "END"],
         date_format="ISO8601",
     )
@@ -176,7 +176,7 @@ def analyse_costs_csv(
 
     for start in sorted(df["START"].unique()):
         month_costs = df[df["START"] == start]
-        for accountname in month_costs["accountname"].unique():
+        for accountname in month_costs["ACCOUNTNAME"].unique():
             # print(f"Processing {accountname} {start}")
             try:
                 acc_itemised_rows = allocate_costs(

diff --git a/example/2024-01-01_2024-02-01.csv b/example/2024-01-01_2024-02-01.csv
@@ -1,4 +1,4 @@
-START,END,accountname,Proj$,COST
+START,END,ACCOUNTNAME,Proj$,COST
 2024-01-01,2024-02-01,aws-auth,Proj$,21.32342
 2024-01-01,2024-02-01,aws-auth,Proj$project-001,21.24323
 2024-01-01,2024-02-01,aws-auth,Proj$project-002,0.1231