Merge branch 'main' into cicd_tutorial

leahecole · web-flow · commit 9724642be46a · 2021-12-09T13:38:33.000-08:00
diff --git a/cloud-sql/postgres/sqlalchemy/main.py b/cloud-sql/postgres/sqlalchemy/main.py
@@ -164,6 +164,8 @@ def init_unix_connection_engine(db_config):
         # Equivalent URL:
         # postgresql+pg8000://<db_user>:<db_pass>@/<db_name>
         #                         ?unix_sock=<socket_path>/<cloud_sql_instance_name>/.s.PGSQL.5432
+        # Note: Some drivers require the `unix_sock` query parameter to use a different key.
+        # For example, 'psycopg2' uses the path set to `host` in order to connect successfully.
         sqlalchemy.engine.url.URL.create(
             drivername="postgresql+pg8000",
             username=db_user,  # e.g. "my-database-user"
diff --git a/iam/api-client/requirements.txt b/iam/api-client/requirements.txt
@@ -1,5 +1,5 @@
 google-api-python-client==2.33.0
 google-auth==2.3.3
 google-auth-httplib2==0.1.0
-boto3==1.20.21
+boto3==1.20.22
 botocore==1.23.22
diff --git a/storage/s3-sdk/requirements.txt b/storage/s3-sdk/requirements.txt
@@ -1 +1 @@
-boto3==1.20.21
+boto3==1.20.22
