MB-57341 Fix typecheck stage in CV

Change-Id: I5b687458cbe373f678da82efb20bcf6a6c578b89
Reviewed-on: https://review.couchbase.org/c/couchbase-cli/+/192464
Well-Formed: Restriction Checker
Reviewed-by: James Lee <james.lee@couchbase.com>
Tested-by: Safian Ali <safian.ali@couchbase.com>

Author: safianalicb

Jenkinsfile

@@ -54,7 +54,7 @@ pipeline {
 
                 timeout(time: 10, unit: "MINUTES") {
                     // Install the tools required to lint and fetch coverage profiles
-                    sh "pip3 install --user pylint==2.10.2 mypy==0.730 coverage==5.2 pytest==5.4.3 autopep8==1.5.7"
+                    sh "pip3 install --user pylint==2.10.2 mypy==1.3.0 coverage==5.2 pytest==5.4.3 autopep8==1.5.7"
 
                     // Install the dependencies required to build/run the cli tools
                     sh "pip3 install --user cryptography==3.4.8 pem==21.2.0 pycryptodome==3.10.1 pyopenssl==20.0.1 python-snappy==0.6.0 requests==2.26.0 requests-toolbelt==0.9.1"

Pipfile

@@ -15,7 +15,7 @@ requests-toolbelt = "==0.9.1"
 [dev-packages]
 autopep8 = "==1.5.7"
 jedi = "==0.18.0"
-mypy = "==0.910"
+mypy = "==1.3.0"
 pylint = "==2.10.2"
 rope = "==0.19.0"
 types-pyopenssl = "==20.0.5"

Pipfile.lock

@@ -74,8 +74,8 @@ FTS
 fts
 fullEviction
 gamesim
-gcs
 GCS
+gcs
 geolocation
 GSI
 gsi

jenkins/.aspell.en.pws

@@ -237,7 +237,7 @@ def filter_source_buckets(self, source_map: Dict[str, Any]) -> List[Dict[str, An
         logging.debug(f'source_buckets: {",".join([return_string(n["name"]) for n in source_buckets])}')
 
         bucket_source = getattr(self.opts, "bucket_source", None)
-        bucket_source = return_string(bucket_source)
+        bucket_source = return_string(bucket_source)  # type: ignore
         if bucket_source:
             logging.debug(f'bucket_source: {bucket_source}')
             source_buckets = [b for b in source_buckets
@@ -983,7 +983,7 @@ def parse_spec(opts, spec: str, port: int) -> Tuple[str, int, str, str, Any]:
 
     pair = netloc.split('@')  # [ "user:pwsd", "host:port" ].
     host = p.hostname
-    port = p.port
+    port = p.port  # type: ignore
     try:
         _ = int(port)
     except ValueError:
@@ -996,7 +996,7 @@ def parse_spec(opts, spec: str, port: int) -> Tuple[str, int, str, str, Any]:
         username = username or (pair[0] + ':').split(':')[0]
         password = password or (pair[0] + ':').split(':')[1]
 
-    return host, port, username, password, p[2]
+    return host, port, username, password, p[2]  # type: ignore
 
 
 def rest_request(host: str, port: int, user: Optional[str], pswd: Optional[str], use_ssl: bool, path: str,

pump.py

@@ -332,7 +332,7 @@ def consume_design(opts, sink_spec: str, sink_map, source_bucket,
                 if conn:
                     conn.close()
                 if err:
-                    return f'error: could not restore design doc id: {id}; response: {response}; err: {err}'
+                    return f'error: could not restore design doc id: {id!r}; response: {response!r}; err: {err!r}'
             else:
                 stmts = sd.get('statements', [])
                 hostname = f'http://{spec_parts[0]}:{spec_parts[1]!s}'
@@ -391,7 +391,7 @@ def consume_design(opts, sink_spec: str, sink_map, source_bucket,
                     if conn:
                         conn.close()
                     if err:
-                        return f'error: could not restore design doc id: {id}; response: {response}; err: {err}'
+                        return f'error: could not restore design doc id: {id!r}; response: {response!r}; err: {err!r}'
                 except Exception as e:
                     return f'error: design sink exception: {e}; couch_api_base: {couch_api_base}'
 

pump_cb.py

@@ -7,7 +7,7 @@
 import struct
 import sys
 import time
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 import snappy  # pylint: disable=import-error
 
@@ -569,7 +569,7 @@ def connect(self) -> Tuple[couchbaseConstants.PUMP_ERROR, Optional[cb_bin_client
 
     @staticmethod
     def connect_mc(host: str, port: int, username: str, password: str, bucket: Optional[str], use_ssl: bool = False,
-                   verify: bool = True, ca_cert: str = None, collections: bool = False) -> \
+                   verify: bool = True, ca_cert: Union[str, None] = None, collections: bool = False) -> \
             Tuple[couchbaseConstants.PUMP_ERROR, Optional[cb_bin_client.MemcachedClient]]:
         return pump.get_mcd_conn(host, port, username, password, bucket, use_ssl=use_ssl, verify=verify,
                                  ca_cert=ca_cert, collections=collections)