fix broken variable

datacommonsorg · Dec 19, 2024 · 9fa2c2d · 9fa2c2d
1 parent c7290d5
commit 9fa2c2d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/deploy/terraform-custom-datacommons/modules/locals.tf b/deploy/terraform-custom-datacommons/modules/locals.tf
@@ -32,13 +32,7 @@ locals {
   # Data Commons API protocol
   dc_api_protocol = "https"
 
-  # Data Commons API hostname
-  dc_api_hostname = "api.datacommons.org"
-
-  # Data Commons API protocol
-  dc_api_protocol = "https"
-
-  # Data Commons API root url
+  # Data Commons API root URL
   dc_api_root = "${local.dc_api_protocol}://${local.dc_api_hostname}"
 
   # Shared environment variables used by the Data Commons web service and the Data

diff --git a/deploy/terraform-custom-datacommons/modules/variables.tf b/deploy/terraform-custom-datacommons/modules/variables.tf
@@ -15,6 +15,7 @@
 # Variable definitions
 
 # Required variables
+
 variable "project_id" {
   description = "The GCP project ID where the solution will be deployed"
   type        = string
@@ -31,13 +32,6 @@ variable "dc_api_key" {
 }
 
 # Optional variables
-# Set to your Google Analytics Tag ID to enable Google Analytics tracking.
-# Reference: https://support.google.com/analytics/answer/9539598
-variable "google_analytics_tag_id" {
-  description = "Google Analytics Tag ID"
-  type        = string
-  default     = null
-}
 
 # Optional: If blank, will generate a Maps API key. 
 variable "maps_api_key" {
@@ -64,7 +58,14 @@ variable billing_project_id {
   default     = null
 }
 
+variable "google_analytics_tag_id" {
+  description = "Google Analytics Tag ID"
+  type        = string
+  default     = null
+}
+
 # Data Commons Cloud Storage bucket variables
+
 # If not set, the default is <namespace>-datacommons-data-<project_id>
 variable "dc_gcs_data_bucket_path_override" {
   description = "Custom GCS data bucket path."
@@ -78,7 +79,8 @@ variable "dc_gcs_data_bucket_location" {
   default     = "US"
 }
 
-## Data Commons Cloud SQL instance variables
+# Data Commons Cloud SQL instance variables
+
 variable "mysql_instance_name" {
   description = "The name of the MySQL instance"
   type        = string
@@ -129,7 +131,8 @@ variable "mysql_deletion_protection" {
   default     = false
 }
 
-## Data Commons Cloud Run service variables
+# Data Commons Cloud Run service variables
+
 variable "dc_web_service_image" {
   description = "Container image for Cloud Run service"
   type        = string
@@ -154,7 +157,8 @@ variable "make_dc_web_service_public" {
   default     = true
 }
 
-## Data Commons Cloud Run job variables
+#  Data Commons Cloud Run job variables
+
 variable "dc_data_job_image" {
   description = "The container image for the data job"
   type        = string
@@ -173,7 +177,8 @@ variable "dc_data_job_memory" {
   default     = "8G"
 }
 
-## Data Commons Cloud VPC Network variables
+# Data Commons Cloud VPC Network variables
+
 variable "vpc_network_name" {
   description = "VPC network name to use"
   type        = string
@@ -192,7 +197,8 @@ variable "vpc_base_cidr_block" {
   default     = "10.8.0.0/24"
 }
 
-## Data Commons Cloud Redis Memorystore instance variables
+# Data Commons Cloud Redis Memorystore instance variables
+
 variable "enable_redis" {
   description = "Enable redis instance in this deployment"
   type        = bool

diff --git a/import b/import
diff --git a/mixer b/mixer
+1 −1		run_test.sh
+1 −3		simple/requirements.txt
+57 −69		simple/stats/config.py
+41 −47		simple/stats/db.py
+14 −13		simple/stats/entities_importer.py
+22 −19		simple/stats/events_importer.py
+3 −3		simple/stats/main.py
+8 −7		simple/stats/mcf_importer.py
+23 −22		simple/stats/nl.py
+14 −13		simple/stats/nodes.py
+17 −14		simple/stats/observations_importer.py
+19 −22		simple/stats/reporter.py
+130 −154		simple/stats/runner.py
+11 −10		simple/stats/variable_per_row_importer.py
+34 −106		simple/tests/stats/config_test.py
+26 −40		simple/tests/stats/db_test.py
+13 −23		simple/tests/stats/entities_importer_test.py
+19 −23		simple/tests/stats/events_importer_test.py
+19 −26		simple/tests/stats/mcf_importer_test.py
+9 −12		simple/tests/stats/nl_test.py
+16 −40		simple/tests/stats/nodes_test.py
+10 −20		simple/tests/stats/observations_importer_test.py
+24 −37		simple/tests/stats/runner_test.py
+2 −3		simple/tests/stats/schema_test.py
+0 −48		simple/tests/stats/test_data/runner/config/config_exclude_subdirs.json
+0 −48		simple/tests/stats/test_data/runner/config/config_include_subdirs.json
+0 −2		simple/tests/stats/test_data/runner/expected/with_subdirs_excluded/key_value_store.db.csv
+0 −4		simple/tests/stats/test_data/runner/expected/with_subdirs_excluded/nl/sentences.csv
+0 −9		simple/tests/stats/test_data/runner/expected/with_subdirs_excluded/observations.db.csv
+0 −65		simple/tests/stats/test_data/runner/expected/with_subdirs_excluded/triples.db.csv
+0 −2		simple/tests/stats/test_data/runner/expected/with_subdirs_included/key_value_store.db.csv
+0 −5		simple/tests/stats/test_data/runner/expected/with_subdirs_included/nl/sentences.csv
+0 −31		simple/tests/stats/test_data/runner/expected/with_subdirs_included/observations.db.csv
+0 −109		simple/tests/stats/test_data/runner/expected/with_subdirs_included/triples.db.csv
+0 −4		simple/tests/stats/test_data/runner/input/with_subdirs/author_entities.csv
+0 −4		simple/tests/stats/test_data/runner/input/with_subdirs/subdir1/article_entities.csv
+0 −5		simple/tests/stats/test_data/runner/input/with_subdirs/subdir1/variables.mcf
+0 −15		simple/tests/stats/test_data/runner/input/with_subdirs/subdir2/subsubdir/countries.csv
+0 −5		simple/tests/stats/test_data/runner/input/with_subdirs/variable_per_row.csv
+0 −6		simple/tests/stats/test_data/runner/input/with_subdirs/variables.mcf
+0 −3		simple/tests/stats/test_data/runner/input/with_subdirs/wikidataids.csv
+7 −10		simple/tests/stats/variable_per_row_importer_test.py
+0 −155		simple/tests/util/file_match_test.py
+0 −115		simple/tests/util/filesystem_test.py
+0 −139		simple/util/file_match.py
+188 −0		simple/util/filehandler.py
+0 −256		simple/util/filesystem.py