Revert version checker and support MacOS Sonoma

README.md

@@ -7,39 +7,38 @@ Utilities for Amazon Elastic File System (EFS)
 The `efs-utils` package has been verified against the following Linux distributions:
 
 | Distribution         | Package Type | `init` System |
-|----------------------|--------------| --------- |
-| Amazon Linux 2017.09 | `rpm`        | `upstart` |
-| Amazon Linux 2       | `rpm`        | `systemd` |
-| Amazon Linux 2023    | `rpm`        | `systemd` |
-| CentOS 7             | `rpm`        | `systemd` |
-| CentOS 8             | `rpm`        | `systemd` |
-| RHEL 7               | `rpm`        | `systemd` |
-| RHEL 8               | `rpm`        | `systemd` |
-| RHEL 9               | `rpm`        | `systemd` |
-| Fedora 28            | `rpm`        | `systemd` |
-| Fedora 29            | `rpm`        | `systemd` |
-| Fedora 30            | `rpm`        | `systemd` |
-| Fedora 31            | `rpm`        | `systemd` |
-| Fedora 32            | `rpm`        | `systemd` |
-| Debian 9             | `deb`        | `systemd` |
-| Debian 10            | `deb`        | `systemd` |
-| Ubuntu 16.04         | `deb`        | `systemd` |
-| Ubuntu 18.04         | `deb`        | `systemd` |
-| Ubuntu 20.04         | `deb`        | `systemd` |
-| OpenSUSE Leap        | `rpm`        | `systemd` |
-| OpenSUSE Tumbleweed  | `rpm`        | `systemd` |
-| Oracle8              | `rpm`        | `systemd` |
-| SLES 12              | `rpm`        | `systemd` |
-| SLES 15              | `rpm`        | `systemd` |
+|----------------------| ----- | --------- |
+| Amazon Linux 2017.09 | `rpm` | `upstart` |
+| Amazon Linux 2       | `rpm` | `systemd` |
+| Amazon Linux 2023    | `rpm` | `systemd` |
+| CentOS 7             | `rpm` | `systemd` |
+| CentOS 8             | `rpm` | `systemd` |
+| RHEL 7               | `rpm`| `systemd` |
+| RHEL 8               | `rpm`| `systemd` |
+| Fedora 28            | `rpm` | `systemd` |
+| Fedora 29            | `rpm` | `systemd` |
+| Fedora 30            | `rpm` | `systemd` |
+| Fedora 31            | `rpm` | `systemd` |
+| Fedora 32            | `rpm` | `systemd` |
+| Debian 9             | `deb` | `systemd` |
+| Debian 10            | `deb` | `systemd` |
+| Ubuntu 16.04         | `deb` | `systemd` |
+| Ubuntu 18.04         | `deb` | `systemd` |
+| Ubuntu 20.04         | `deb` | `systemd` |
+| OpenSUSE Leap        | `rpm` | `systemd` |
+| OpenSUSE Tumbleweed  | `rpm` | `systemd` |
+| Oracle8              | `rpm` | `systemd` |
+| SLES 12              | `rpm` | `systemd` |
+| SLES 15              | `rpm` | `systemd` |
 
 The `efs-utils` package has been verified against the following MacOS distributions:
 
 | Distribution   | `init` System |
-| -------------- | ------------- |
-| MacOS Big Sur  | `launchd` |
-| MacOS Monterey | `launchd` |
-| MacOS Ventura  | `launchd` |
-| MacOS Sonoma   | `launchd` |
+|----------------|---------------|
+| MacOS Big Sur  | `launchd`     |
+| MacOS Monterey | `launchd`     |
+| MacOS Ventura  | `launchd`     |
+| MacOS Sonoma   | `launchd`     |
 
 ## README contents
   - [Prerequisites](#prerequisites)
@@ -75,7 +74,6 @@ The `efs-utils` package has been verified against the following MacOS distributi
   - [The way to access instance metadata](#the-way-to-access-instance-metadata)
   - [Use the assumed profile credentials for IAM](#use-the-assumed-profile-credentials-for-iam)
   - [Enabling FIPS Mode](#enabling-fips-mode)
-  - [Disabling Version Check](#disabling-version-check)
   - [License Summary](#license-summary)
 
 
@@ -160,11 +158,11 @@ $ ./build-deb.sh
 $ sudo apt-get -y install ./build/amazon-efs-utils*deb
 ```
 
-### On macOS Big Sur, Monterey, Ventura or Sonoma
+### On MacOS Big Sur, macOS Monterey, macOS Sonoma and macOS Ventura distribution
 
-For EC2 Mac instances running macOS Big Sur, Monterey, Ventura, or Sonoma, you can install amazon-efs-utils from the 
+For EC2 Mac instances running macOS Big Sur, macOS Monterey, macOS Sonoma and macOS Ventura, you can install amazon-efs-utils from the 
 [homebrew-aws](https://github.com/aws/homebrew-aws) respository. **Note that this will ONLY work on EC2 instances
-running macOS Big Sur, Monterey, Ventura or Sonoma and not on local Apple mac hardware.**
+running macOS Big Sur, macOS Monterey, macOS Sonoma and macOS Ventura, not local Mac computers.**
 ```bash
 brew install amazon-efs-utils
 ```
@@ -562,18 +560,6 @@ Threading:PTHREAD Sockets:POLL,IPv6 SSL:ENGINE,OCSP,FIPS Auth:LIBWRAP
 
 For more information on how to configure OpenSSL with FIPS see the [OpenSSL FIPS README](https://github.com/openssl/openssl/blob/master/README-FIPS.md).
 
-## Disabling Version Check
-By default, once an hour, the watchdog daemon service will check to see if a newer version of amazon-efs-utils is available on github or yum.
-You can disable this check by setting the `enable_version_check` field in `/etc/amazon/efs/efs-utils.conf` to `false`. For example, 
-```bash
-sudo sed -i 's/enable_version_check = true/enable_version_check = false/' /etc/amazon/efs/efs-utils.conf
-```  
-Or on MacOS:  
-```bash
-VERSION=<efs-utils version, e.g. 1.34.1>
-sudo sed -i 's/enable_version_check = true/enable_version_check = false/' /usr/local/Cellar/amazon-efs-utils/${VERSION}/libexec/etc/amazon/efs/efs-utils.conf
-```
-
 ## License Summary
 
 This code is made available under the MIT license.

amazon-efs-utils.spec

@@ -35,7 +35,7 @@
 %endif
 
 Name      : amazon-efs-utils
-Version   : 1.35.1
+Version   : 1.35.2
 Release   : 1%{platform}
 Summary   : This package provides utilities for simplifying the use of EFS file systems
 
@@ -138,6 +138,10 @@ fi
 %clean
 
 %changelog
+* Fri Feb 09 2024 Rakesh Yelisetty <[email protected]> - 1.35.2
+- Revert "Add warning if using older Version"
+- Support MacOS Sonoma
+
 * Wed Jan 10 2024 Sean Zatz <[email protected]> - 1.35.1
 - Add 'fsap' to ignored mount option list
 - Accept openssl 3.0 in rpm spec file

build-deb.sh

@@ -11,7 +11,7 @@ set -ex
 
 BASE_DIR=$(pwd)
 BUILD_ROOT=${BASE_DIR}/build/debbuild
-VERSION=1.35.1
+VERSION=1.35.2
 RELEASE=1
 DEB_SYSTEM_RELEASE_PATH=/etc/os-release
 

config.ini

@@ -7,5 +7,5 @@
 #
 
 [global]
-version=1.35.1
+version=1.35.2
 release=1

dist/amazon-efs-utils.control

@@ -1,6 +1,6 @@
 Package: amazon-efs-utils
 Architecture: all
-Version: 1.35.1
+Version: 1.35.2
 Section: utils
 Depends: python3, nfs-common, stunnel4 (>= 4.56), openssl (>= 1.0.2), util-linux
 Priority: optional

dist/efs-utils.conf

@@ -88,10 +88,6 @@ stunnel_health_check_enabled = true
 stunnel_health_check_interval_min = 5
 stunnel_health_check_command_timeout_sec = 30
 
-# By default, once an hour, the watchdog process will check the latest version of amazon-efs-utils available
-# on yum and github.  If we detect that the currently installed version is outdated, we'll log a warning.
-enable_version_check = true
-
 [cloudwatch-log]
 # enabled = true
 log_group_name = /aws/efs/utils

src/mount_efs/__init__.py

@@ -85,7 +85,7 @@
     BOTOCORE_PRESENT = False
 
 
-VERSION = "1.35.1"
+VERSION = "1.35.2"
 SERVICE = "elasticfilesystem"
 
 AMAZON_LINUX_2_RELEASE_ID = "Amazon Linux release 2 (Karoo)"
@@ -286,7 +286,7 @@
     MACOS_BIG_SUR_RELEASE,
     MACOS_MONTEREY_RELEASE,
     MACOS_VENTURA_RELEASE,
-    MACOS_SONOMA_RELEASE
+    MACOS_SONOMA_RELEASE,
 ]
 
 MAC_OS_PLATFORM_LIST = ["darwin"]