revert changes to common/ files

Author: dandye

common/chronicle_auth.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

common/chronicle_auth_test.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,12 +16,13 @@
 
 import os
 import tempfile
+
 import unittest
 from unittest import mock
-
-import chronicle_auth
 from google.oauth2 import service_account
 
+from . import chronicle_auth
+
 
 class ChronicleAuthTest(unittest.TestCase):
 

common/datetime_converter.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

common/datetime_converter_test.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2021 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 import datetime
 import unittest
 
-import datetime_converter
+from . import datetime_converter
 
 
 class DatetimeConverterTest(unittest.TestCase):

common/project_id.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

common/project_instance.py

@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

common/regions.py

@@ -20,15 +20,22 @@
 import argparse
 
 REGION_LIST = (
+    "asia-northeast1",
     "asia-south1",
     "asia-southeast1",
     "australia-southeast1",
+    "eu",
     "europe",
+    "europe-west12",
     "europe-west2",
     "europe-west3",
     "europe-west6",
+    "europe-west9",
+    "me-central1",
     "me-central2",
     "me-west1",
+    "northamerica-northeast2",
+    "southamerica-east1",
     "us",
 )
 
@@ -51,3 +58,21 @@ def url(base_url: str, region: str) -> str:
   if region != "us":
     base_url = base_url.replace("https://", f"https://{region}-")
   return base_url
+
+
+def url_always_prepend_region(base_url: str, region: str) -> str:
+  """Returns a regionalized URL.
+
+  Args:
+    base_url: URL pointing to Chronicle API
+    region: region in which the target project is located
+
+  Returns:
+    A string containing a regionalized URL. Unlike the url() function,
+    this function always prepends region; this function also checks whether
+    the URL already has the region prefix, and if so, returns the URL unchanged.
+    v1alpha samples should use this function.
+  """
+  if not base_url.startswith(f"https://{region}-"):
+    base_url = base_url.replace("https://", f"https://{region}-")
+  return base_url

common/regions_test.py

@@ -26,13 +26,33 @@ def test_url_asia_southeast1(self):
         regions.url("https://test", "asia-southeast1"),
         "https://asia-southeast1-test")
 
-  def test_url_europe(self):
+  def test_url_eu(self):
     self.assertEqual(
-        regions.url("https://test", "europe"), "https://europe-test")
+        regions.url("https://test", "eu"), "https://eu-test")
 
   def test_url_us(self):
     self.assertEqual(regions.url("https://test", "us"), "https://test")
 
+  def test_url_always_prepend_region_us(self):
+    self.assertEqual(
+        regions.url_always_prepend_region("https://test", "us"),
+        "https://us-test",
+    )
+
+  def test_url_always_prepend_region_e(self):
+    self.assertEqual(
+        regions.url_always_prepend_region("https://test", "eu"),
+        "https://eu-test",
+    )
+
+  def test_url_always_prepend_region_twice(self):
+    url_once = regions.url_always_prepend_region("https://test", "eu")
+    url_twice = regions.url_always_prepend_region(url_once, "eu")
+    self.assertEqual(
+        "https://eu-test",
+        url_twice,
+    )
+
 
 if __name__ == "__main__":
   unittest.main()