Merge branch 'master' into anurag-patch

Author: sqrrrl

.github/ISSUE_TEMPLATE.md

@@ -16,7 +16,7 @@ TODo...
 1.
 1.
 
-# Specifications
+## Specifications
 
 - Python version (`python --version`)
 - OS (Mac/Linux/Windows)

.github/workflows/ci.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Fetch and Diff PR with base from which it was cloned
         if: ${{ github.event.pull_request.base.sha }}
         run: |
-          git fetch origin main "${{ github.event.pull_request.base.sha }}"
+          git fetch origin master "${{ github.event.pull_request.base.sha }}"
           git diff  --diff-filter=ACM --name-only "${{ github.event.pull_request.base.sha }}" "${{ github.sha }}" > "${HOME}/changed_files.txt"
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2

.github/workflows/lint.yaml

@@ -12,18 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 name: Lint
-
-on: [push, pull_request]
-
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 jobs:
   lint:
+    concurrency:
+      group: ${{ github.head_ref || github.ref }}
+      cancel-in-progress: true
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.4.0
       - uses: github/super-linter/[email protected]
         env:
           ERROR_ON_MISSING_EXEC_BIT: true
           VALIDATE_JSCPD: false
           VALIDATE_PYTHON_BLACK: false
           VALIDATE_ALL_CODEBASE: ${{ github.event_name == 'push' }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CONTRIBUTING.md

@@ -8,10 +8,10 @@ have to jump a couple of legal hurdles.
 Please fill out either the individual or corporate Contributor License Agreement
 (CLA).
 
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an
-    [individual CLA](https://developers.google.com/open-source/cla/individual).
-  * If you work for a company that wants to allow you to contribute your work,
+* If you are an individual writing original source code and you're sure you
+  own the intellectual property, then you'll need to sign an
+  [individual CLA](https://developers.google.com/open-source/cla/individual).
+* If you work for a company that wants to allow you to contribute your work,
     then you'll need to sign a
     [corporate CLA](https://developers.google.com/open-source/cla/corporate).
 
@@ -21,10 +21,10 @@ accept your pull requests.
 
 ## Contributing A Patch
 
-1. Submit an issue describing your proposed change to the repo in question.
-1. The repo owner will respond to your issue promptly.
+1. Submit an issue describing your proposed change to the repository in question.
+1. The repository owner will respond to your issue promptly.
 1. If your proposed change is accepted, and you haven't already done so, sign a Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
+1. Fork the desired repository, develop and test your code changes.
 1. Ensure that your code adheres to the existing style in the sample to which you are contributing.
 1. Ensure that your code has an appropriate set of unit tests which all pass.
 1. Submit a pull request!

admin_sdk/directory/README.md

@@ -7,12 +7,12 @@ Directory API.
 
 ## Install
 
-```
+```shell
 pip install -r requirements.txt
 ```
 
 ## Run
 
-```
+```shell
 python quickstart.py
 ```

admin_sdk/directory/quickstart.py

@@ -14,11 +14,13 @@
 
 # [START admin_sdk_directory_quickstart]
 from __future__ import print_function
+
 import os.path
-from googleapiclient.discovery import build
-from google_auth_oauthlib.flow import InstalledAppFlow
+
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
+from google_auth_oauthlib.flow import InstalledAppFlow
+from googleapiclient.discovery import build
 
 # If modifying these scopes, delete the file token.json.
 SCOPES = ['https://www.googleapis.com/auth/admin.directory.user']

admin_sdk/reports/README.md

@@ -7,12 +7,12 @@ that makes requests to the Google Admin SDK Reports API.
 
 ## Install
 
-```
+```shell
 pip install -r requirements.txt
 ```
 
 ## Run
 
-```
+```shell
 python quickstart.py
 ```

admin_sdk/reports/quickstart.py

@@ -14,11 +14,13 @@
 
 # [START admin_sdk_reports_quickstart]
 from __future__ import print_function
+
 import os.path
-from googleapiclient.discovery import build
-from google_auth_oauthlib.flow import InstalledAppFlow
+
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
+from google_auth_oauthlib.flow import InstalledAppFlow
+from googleapiclient.discovery import build
 
 # If modifying these scopes, delete the file token.json.
 SCOPES = ['https://www.googleapis.com/auth/admin.reports.audit.readonly']

admin_sdk/reseller/README.md

@@ -7,12 +7,12 @@ that makes requests to the Google Admin SDK Reseller API.
 
 ## Install
 
-```
+```shell
 pip install -r requirements.txt
 ```
 
 ## Run
 
-```
+```shell
 python quickstart.py
 ```

admin_sdk/reseller/quickstart.py

@@ -14,11 +14,13 @@
 
 # [START admin_sdk_reseller_quickstart]
 from __future__ import print_function
+
 import os.path
-from googleapiclient.discovery import build
-from google_auth_oauthlib.flow import InstalledAppFlow
+
 from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
+from google_auth_oauthlib.flow import InstalledAppFlow
+from googleapiclient.discovery import build
 
 # If modifying these scopes, delete the file token.json.
 SCOPES = ['https://www.googleapis.com/auth/apps.order']