chore: set up CI on v2 branch (#510)

* chore: add basic CI for v2 branch

* fix: use anonymous credentials, blacken

Author: busunkim96

.github/workflows/docs.yml

@@ -0,0 +1,38 @@
+on:
+  pull_request:
+    branches:
+      - v2
+name: docs
+jobs:
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Setup Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.8"
+    - name: Install nox
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install nox
+    - name: Run docs
+      run: |
+        nox -s docs
+  docfx:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Setup Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.8"
+    - name: Install nox
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install nox
+    - name: Run docfx
+      run: |
+        nox -s docfx

.github/workflows/lint.yml

@@ -0,0 +1,25 @@
+on:
+  pull_request:
+    branches:
+      - v2
+name: lint
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Setup Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.8"
+    - name: Install nox
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install nox
+    - name: Run lint
+      run: |
+        nox -s lint
+    - name: Run lint_setup_py
+      run: |
+        nox -s lint_setup_py

.github/workflows/unittest.yml

@@ -0,0 +1,57 @@
+on:
+  pull_request:
+    branches:
+      - v2
+name: unittest
+jobs:
+  unit:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python: ['3.6', '3.7', '3.8']
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Setup Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install nox
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install nox
+    - name: Run unit tests
+      env:
+        COVERAGE_FILE: .coverage-${{ matrix.python }}
+      run: |
+        nox -s unit-${{ matrix.python }}
+    - name: Upload coverage results
+      uses: actions/upload-artifact@v3
+      with:
+        name: coverage-artifacts
+        path: .coverage-${{ matrix.python }}
+
+  cover:
+    runs-on: ubuntu-latest
+    needs:
+        - unit
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Setup Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.8"
+    - name: Install coverage
+      run: |
+        python -m pip install --upgrade setuptools pip wheel
+        python -m pip install coverage
+    - name: Download coverage results
+      uses: actions/download-artifact@v3
+      with:
+        name: coverage-artifacts
+        path: .coverage-results/
+    - name: Report coverage results
+      run: |
+        coverage combine .coverage-results/.coverage*
+        coverage report --show-missing --fail-under=99

.kokoro/release.sh

@@ -26,7 +26,7 @@ python3 -m pip install --upgrade twine wheel setuptools
 export PYTHONUNBUFFERED=1
 
 # Move into the package, build the distribution and upload.
-TWINE_PASSWORD=$(cat "${KOKORO_GFILE_DIR}/secret_manager/google-cloud-pypi-token")
+TWINE_PASSWORD=$(cat "${KOKORO_KEYSTORE_DIR}/73713_google-cloud-pypi-token-keystore-1")
 cd github/python-logging
 python3 setup.py sdist bdist_wheel
 twine upload --username __token__ --password "${TWINE_PASSWORD}" dist/*

.kokoro/release/common.cfg

@@ -23,8 +23,18 @@ env_vars: {
     value: "github/python-logging/.kokoro/release.sh"
 }
 
+# Fetch PyPI password
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "google-cloud-pypi-token-keystore-1"
+    }
+  }
+}
+
 # Tokens needed to report release status back to GitHub
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem,google-cloud-pypi-token"
+  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
 }

docs/conf.py

@@ -361,7 +361,10 @@
 intersphinx_mapping = {
     "python": ("https://python.readthedocs.org/en/latest/", None),
     "google-auth": ("https://googleapis.dev/python/google-auth/latest/", None),
-    "google.api_core": ("https://googleapis.dev/python/google-api-core/latest/", None,),
+    "google.api_core": (
+        "https://googleapis.dev/python/google-api-core/latest/",
+        None,
+    ),
     "grpc": ("https://grpc.github.io/grpc/python/", None),
     "proto-plus": ("https://proto-plus-python.readthedocs.io/en/latest/", None),
     "protobuf": ("https://googleapis.dev/python/protobuf/latest/", None),

google/cloud/logging_v2/_gapic.py

@@ -278,7 +278,12 @@ def sink_get(self, sink_name):
         )
 
     def sink_update(
-        self, sink_name, filter_, destination, *, unique_writer_identity=False,
+        self,
+        sink_name,
+        filter_,
+        destination,
+        *,
+        unique_writer_identity=False,
     ):
         """Update a sink resource.
 
@@ -305,7 +310,11 @@ def sink_update(
                   protobuf to a dictionary).
         """
         name = sink_name.split("/")[-1]  # parse name out of full resoure name
-        sink_pb = LogSink(name=name, filter=filter_, destination=destination,)
+        sink_pb = LogSink(
+            name=name,
+            filter=filter_,
+            destination=destination,
+        )
 
         request = UpdateSinkRequest(
             sink_name=sink_name,
@@ -341,7 +350,7 @@ def sink_delete(self, sink_name):
 
 
 class _MetricsAPI(object):
-    """Helper mapping sink-related APIs. """
+    """Helper mapping sink-related APIs."""
 
     def __init__(self, gapic_api, client):
         self._gapic_api = gapic_api
@@ -363,7 +372,9 @@ def list_metrics(self, project, *, page_size=0, page_token=None):
         """
         path = f"projects/{project}"
         request = ListLogMetricsRequest(
-            parent=path, page_size=page_size, page_token=page_token,
+            parent=path,
+            page_size=page_size,
+            page_token=page_token,
         )
         response = self._gapic_api.list_log_metrics(request=request)
         page_iter = iter(response)
@@ -414,7 +425,11 @@ def metric_get(self, project, metric_name):
         )
 
     def metric_update(
-        self, project, metric_name, filter_, description,
+        self,
+        project,
+        metric_name,
+        filter_,
+        description,
     ):
         """Update a metric resource.
 
@@ -430,7 +445,11 @@ def metric_update(
                   protobuf to a dictionary).
         """
         path = f"projects/{project}/metrics/{metric_name}"
-        metric_pb = LogMetric(name=path, filter=filter_, description=description,)
+        metric_pb = LogMetric(
+            name=path,
+            filter=filter_,
+            description=description,
+        )
         metric_pb = self._gapic_api.update_log_metric(
             metric_name=path, metric=metric_pb
         )

google/cloud/logging_v2/_http.py

@@ -441,18 +441,18 @@ def metric_get(self, project, metric_name):
     def metric_update(self, project, metric_name, filter_, description):
         """Update a metric resource.
 
-        See
-        https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/update
-
-       Args:
-            project (str): ID of the project containing the metric.
-            metric_name (str): the name of the metric
-            filter_ (str): the advanced logs filter expression defining the
-                entries exported by the metric.
-            description (str): description of the metric.
+         See
+         https://cloud.google.com/logging/docs/reference/v2/rest/v2/projects.metrics/update
 
-        Returns:
-            dict: The returned (updated) resource.
+        Args:
+             project (str): ID of the project containing the metric.
+             metric_name (str): the name of the metric
+             filter_ (str): the advanced logs filter expression defining the
+                 entries exported by the metric.
+             description (str): description of the metric.
+
+         Returns:
+             dict: The returned (updated) resource.
         """
         target = f"/projects/{project}/metrics/{metric_name}"
         data = {"name": metric_name, "filter": filter_, "description": description}

google/cloud/logging_v2/client.py

@@ -114,7 +114,7 @@ def __init__(
             client_options (Optional[Union[dict, google.api_core.client_options.ClientOptions]]):
                 Client options used to set user options
                 on the client. API Endpoint should be set through client_options.
-            """
+        """
         super(Client, self).__init__(
             project=project,
             credentials=credentials,

google/cloud/logging_v2/handlers/transports/sync.py

@@ -42,5 +42,7 @@ def send(self, record, message, **kwargs):
         """
         info = {"message": message, "python_logger": record.name}
         self.logger.log_struct(
-            info, severity=_helpers._normalize_severity(record.levelno), **kwargs,
+            info,
+            severity=_helpers._normalize_severity(record.levelno),
+            **kwargs,
         )