Fix loading of commitments_schema. (GoogleCloudPlatform#455)

Code expects a commitments_schema.schema field, so define it.
Other minor fixes:

- Add creator to the bigquery dataset so Terraform doesn't complain when
  it's added post creation.
- Remove build product files in the tests directory.
- Add .gitingore for terraform files.
- Cleanup Readme.md a bit.

Co-authored-by: Jacob Ferriero <jferriero@google.com>

tools/cuds-prioritized-attribution/composer/dependencies/commitments_schema.py

@@ -1,43 +1,42 @@
 # Copyright 2020 Google LLC
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an 'AS IS' BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 
-[{"type":"STRING",
-  "name":"id",
-  "mode":"REQUIRED"},
- {"type":"STRING",
-  "name":"folder_ids",
-  "mode":"NULLABLE"},
-  {"type":"STRING",
-  "name":"project_ids",
-  "mode":"NULLABLE"},
- {"type":"STRING",
-  "name":"commitments_unit_type",
-  "mode":"REQUIRED"},
-  {"type":"STRING",
-  "name":"commitments_cud_type",
-  "mode":"REQUIRED"},
-  {"type":"NUMERIC",
-  "name":"commitments_amount",
-  "mode":"REQUIRED"},
-  {"type":"STRING",
-  "name":"commitments_region",
-  "mode":"REQUIRED"},
-  {"type":"DATE",
-  "name":"commit_start_date",
-  "mode":"REQUIRED"},
-  {"type":"DATE",
-  "name":"commit_end_date",
-  "mode":"REQUIRED"}
-]
+schema = [{'type': 'STRING',
+           'name': 'id',
+           'mode': 'REQUIRED'},
+          {'type': 'STRING',
+           'name': 'folder_ids',
+           'mode': 'NULLABLE'},
+          {'type': 'STRING',
+           'name': 'project_ids',
+           'mode': 'NULLABLE'},
+          {'type': 'STRING',
+           'name': 'commitments_unit_type',
+           'mode': 'REQUIRED'},
+          {'type': 'STRING',
+           'name': 'commitments_cud_type',
+           'mode': 'REQUIRED'},
+          {'type': 'NUMERIC',
+           'name': 'commitments_amount',
+           'mode': 'REQUIRED'},
+          {'type': 'STRING',
+           'name': 'commitments_region',
+           'mode': 'REQUIRED'},
+          {'type': 'DATE',
+           'name': 'commit_start_date',
+           'mode': 'REQUIRED'},
+          {'type': 'DATE',
+           'name': 'commit_end_date',
+           'mode': 'REQUIRED'}]

tools/cuds-prioritized-attribution/composer/dependencies/helper_function.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+from typing import Dict
 from typing import List
 from google.cloud import bigquery
 from google.cloud import storage
@@ -110,16 +111,16 @@ def local_to_gcs(bucket_name: str, object_name: str, input_file: str) -> None:
         blob.upload_from_file(file_obj)
 
 
-def convert_to_schema(commitment_schema: str) -> List[bigquery.SchemaField]:
+def convert_to_schema(schema: List[Dict[str, str]) -> List[bigquery.SchemaField]:
     """Read the schema as a JSON and reformats as an array.
 
     Args:
-        commitment_schema: String to convert to JSON which holds the schema
+        schema: list of dicts to convert to list of SchemaField
 
     Returns:
         List of bigquery.SchemaField objects holding the schema.
     """
-    input_fields = json.loads(commitment_schema)
+    input_fields = schema
     schema = []
     for input_field in input_fields:
         schema.append(

tools/cuds-prioritized-attribution/terraform/.gitignore

@@ -0,0 +1,4 @@
+.terraform
+terraform.tfstate*
+terraform.tfvars
+plan.*

tools/cuds-prioritized-attribution/terraform/main.tf

@@ -72,11 +72,20 @@ resource "google_project_iam_binding" "composer_binding" {
   role    = "roles/composer.worker"
 }
 
+# Get the creator's user name.
+data "google_client_openid_userinfo" "me" {
+}
+
+
 # Grant BigQuery Permissions for Service Account on Corrected Dataset
 resource "google_bigquery_dataset" "corrected_dataset" {
   dataset_id = var.corrected_dataset_id
   location   = var.billing_export_location
-
+  depends_on = [google_project_service.bqapi]
+  access {
+    role          = "OWNER"
+    user_by_email = data.google_client_openid_userinfo.me.email
+  }
   access {
     role          = "WRITER"
     user_by_email = google_service_account.cud_service_account.email