Change default to ignore

Author: hssyoo

awscli/customizations/s3/subcommands.py

@@ -491,7 +491,7 @@
          'warn',
          'error',
     ],
-    'default': 'warn',
+    'default': 'ignore',
     'help_text': (
          "Configures behavior when attempting to download multiple objects "
          "whose keys differ only by case, which can cause undefined behavior "
@@ -502,10 +502,10 @@
          "conflicts</a> for details. Valid values are: "
          "<ul>"
          "<li>``error`` - Raise an error and abort downloads.</li>"
-         "<li>``warn`` - The default value. Emit a warning and download "
-         "the object.</li>"
+         "<li>``warn`` - Emit a warning and download the object.</li>"
          "<li>``skip`` - Skip downloading the object.</li>"
-         "<li>``ignore`` - Ignore the conflict and download the object.</li>"
+         "<li>``ignore`` - The default value. Ignore the conflict and "
+         "download the object.</li>"
          "</ul>"
     ),
  }

awscli/customizations/s3/syncstrategy/caseconflict.py

@@ -23,7 +23,7 @@ class CaseConflictSync(BaseSync):
     def __init__(
             self,
             sync_type='file_not_at_dest',
-            on_case_conflict='warn',
+            on_case_conflict='ignore',
             submitted=None,
     ):
         super().__init__(sync_type)
@@ -59,6 +59,10 @@ def determine_should_sync(self, src_file, dest_file):
             src_file.case_conflict_key = lower_compare_key
         return should_sync
 
+    @staticmethod
+    def _handle_ignore(src_file):
+        return True
+
     @staticmethod
     def _handle_skip(src_file):
         msg = (

awscli/topics/s3-case-insensitivity.rst

@@ -46,11 +46,11 @@ parameter. The following values are valid options:
 
 * ``error`` - When a case conflict is detected, the command will immediately
   fail and abort in-progress downloads.
-* ``warn`` - (Default) When a case conflict is detected, the AWS CLI will
+* ``warn`` - When a case conflict is detected, the AWS CLI will
   display a warning.
 * ``skip`` - When a case conflict is detected, the command will skip
   downloading the object and continue and display a warning.
-* ``ignore`` - Case conflicts will not be detected or handled.
+* ``ignore`` - (Default) Case conflicts will not be detected or handled.
 
 
 Continuing the prior example, the following describes what happens when

tests/functional/s3/test_cp_command.py

@@ -1319,6 +1319,19 @@ def test_accepts_mrap_arns_with_slash(self):
 class TestCpRecursiveCaseConflict(TestSyncCaseConflict):
     prefix = 's3 cp --recursive '
 
+    def test_ignore_by_default(self):
+        self.files.create_file(self.lower_key, 'mycontent')
+        # Note there's no --case-conflict param.
+        cmd = f"{self.prefix} s3://bucket {self.files.rootdir}"
+        self.parsed_responses = [
+            self.list_objects_response([self.upper_key]),
+            self.get_object_response(),
+        ]
+        # Expect success, so not error mode.
+        _, stderr, _ = self.run_cmd(cmd, expected_rc=0)
+        # No warnings in stderr, so not warn or skip mode.
+        assert not stderr
+
 
 class TestS3ExpressCpRecursive(BaseCPCommandTest):
     prefix = 's3 cp --recursive '