change 2FA_enabled back to bool

Author: Yue Tu

src/sagemaker/estimator.py

@@ -993,7 +993,7 @@ def __init__(
                     results in cloning the repo specified in 'repo', then checkout the 'master' branch, and checkout
                     the specified commit.
                 ``2FA_enabled``, ``username``, ``password`` and ``token`` are for authentication purpose.
-                ``2FA_enabled`` must be 'True' or 'False' if it is provided. If ``2FA_enabled`` is not provided,
+                ``2FA_enabled`` must be ``True`` or ``False`` if it is provided. If ``2FA_enabled`` is not provided,
                 we consider 2FA as disabled. For GitHub and other Git repos, when ssh urls are provided, it does not
                 make a difference whether 2FA is enabled or disabled; an ssh passphrase should be in local storage.
                 When https urls are provided: if 2FA is disabled, then either token or username+password will

src/sagemaker/git_utils.py

@@ -25,12 +25,12 @@ def git_clone_repo(git_config, entry_point, source_dir=None, dependencies=None):
     and set ``entry_point``, ``source_dir`` and ``dependencies`` to the right file or directory in the repo cloned.
 
     Args:
-        git_config (dict[str, str]): Git configurations used for cloning files, including ``repo``, ``branch``,
+        git_config (dict[str, object]): Git configurations used for cloning files, including ``repo``, ``branch``,
             ``commit``, ``2FA_enabled``, ``username``, ``password`` and ``token``. The fields are optional except
             ``repo``. If ``branch`` is not specified, master branch will be used. If ``commit`` is not specified,
             the latest commit in the required branch will be used. ``2FA_enabled``, ``username``, ``password`` and
             ``token`` are for authentication purpose.
-            ``2FA_enabled`` must be 'True' or 'False' if it is provided. If ``2FA_enabled`` is not provided, we
+            ``2FA_enabled`` must be ``True`` or ``False`` if it is provided. If ``2FA_enabled`` is not provided, we
             consider 2FA as disabled. For GitHub and other Git repos, when ssh urls are provided, it does not make a
             difference whether 2FA is enabled or disabled; an ssh passphrase should be in local storage. When
             https urls are provided: if 2FA is disabled, then either token or username+password will be used for
@@ -97,14 +97,11 @@ def _validate_git_config(git_config):
     if "repo" not in git_config:
         raise ValueError("Please provide a repo for git_config.")
     for key in git_config:
-        if key in git_config and not isinstance(git_config[key], six.string_types):
+        if key == "2FA_enabled":
+            if not isinstance(git_config["2FA_enabled"], bool):
+                raise ValueError("Please enter a bool type for 2FA_enabled'.")
+        elif not isinstance(git_config[key], six.string_types):
             raise ValueError("'{}' must be a string.".format(key))
-    if (
-        "2FA_enabled" in git_config
-        and git_config["2FA_enabled"] != "True"
-        and git_config["2FA_enabled"] != "False"
-    ):
-        raise ValueError("Please enter 'True' or 'False' for 2FA_enabled'.")
 
 
 def _generate_and_run_clone_command(git_config, dest_dir):
@@ -140,7 +137,7 @@ def _clone_command_for_github_like(git_config, dest_dir):
         raise ValueError("Invalid Git url provided.")
     if is_ssh:
         _clone_command_for_github_like_ssh(git_config, dest_dir)
-    elif "2FA_enabled" in git_config and git_config["2FA_enabled"] == "True":
+    elif "2FA_enabled" in git_config and git_config["2FA_enabled"] is True:
         _clone_command_for_github_like_https_2fa_enabled(git_config, dest_dir)
     else:
         _clone_command_for_github_like_https_2fa_disabled(git_config, dest_dir)

src/sagemaker/model.py

@@ -534,7 +534,7 @@ def __init__(
                     results in cloning the repo specified in 'repo', then checkout the 'master' branch, and checkout
                     the specified commit.
                 ``2FA_enabled``, ``username``, ``password`` and ``token`` are for authentication purpose.
-                ``2FA_enabled`` must be 'True' or 'False' if it is provided. If ``2FA_enabled`` is not provided,
+                ``2FA_enabled`` must be ``True`` or ``False`` if it is provided. If ``2FA_enabled`` is not provided,
                 we consider 2FA as disabled. For GitHub and other Git repos, when ssh urls are provided, it does not
                 make a difference whether 2FA is enabled or disabled; an ssh passphrase should be in local storage.
                 When https urls are provided: if 2FA is disabled, then either token or username+password will

tests/integ/test_git.py

@@ -87,7 +87,7 @@ def test_git_support_with_mxnet(sagemaker_local_session):
         "repo": PRIVATE_GIT_REPO,
         "branch": PRIVATE_BRANCH,
         "commit": PRIVATE_COMMIT,
-        "2FA_enabled": "False",
+        "2FA_enabled": False,
         "username": "git-support-test",
         "password": "passw0rd@ %",
     }
@@ -152,7 +152,7 @@ def test_git_support_with_sklearn(sagemaker_local_session, sklearn_full_version)
         "repo": PRIVATE_GIT_REPO_2FA,
         "branch": PRIVATE_BRANCH_2FA,
         "commit": PRIVATE_COMMIT_2FA,
-        "2FA_enabled": "True",
+        "2FA_enabled": True,
         "token": PRIVATE_REPO_TOKEN,
     }
     source_dir = "sklearn"

tests/unit/test_estimator.py

@@ -1066,7 +1066,7 @@ def test_git_support_with_token_2fa(git_clone_repo, sagemaker_session):
         "branch": PRIVATE_BRANCH,
         "commit": PRIVATE_COMMIT,
         "token": "my-token",
-        "2FA_enabled": "True",
+        "2FA_enabled": True,
     }
     entry_point = "entry_point"
     fw = DummyFramework(

tests/unit/test_git_utils.py

@@ -214,7 +214,7 @@ def test_git_clone_repo_with_token_no_2fa(isfile, mkdtemp, check_call):
         "branch": PRIVATE_BRANCH,
         "commit": PRIVATE_COMMIT,
         "token": "08c13d80a861f37150cb5c64520bfe14a85ca191",
-        "2FA_enabled": "False",
+        "2FA_enabled": False,
     }
     entry_point = "entry_point"
     env = os.environ.copy()
@@ -244,7 +244,7 @@ def test_git_clone_repo_with_token_2fa(isfile, mkdtemp, check_call):
         "repo": PRIVATE_GIT_REPO,
         "branch": PRIVATE_BRANCH,
         "commit": PRIVATE_COMMIT,
-        "2FA_enabled": "True",
+        "2FA_enabled": True,
         "username": "username",
         "token": "08c13d80a861f37150cb5c64520bfe14a85ca191",
     }
@@ -325,7 +325,7 @@ def test_git_clone_repo_with_token_2fa_unnecessary_creds_provided(isfile, mkdtem
         "repo": PRIVATE_GIT_REPO,
         "branch": PRIVATE_BRANCH,
         "commit": PRIVATE_COMMIT,
-        "2FA_enabled": "True",
+        "2FA_enabled": True,
         "username": "username",
         "token": "08c13d80a861f37150cb5c64520bfe14a85ca191",
     }
@@ -363,7 +363,7 @@ def test_git_clone_repo_with_username_and_password_wrong_creds(mkdtemp, check_ca
         "repo": PRIVATE_GIT_REPO,
         "branch": PRIVATE_BRANCH,
         "commit": PRIVATE_COMMIT,
-        "2FA_enabled": "False",
+        "2FA_enabled": False,
         "username": "username",
         "password": "wrong-password",
     }
@@ -387,7 +387,7 @@ def test_git_clone_repo_with_token_wrong_creds(mkdtemp, check_call):
         "repo": PRIVATE_GIT_REPO,
         "branch": PRIVATE_BRANCH,
         "commit": PRIVATE_COMMIT,
-        "2FA_enabled": "False",
+        "2FA_enabled": False,
         "token": "wrong-token",
     }
     entry_point = "entry_point"
@@ -410,7 +410,7 @@ def test_git_clone_repo_with_and_token_2fa_wrong_creds(mkdtemp, check_call):
         "repo": PRIVATE_GIT_REPO,
         "branch": PRIVATE_BRANCH,
         "commit": PRIVATE_COMMIT,
-        "2FA_enabled": "False",
+        "2FA_enabled": False,
         "token": "wrong-token",
     }
     entry_point = "entry_point"

tests/unit/test_model.py

@@ -717,7 +717,7 @@ def test_git_support_with_token_2fa(tar_and_upload_dir, git_clone_repo, sagemake
         "branch": PRIVATE_BRANCH,
         "commit": PRIVATE_COMMIT,
         "token": "my-token",
-        "2FA_enabled": "True",
+        "2FA_enabled": True,
     }
     model = DummyFrameworkModelForGit(
         sagemaker_session=sagemaker_session, entry_point=entry_point, git_config=git_config