Rebase Main into Multi-stream

.github/dependabot.yaml

@@ -0,0 +1,31 @@
+# Copyright 2023 Google LLC
+#
+# 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,
+# 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.
+
+---
+version: 2
+updates:
+  - directories:
+      - /infrastructure/terraform
+    commit-message:
+      prefix: "chore(deps)"
+    package-ecosystem: "terraform"
+    schedule:
+      interval: "daily"
+    groups:
+      terraform:
+        applies-to: version-updates
+        patterns:
+          - hashicorp/*
+          - terraform-google-modules/*
+          - GoogleCloudPlatform/*

CONTRIBUTING.md

@@ -35,40 +35,20 @@ for this purpose.
 
 ### Fork this repo.
 
-Follow the typical Github guide on how to [fork a repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
+Follow the typical GitHub guide on how to [fork a repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
 
 **Note**: 
 1. To keep track of the new releases, configure git to [sync your fork with this upstream repository](https://docs.github.com/en/get-started/quickstart/fork-a-repo#configuring-git-to-sync-your-fork-with-the-upstream-repository).
-2. Don't submit a Pull Request to this upstream Github repo if you don't want to expose your environment configuration. You're at your own risk at exposing your company data.
+2. Don't submit a Pull Request to this upstream GitHub repo if you don't want to expose your environment configuration. You're at your own risk at exposing your company data.
 3. Observe your fork is also public, you cannot make your own fork a private repo.
 
 ### Complete the installation guide
 
-Complete the installation guide in a Google Cloud project in which you're developer and/or owner.
-
-### Configure Continuous Integration recipes
-
-Connect your Github repository by following this [guide](https://cloud.google.com/build/docs/automating-builds/github/connect-repo-github).
-
-In your Google Cloud project, configure Cloud Build triggers to be executed when you push code into your branch. Update the Clould build recipes in the `cloudbuild` folder and deploy them.
-
-### Update GCloud and Install Beta
-
-```bash
-gcloud components update
-gcloud components install beta
-```
-
-### Install packages to define components, run locally and compile pipeline
-
-```bash
-pip install poetry
-poetry install
-```
+Complete the manual installation guide in a Google Cloud project in which you're developer and/or owner for testing purposes.
 
 ### Modify the code and configurations as you prefer
 
-Do all the code changes you wish. 
+Do all the code changes you wish/need. 
 If you're implementing new use cases, add these resources to the existing terraform module components.
 Otherwise, in case you're implementing a new component, implement your own terraform module for it.
 
@@ -80,4 +60,4 @@ Change the values in the terraform templates located in the `infrastructure/terr
 terraform init
 terraform plan
 terraform apply
-```
+```

DEVELOPMENT.md

@@ -2,8 +2,8 @@
 Marketing Analytics Jumpstart consists of an easy, extensible and automated implementation of an end-to-end solution that enables Marketing Technology teams to store, transform, enrich with 1PD and analyze marketing data, and programmatically send predictive events to Google Analytics 4 to support conversion optimization and remarketing campaigns.
 
 ## Developer pre-requisites
-Use Visual Studio Code to develop the solution. Install Gemini Code Assistant, Docker, Github, Hashicopr Terraform, Jinja extensions.
-You should have Python 3, Poetry, Terraform, Git and Docker installed in your developer terminal environment.
+Use Visual Studio Code to develop the solution. Install Gemini Code Assistant, Docker, GitHub, Hashicorp, Terraform, Jinja extensions.
+You should have Python 3, uv, Terraform, Git and Docker installed in your developer terminal environment.
 
 ## Preparing development environment
 
@@ -65,7 +65,6 @@ Here's a brief breakdown of the contents of each folder:
 * * `procedures/`: This folder contains the JINJA template files with the `.sqlx` extension used to generate the stored procedures deployed in BigQuery.
 * * `queries/`: This folder contains the JINJA template files with the `.sqlx` extension used to generate the queries deployed in BigQuery.
 * `templates/`:
-* * `app_payload_template.jinja2`: This file defines the JINJA template used to generate the payload for the Measurement Protocol API used by the Activation Application.
 * * `activation_query`: This folder contains the JINJA template files with the `.sqlx` extension used to generate the SQL queries for each use case used by the Activation Application to get all the predictions to be prepared and send to Google Analytics 4.
 
 ## Out-of-the-box configuration parameters provided by the solution