Merge pull request #21 from google/rename_add_a

Renames megalist to megalista

Author: astivi

.github/workflows/python-app.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r megalist_dataflow/requirements.txt
+        pip install -r megalista_dataflow/requirements.txt
     - name: Run tests
       run: |
         ./run_tests.sh

README.md

@@ -1,5 +1,5 @@
 {
-    "jobName": "megalist_daily",
+    "jobName": "megalista_daily",
     "parameters": {
         "developer_token": "Google Ads Developer Token",
         "client_id": "GCP OAuth Client id",
@@ -13,7 +13,7 @@
 	"appsflyer_dev_key": "Apps flyer dev key"
     },
     "environment": {
-        "tempLocation": "gs://megalist-data/temp",
+        "tempLocation": "gs://megalista-data/temp",
         "zone": "us-central1-f"
     }
 }

cloud_config/buyers.json

@@ -18,5 +18,5 @@ if [ $# != 2 ]; then
     exit 1
 fi
 
-pip3 install --user -q -r megalist_dataflow/requirements.txt 
-python3 cloud_config/generate_megalist_token.py --client_id $1 --client_secret $2
+pip3 install --user -q -r megalista_dataflow/requirements.txt 
+python3 cloud_config/generate_megalista_token.py --client_id $1 --client_secret $2

cloud_config/generate_megalist_token.py renamed to cloud_config/generate_megalista_token.py

@@ -1,6 +1,6 @@
 {
-    "name": "Megalist",
-    "description": "Buyers audience generator and uploader",
+    "name": "Megalista",
+    "description": "Data integration automation solution",
     "parameters": [
         {
             "name": "developer_token",
@@ -54,8 +54,9 @@
         },
         {
             "name": "bq_ops_dataset",
-            "label": "Auxiliary BigQuery dataset used for Megalista operations",
-            "help_text": "Auxiliary BigQuery dataset used for Megalista operations"
+            "label": "Auxiliary bigquery dataset used for Megalista operations",
+            "help_text": "Auxiliary bigquery dataset used for Megalista operations",
+            "is_optional": "true"
         },
         {
             "name": "appsflyer_dev_key",

cloud_config/scheduler_sample.json

@@ -15,7 +15,7 @@
 import setuptools
 
 setuptools.setup(
-    name='megalist_dataflow',
+    name='megalista_dataflow',
     version='4.1',
     author='Google',
     author_email='[email protected]',

generate_megalist_token.sh renamed to generate_megalista_token.sh

@@ -13,7 +13,8 @@
 # limitations under the License.
 
 import logging
-from typing import Dict, Any, List
+from typing import Dict, Any, List, Optional
+from apache_beam.options.value_provider import StaticValueProvider
 
 import apache_beam as beam
 from uploaders import utils
@@ -28,7 +29,7 @@
 
 class GoogleAdsCustomerMatchAbstractUploaderDoFn(beam.DoFn):
 
-  def __init__(self, oauth_credentials: OAuthCredentials, developer_token: str):
+  def __init__(self, oauth_credentials: OAuthCredentials, developer_token: StaticValueProvider):
     super().__init__()
     self.oauth_credentials = oauth_credentials
     self.developer_token = developer_token
@@ -83,11 +84,15 @@ def _do_create_list_if_it_does_not_exist(self,
     else:
       logging.getLogger(_DEFAULT_LOGGER).info('List %s found with resource name: %s',
                                               list_name, resource_name)
-    return resource_name
+    return str(resource_name)
 
+<<<<<<< HEAD
   def _get_user_list_resource_name(self, customer_id: str, list_name: str):
     ads_client = utils.get_ads_client(self.oauth_credentials, self.developer_token.get(), customer_id)
 
+=======
+  def _get_user_list_resource_name(self, customer_id: str, list_name: str) -> Optional[str]:
+>>>>>>> Changes to adhere to MyPy
     resource_name = None
     service = self._get_ads_service(customer_id)
 

megalist_dataflow/main.py renamed to megalista_dataflow/main.py

@@ -21,4 +21,4 @@ fi
 
 gcloud config set project $1
 token=$(gcloud auth application-default print-access-token)
-curl -H "Authorization: Bearer $token" -H "Content-Type:application/json" "https://dataflow.googleapis.com/v1b3/projects/$1/locations/$3/templates:launch?gcsPath=gs://$2/templates/megalist" --data-binary "@cloud_config/scheduler.json"
+curl -H "Authorization: Bearer $token" -H "Content-Type:application/json" "https://dataflow.googleapis.com/v1b3/projects/$1/locations/$3/templates:launch?gcsPath=gs://$2/templates/megalista" --data-binary "@cloud_config/scheduler.json"

megalist_dataflow/mappers/__init__.py renamed to megalista_dataflow/mappers/__init__.py

@@ -13,5 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-python3 -m mypy megalist_dataflow 
-python3 -m pytest -vv --cov=megalist_dataflow -W ignore::DeprecationWarning
+python3 -m mypy megalista_dataflow 
+python3 -m pytest -vv --cov=megalista_dataflow -W ignore::DeprecationWarning

megalist_dataflow/mappers/ads_ssd_hashing_mapper.py renamed to megalista_dataflow/mappers/ads_ssd_hashing_mapper.py

@@ -18,7 +18,7 @@ resource "null_resource" "only_one_configuration_provided" {
 locals {
     scheduler_body = <<EOF
     {
-        "jobName": "megalist_daily",
+        "jobName": "megalista_daily",
         "parameters": {
             "developer_token": "${var.developer_token}",
             "client_id": "${var.client_id}",

megalist_dataflow/mappers/ads_user_list_pii_hashing_mapper.py renamed to megalista_dataflow/mappers/ads_user_list_pii_hashing_mapper.py

@@ -19,13 +19,13 @@ if [ $# != 3 ]; then
     exit 1
 fi
 
-echo "Move to megalist_dataflow folder"
-cd megalist_dataflow
+echo "Move to megalista_dataflow folder"
+cd megalista_dataflow
 echo "Configuration GCP project in gcloud"
 gcloud config set project "$1"
 echo "Build Dataflow metadata"
 python3 -m pip install --user -q -r requirements.txt
 python3 -m main --runner DataflowRunner --project "$1" --gcp_project_id "$1" --temp_location "gs://$2/tmp/" --region "$3" --setup_file ./setup.py --template_location "gs://$2/templates/megalista" --num_workers 1 --autoscaling_algorithm=NONE
 echo "Copy megalista_medata to bucket $2"
-gsutil cp megalist_metadata "gs://$2/templates/megalista_metadata"
+gsutil cp megalista_metadata "gs://$2/templates/megalista_metadata"
 cd ..