POC: alternate project owner and insecure connections

cmlutils/base.py

@@ -17,13 +17,15 @@ def __init__(
         api_key: str,
         ca_path: str,
         project_slug: str,
+        skip_tls_verification: bool = False,
     ) -> None:
         self.host = host
         self.username = username
         self.project_name = project_name
         self.api_key = api_key
         self.ca_path = ca_path
         self.project_slug = project_slug
+        self.skip_tls_verification = skip_tls_verification
 
     @property
     def apiv2_key(self) -> str:
@@ -42,6 +44,7 @@ def apiv2_key(self) -> str:
             api_key=self.api_key,
             json_data=json_data,
             ca_path=self.ca_path,
+            skip_tls_verification=self.skip_tls_verification,
         )
         response_dict = response.json()
         _apiv2_key = response_dict["apiKey"]

cmlutils/cdswctl.py

@@ -23,11 +23,11 @@ def _get_cdswctl_download_url(host: str) -> str:
     return final_url
 
 
-def _download_and_extract(url: str, ca_path: str):
+def _download_and_extract(url: str, ca_path: str, skip_tls_verification: bool = False):
     file_name = url.split("/")[-1]
     dir_path = _cdswctl_tmp_dir_path()
     file_path = os.path.join(dir_path, file_name)
-    download_file(url=url, filepath=file_path, ca_path=ca_path)
+    download_file(url=url, filepath=file_path, ca_path=ca_path, skip_tls_verification=skip_tls_verification)
     if Path(constants.BASE_PATH_CDSWCTL) in Path(dir_path).parents:
         tf = tarfile.open(file_path)
         tf.extractall(dir_path)
@@ -51,9 +51,9 @@ def _cdswctl_tmp_dir_path() -> str:
     return dirpath
 
 
-def obtain_cdswctl(host: str, ca_path: str) -> str:
+def obtain_cdswctl(host: str, ca_path: str, skip_tls_verification: bool = False) -> str:
     file_url = _get_cdswctl_download_url(host)
-    expected_cdswctl_path = _download_and_extract(file_url, ca_path=ca_path)
+    expected_cdswctl_path = _download_and_extract(file_url, ca_path=ca_path, skip_tls_verification=skip_tls_verification)
     logging.info(
         "Expected cdsw path for cdswctl for file transfer %s", expected_cdswctl_path
     )

cmlutils/constants.py

@@ -20,6 +20,7 @@
 OUTPUT_DIR_KEY = "output_dir"
 PROJECT_NAME_KEY = "project_name"
 CA_PATH_KEY = "ca_path"
+SKIP_TLS_VERIFICATION_KEY = "skip_tls_verification"
 MAX_API_PAGE_LENGTH = 30
 
 
@@ -56,7 +57,7 @@ class ApiV1Endpoints(Enum):
     API_KEY = "/api/v1/users/$username/apikey"
     RUNTIMES = "/api/v1/runtimes"
     USER_INFO = "/api/v1/users/$username"
-    PROJECTS_SUMMARY = "/api/v1/users/$username/projects-summary?all=true&context=$username&sortColumn=updated_at&projectName=$projectName&limit=$limit&offset=$offset"
+    PROJECTS_SUMMARY = "/api/v1/users/$username/projects-summary?all=true&scope=all&context=$username&sortColumn=updated_at&projectName=$projectName&limit=$limit&offset=$offset"
 
 
 """Mapping of old fields v1 to new fields of v2"""

cmlutils/project_entrypoint.py

@@ -72,6 +72,9 @@ def _read_config_file(file_path: str, project_name: str):
                 print("Key %s is missing from config file." % (key))
                 raise
         output_config[CA_PATH_KEY] = config.get(project_name, CA_PATH_KEY, fallback="")
+        output_config[constants.SKIP_TLS_VERIFICATION_KEY] = config.getboolean(
+            project_name, constants.SKIP_TLS_VERIFICATION_KEY, fallback=False
+        )
         return output_config
     else:
         print("Validation error: cannot find config file:", file_path)
@@ -103,6 +106,7 @@ def project_export_cmd(project_name):
     apiv1_key = config[API_V1_KEY]
     output_dir = config[OUTPUT_DIR_KEY]
     ca_path = config[CA_PATH_KEY]
+    skip_tls_verification = config[constants.SKIP_TLS_VERIFICATION_KEY]
 
     output_dir = get_absolute_path(output_dir)
     ca_path = get_absolute_path(ca_path)
@@ -121,6 +125,7 @@ def project_export_cmd(project_name):
             ca_path=ca_path,
             project_slug=project_name,
             owner_type="",
+            skip_tls_verification=skip_tls_verification,
         )
         creator_username, project_slug, owner_type = pobj.get_creator_username()
         if creator_username is None:
@@ -139,6 +144,7 @@ def project_export_cmd(project_name):
             apiv1_key=apiv1_key,
             ca_path=ca_path,
             project_slug=project_slug,
+            skip_tls_verification=skip_tls_verification,
         )
         for v in validators:
             validation_response = v.validate()
@@ -164,6 +170,7 @@ def project_export_cmd(project_name):
             ca_path=ca_path,
             project_slug=project_slug,
             owner_type=owner_type,
+            skip_tls_verification=skip_tls_verification,
         )
         start_time = time.time()
         pexport.transfer_project_files(log_filedir=log_filedir)
@@ -225,6 +232,7 @@ def project_import_cmd(project_name, verify):
     apiv1_key = config[API_V1_KEY]
     local_directory = config[OUTPUT_DIR_KEY]
     ca_path = config[CA_PATH_KEY]
+    skip_tls_verification = config[constants.SKIP_TLS_VERIFICATION_KEY]
     local_directory = get_absolute_path(local_directory)
     ca_path = get_absolute_path(ca_path)
     log_filedir = os.path.join(local_directory, project_name, "logs")
@@ -238,6 +246,7 @@ def project_import_cmd(project_name, verify):
         top_level_dir=local_directory,
         ca_path=ca_path,
         project_slug=project_name,
+        skip_tls_verification=skip_tls_verification,
     )
     logging.info("Started importing project: %s", project_name)
     try:
@@ -248,6 +257,7 @@ def project_import_cmd(project_name, verify):
             top_level_directory=local_directory,
             apiv1_key=apiv1_key,
             ca_path=ca_path,
+            skip_tls_verification=skip_tls_verification,
         )
         logging.info("Begin validating for import.")
         for v in validators:
@@ -296,6 +306,7 @@ def project_import_cmd(project_name, verify):
             top_level_dir=local_directory,
             ca_path=ca_path,
             project_slug=project_slug,
+            skip_tls_verification=skip_tls_verification,
         )
         start_time = time.time()
         if verify: