Merge branch 'development' into staging

adswerve · Sep 13, 2023 · a9daaaa · a9daaaa
2 parents 6f2f87a + 63f6fd7
commit a9daaaa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -183,7 +183,7 @@ The GCP resources for the solutions are installed via Deployment Manager.
     gcloud init 
 
     # activate the configuration
-    gcloud config congirations activate {configuration_name} 
+    gcloud config configurations activate {configuration_name} 
 
     # make sure you're in the right GCP project)
     gcloud config configurations list

diff --git a/cf/main.py b/cf/main.py
@@ -382,12 +382,15 @@ def flatten_ga_data(event, context):
          event (dict): Event payload.
          context (google.cloud.functions.Context): Metadata for the event.
     """
+
     input_event = InputValidator(event)
-    output_config = input_event.get_output_configuration()
-    output_config_sharded = output_config["sharded"]
-    output_config_partitioned = output_config["partitioned"]
 
     if input_event.valid_dataset():
+
+        output_config = input_event.get_output_configuration()
+        output_config_sharded = output_config["sharded"]
+        output_config_partitioned = output_config["partitioned"]
+
         ga_source = GaExportedNestedDataStorage(gcp_project=input_event.gcp_project,
                                                 dataset=input_event.dataset,
                                                 table_name=input_event.table_name,

diff --git a/tools/pubsub_message_publish.py b/tools/pubsub_message_publish.py
@@ -13,7 +13,7 @@
 '''*****************************'''
 ''' Configuration Section Start '''
 '''*****************************'''
-topic_id = "ga-flattener-deployment-topic"  # pubsub topic your cloud function is subscribed to Example: [Deployment Name]-topic
+topic_id = "ga4-flattener-deployment-topic"  # pubsub topic your cloud function is subscribed to Example: [Deployment Name]-topic
 project_id = "as-dev-ga4-flattener-320623" # GCP project ID, example:  [PROJECT_ID]
 dry_run = False  # set to False to Backfill.  Setting to True will not pubish any messages to pubsub, but simply show what would have been published.
 # Desired dates to backfill, both start and end are inclusive