Merge remote-tracking branch 'origin/main' into scc-org-mgt-etd-api-create-get-upd-list-del

merge remote to local branch.

Author: vijaykanthm

appengine/standard_python3/bundled-services/blobstore/django/main_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import re
 import subprocess
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

appengine/standard_python3/bundled-services/blobstore/flask/main_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import re
 import subprocess
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

appengine/standard_python3/bundled-services/blobstore/wsgi/main_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import re
 import subprocess
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=5)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

appengine/standard_python3/bundled-services/deferred/django/main_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

appengine/standard_python3/bundled-services/deferred/flask/main_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

appengine/standard_python3/bundled-services/deferred/wsgi/main_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

appengine/standard_python3/bundled-services/mail/django/main_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

appengine/standard_python3/bundled-services/mail/flask/main_test.py

@@ -13,13 +13,16 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import uuid
 
 import backoff
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -36,7 +39,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

appengine/standard_python3/bundled-services/mail/wsgi/main_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+import os
 import subprocess
 import time
 import uuid
@@ -21,6 +22,8 @@
 import pytest
 import requests
 
+project_id = os.environ["GOOGLE_CLOUD_PROJECT"]
+
 
 @backoff.on_exception(backoff.expo, Exception, max_tries=3)
 def gcloud_cli(command):
@@ -37,7 +40,7 @@ def gcloud_cli(command):
 
     Raises Exception with the stderr output of the last attempt on failure.
     """
-    full_command = f"gcloud {command} --quiet --format=json"
+    full_command = f"gcloud {command} --quiet --format=json --project {project_id}"
     print("Running command:", full_command)
 
     output = subprocess.run(

cloud-sql/mysql/sqlalchemy/connect_connector.py

@@ -41,7 +41,8 @@ def connect_with_connector() -> sqlalchemy.engine.base.Engine:
 
     ip_type = IPTypes.PRIVATE if os.environ.get("PRIVATE_IP") else IPTypes.PUBLIC
 
-    connector = Connector(ip_type)
+    # initialize Cloud SQL Python Connector object
+    connector = Connector(ip_type=ip_type, refresh_strategy="LAZY")
 
     def getconn() -> pymysql.connections.Connection:
         conn: pymysql.connections.Connection = connector.connect(