From 3b5ea8f7f8f5a7662b655d4e641286eefc1381f4 Mon Sep 17 00:00:00 2001
From: Felix Wang <wangfelix98@gmail.com>
Date: Fri, 22 Oct 2021 11:30:40 -0700
Subject: [PATCH] Fix issues with lint test and upgrade pip version (#1964)

---
 .github/workflows/integration_tests.yml    | 3 +++
 .github/workflows/linter.yml               | 3 +++
 .github/workflows/pr_integration_tests.yml | 3 +++
 .github/workflows/unit_tests.yml           | 4 ++--
 sdk/python/feast/infra/gcp.py              | 4 ++--
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 19bc08e518..64a32bbed7 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -50,6 +50,9 @@ jobs:
           aws-region: us-west-2
       - name: Use AWS CLI
         run: aws sts get-caller-identity
+      - name: Upgrade pip version
+        run: |
+          pip install --upgrade "pip>=21.3.1"
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index aa39225be6..e2763bf2ae 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -13,6 +13,9 @@ jobs:
         with:
           python-version: "3.7"
           architecture: x64
+      - name: Upgrade pip version
+        run: |
+          pip install --upgrade "pip>=21.3.1"
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/.github/workflows/pr_integration_tests.yml b/.github/workflows/pr_integration_tests.yml
index 16e23d31bb..816be27cbf 100644
--- a/.github/workflows/pr_integration_tests.yml
+++ b/.github/workflows/pr_integration_tests.yml
@@ -61,6 +61,9 @@ jobs:
           aws-region: us-west-2
       - name: Use AWS CLI
         run: aws sts get-caller-identity
+      - name: Upgrade pip version
+        run: |
+          pip install --upgrade "pip>=21.3.1"
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
index 5eeb4b27ea..dd01a63a5e 100644
--- a/.github/workflows/unit_tests.yml
+++ b/.github/workflows/unit_tests.yml
@@ -20,9 +20,9 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64
-      - name: Downgrade  pip
+      - name: Upgrade pip version
         run: |
-          pip install --upgrade "pip<21.3"
+          pip install --upgrade "pip>=21.3.1"
       - name: Get pip cache dir
         id: pip-cache
         run: |
diff --git a/sdk/python/feast/infra/gcp.py b/sdk/python/feast/infra/gcp.py
index 1dd1eefe2d..463a39af5a 100644
--- a/sdk/python/feast/infra/gcp.py
+++ b/sdk/python/feast/infra/gcp.py
@@ -22,7 +22,7 @@ class GCSRegistryStore(RegistryStore):
     def __init__(self, registry_config: RegistryConfig, repo_path: Path):
         uri = registry_config.path
         try:
-            from google.cloud import storage
+            import google.cloud.storage as storage
         except ImportError as e:
             from feast.errors import FeastExtrasDependencyImportError
 
@@ -34,7 +34,7 @@ def __init__(self, registry_config: RegistryConfig, repo_path: Path):
         self._blob = self._uri.path.lstrip("/")
 
     def get_registry_proto(self):
-        from google.cloud import storage
+        import google.cloud.storage as storage
         from google.cloud.exceptions import NotFound
 
         file_obj = TemporaryFile()