v3.2.0 RC1 cherrypicks (#1873)

* SNOW-1791894 Remove grants instead of denying permissions on Windows (#1871) * Remove empty defaults from docs (#1872) * Release notes for v3.2.0 RC1 * Bump version to RC1 --------- Co-authored-by: Patryk Czajka <[email protected]> Co-authored-by: Adam Stus <[email protected]>
snowflakedb · Nov 20, 2024 · 6f5f0cc · 6f5f0cc
1 parent fb6944f
commit 6f5f0cc
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -51,6 +51,8 @@
   Removed incorrect copying of connections from `connections.toml` to `config.toml`.
 * Fixes `snow connection generate-jwt` to work with keys with no passphrase.
 * The privilege to create a schema or stage is no longer required to run `snow app version create` if the schema and stage already exist.
+* Fix Windows permissions error on files created by CLI when owner is a part of custom group with granted
+  default permissions.
 
 # v3.1.0
 

diff --git a/src/snowflake/cli/__about__.py b/src/snowflake/cli/__about__.py
@@ -14,4 +14,4 @@
 
 from __future__ import annotations
 
-VERSION = "3.2.0rc0"
+VERSION = "3.2.0rc1"
diff --git a/src/snowflake/cli/_app/dev/docs/templates/usage.rst.jinja2 b/src/snowflake/cli/_app/dev/docs/templates/usage.rst.jinja2
@@ -48,7 +48,7 @@ Options
         {%- if param.type.name != "choice" %}{{ ' {' }}{% else %} {% endif %}{{ param.make_metavar() }}{% if param.type.name != "choice" %}{{ '}' }}
         {%- endif %}
     {%- endif %}`
-{% if param.help %}{{ "  " + param.help | replace("\n", " ") }}{% if param.help[-1] != '.' %}.{% endif %}{% if param.default is not none %} Default: {{ param.default }}.{% endif %}{% else %}  TBD{% endif %}
+{% if param.help %}{{ "  " + param.help | replace("\n", " ") }}{% if param.help[-1] != '.' %}.{% endif %}{% if param.default is not none and param.default != "" %} Default: {{ param.default }}.{% endif %}{% else %}  TBD{% endif %}
 {% endfor -%}
 {% else %}
 

diff --git a/src/snowflake/cli/api/config.py b/src/snowflake/cli/api/config.py
@@ -181,7 +181,7 @@ def _read_config_file():
                 )
                 warnings.warn(
                     f"Unauthorized users ({users}) have access to configuration file {CONFIG_MANAGER.file_path}.\n"
-                    f'Run `icacls "{CONFIG_MANAGER.file_path}" /deny <USER_ID>:F` on those users to restrict permissions.'
+                    f'Run `icacls "{CONFIG_MANAGER.file_path}" /remove:g <USER_ID>` on those users to restrict permissions.'
                 )
 
         try:

diff --git a/src/snowflake/cli/api/secure_utils.py b/src/snowflake/cli/api/secure_utils.py
@@ -108,7 +108,7 @@ def _windows_restrict_file_permissions(path: Path) -> None:
 
     for user in windows_get_not_whitelisted_users_with_access(path):
         log.info("Removing permissions of user %s from file %s", user, path)
-        subprocess.run(["icacls", str(path), "/DENY", f"{user}:F"])
+        subprocess.run(["icacls", str(path), "/remove:g", f"{user}"])
 
 
 def restrict_file_permissions(file_path: Path) -> None:

diff --git a/tests_e2e/__snapshots__/test_installation.ambr b/tests_e2e/__snapshots__/test_installation.ambr
@@ -14,7 +14,7 @@
 
    Usage: snow [OPTIONS] COMMAND [ARGS]...                                        
 
-   Snowflake CLI tool for developers [v3.2.0.dev0]                                
+   Snowflake CLI tool for developers [v3.2.0rc1]                                  
 
   +- Options --------------------------------------------------------------------+
   | --version                           Shows version of the Snowflake CLI       |
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@

		from __future__ import annotations

		VERSION = "3.2.0rc0"
		VERSION = "3.2.0rc1"