Merge branch 'develop' into develop

Author: hgreebe

.github/workflows/unsafe-patterns-checker.yml

@@ -28,3 +28,13 @@ jobs:
         with:
           diffDoesNotContainRegex: "rm -rf"
           skipLabels: skip-recursive-deletion-check
+
+  # Prevent bad URL suffix
+  bad-url-suffix-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PR for Disallowed URL Suffixes
+        uses: francesco-giordano/[email protected]
+        with:
+          diffDoesNotContainRegex: "amazonaws\\.com|amazonaws\\.com\\.cn|c2s\\.ic\\.gov|sc2s\\.sgov\\.gov"
+          skipLabels: skip-bad-url-suffix-check

CHANGELOG.md

@@ -7,6 +7,12 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 ------
 
 **CHANGES**
+- Upgrade mysql-community-client to version 8.0.39. 
+- Upgrade Amazon DCV to version `2024.0-18131`.
+  - server: `2024.0-18131-1`
+  - xdcv: `2024.0.631-1`
+  - gl: `2024.0.1078-1`
+  - web_viewer: `2024.0-18131-1`
 
 **BUG FIXES**
 - Fix an issue in the way we get region when manage volumes so that it can correctly handle local zone.

cookbooks/aws-parallelcluster-environment/attributes/environment.rb

@@ -77,3 +77,5 @@
 default['cluster']['spack_shared_dir'] = "#{node['cluster']['shared_dir']}/spack"
 default['cluster']['spack']['version'] = '0.20.2'
 default['cluster']['spack']['sha256'] = '62f87ab6ca332118f2812a255edcf4be4977623d067b9396251ce8c44b158e49'
+
+default['cluster']['lustre']['enabled'] = 'yes'

cookbooks/aws-parallelcluster-environment/libraries/fsx.rb

@@ -8,3 +8,7 @@ def aws_domain_for_fsx(region)
     CLASSIC_AWS_DOMAIN
   end
 end
+
+def lustre_enabled?
+  ['yes', true].include?(node['cluster']['lustre']['enabled'])
+end

cookbooks/aws-parallelcluster-environment/recipes/install.rb

@@ -19,7 +19,9 @@
 cloudwatch 'Install amazon-cloudwatch-agent'
 efa 'Install EFA'
 raid 'Install RAID prerequisite packages'
-lustre 'Install FSx options'
+if lustre_enabled?
+  lustre 'Install FSx options'
+end
 efs 'Install efs-utils'
 stunnel 'Install stunnel'
 system_authentication "Install packages required for directory service integration"

cookbooks/aws-parallelcluster-platform/attributes/platform.rb

@@ -29,13 +29,13 @@
 default['cluster']['dcv']['authenticator']['private_key'] = "#{node['cluster']['etc_dir']}/ext-auth-private-key.pem"
 default['cluster']['dcv']['authenticator']['virtualenv_name'] = "dcv_authenticator_virtualenv"
 default['cluster']['dcv']['authenticator']['virtualenv_path'] = "#{node['cluster']['system_pyenv_root']}/versions/#{node['cluster']['python-version']}/envs/#{node['cluster']['dcv']['authenticator']['virtualenv_name']}"
-default['cluster']['dcv']['version'] = '2023.1-16388'
+default['cluster']['dcv']['version'] = '2024.0-18131'
 default['cluster']['dcv_port'] = 8443
 
-default['cluster']['dcv']['server']['version'] = '2023.1.16388-1'
-default['cluster']['dcv']['xdcv']['version'] = '2023.1.565-1'
-default['cluster']['dcv']['gl']['version'] = '2023.1.1047-1'
-default['cluster']['dcv']['web_viewer']['version'] = '2023.1.16388-1'
+default['cluster']['dcv']['server']['version'] = '2024.0.18131-1'
+default['cluster']['dcv']['xdcv']['version'] = '2024.0.631-1'
+default['cluster']['dcv']['gl']['version'] = '2024.0.1078-1'
+default['cluster']['dcv']['web_viewer']['version'] = '2024.0.18131-1'
 
 # OpenSSH settings for AWS ParallelCluster instances
 default['openssh']['server']['protocol'] = '2'

cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_authenticator.py

@@ -103,7 +103,7 @@ def get_token_info(self, token):
 
 class DCVAuthenticator(BaseHTTPRequestHandler):
     """
-    Simple HTTP server to handle NICE DCV authentication process.
+    Simple HTTP server to handle Amazon DCV authentication process.
 
     The authentication process to access to a DCV session is performed by the following steps:
     1. Obtain a Request Token:
@@ -191,7 +191,7 @@ def do_GET(self):  # noqa N802, pylint: disable=C0103
 
     def do_POST(self):  # noqa N802 pylint: disable=C0103
         """
-        Handle POST requests, coming from NICE DCV server.
+        Handle POST requests, coming from Amazon DCV server.
 
         The format of the request is the following:
             curl -k http://localhost:<port> -d sessionId=<session-id> -d authenticationToken=<token>
@@ -360,7 +360,7 @@ def _is_session_valid(user, session_id):
         # because currently DCV doesn't allow list-session to list all session even for non-root user.
         # TODO change this method if DCV updates his behaviour.
         """
-        logger.info("Verifying NICE DCV session validity..")
+        logger.info("Verifying Amazon DCV session validity..")
         # Remove the first and the last because they are the heading and empty, respectively
         # All commands and arguments in this subprocess call are built as literals
         processes = subprocess.check_output(["/bin/ps", "aux"]).decode("utf-8").split("\n")[1:-1]  # nosec B603
@@ -370,7 +370,7 @@ def _is_session_valid(user, session_id):
             filter(lambda process: DCVAuthenticator.check_dcv_process(process, user, session_id), processes), None
         ):
             raise DCVAuthenticator.IncorrectRequestError("The given session does not exists")
-        logger.info("The NICE DCV session is valid.")
+        logger.info("The Amazon DCV session is valid.")
 
     @staticmethod
     def _verify_session_existence(user, session_id):
@@ -402,9 +402,9 @@ class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
 
 def _run_server(port, certificate=None, key=None):
     """
-    Run NICE DCV authenticator server on localhost.
+    Run Amazon DCV authenticator server on localhost.
 
-    The NICE DCV authenticator server *must* run with an appropriate user.
+    The Amazon DCV authenticator server *must* run with an appropriate user.
 
     :param port: the port in which you want to start the server
     :param certificate: the certificate to use if HTTPSs
@@ -497,12 +497,12 @@ def main():
     global logger  # pylint: disable=C0103,W0603
     logger = _config_logger()
     try:
-        logger.info("Starting NICE DCV authenticator server")
+        logger.info("Starting Amazon DCV authenticator server")
         args = _parse_args()
         _prepare_auth_folder()
         _run_server(port=args.port if args.port else 8444, certificate=args.certificate, key=args.key)
     except KeyboardInterrupt:
-        logger.info("Closing NICE DCV authenticator server")
+        logger.info("Closing Amazon DCV authenticator server")
     except Exception as e:
         fail(f"Unexpected error of type {type(e).__name__}: {e}")
 

cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh

@@ -90,18 +90,18 @@ _create_dcv_session() {
     dcv_session_file="$1"
     shared_folder_path="$2"
 
-    _log "Creating a new NICE DCV session..."
+    _log "Creating a new Amazon DCV session..."
     # Generate a random session id
     sessionid=$(shuf -zer -n20  {A..Z} {a..z} {0..9})
     echo "${sessionid}" > "${dcv_session_file}"
     dcv create-session --type virtual --storage-root "${shared_folder_path}" "${sessionid}"
-    _log "NICE DCV session created successfully."
+    _log "Amazon DCV session created successfully."
 
     echo "${sessionid}"
 }
 
 main() {
-    _log "--- Initializing NICE DCV authentication... ---"
+    _log "--- Initializing Amazon DCV authentication... ---"
 
     if [[ -z "$1" ]]; then
         _fail "The script requires the shared folder as input parameter."
@@ -117,7 +117,7 @@ main() {
     fi
 
     if ! systemctl is-active --quiet dcvserver; then
-        _fail "NICE DCV service is not active on the given instance."
+        _fail "Amazon DCV service is not active on the given instance."
     fi
 
     # Create a session with session storage enabled.
@@ -127,7 +127,7 @@ main() {
         sessionid=$(_create_dcv_session "${dcv_session_file}" "${shared_folder_path}")
     else
         sessionid=$(cat "${dcv_session_file}")
-        _log "Reusing existing NICE DCV session for the current user."
+        _log "Reusing existing Amazon DCV session for the current user."
 
         # number of session can either be 0 or 1
         number_of_sessions=$(dcv list-sessions |& grep "${user}" | grep -c "${sessionid}")
@@ -145,7 +145,7 @@ main() {
     # Retrieve Request Token and Access File name
     _log "Retrieving Request Token and Access File name.."
     user_token_request=$(/usr/bin/curl --retry 3 --max-time 5 -s -k -X GET -G "https://localhost:${ext_auth_port}" -d action=requestToken -d authUser="${user}" -d sessionID="${sessionid}")
-    _validate_json "${user_token_request}" "Unable to obtain the Request Token from the NICE DCV external authenticator."
+    _validate_json "${user_token_request}" "Unable to obtain the Request Token from the Amazon DCV external authenticator."
     request_token=$(echo "${user_token_request}" | jq -r .requestToken)
     access_file=$(echo "${user_token_request}" | jq -r .accessFile)
     _log "Request Token and Access File name obtained successfully."
@@ -160,15 +160,15 @@ main() {
     # Retrieve Session Token
     _log "Retrieving Session Token.."
     session_token_request=$(/usr/bin/curl --retry 3 --max-time 5 -s -k -X GET -G "https://localhost:${ext_auth_port}" -d action=sessionToken -d requestToken="${request_token}")
-    _validate_json "${session_token_request}" "Unable to obtain the Session Token from the NICE DCV external authenticator."
+    _validate_json "${session_token_request}" "Unable to obtain the Session Token from the Amazon DCV external authenticator."
     session_token=$(echo "${session_token_request}" | jq -r .sessionToken)
     _log "Session Token obtained successfully."
 
     if [[ -z "${dcv_server_port}" ]]; then
       dcv_server_port=8443
     fi
 
-    _log "--- NICE DCV authentication performed successfully. ---"
+    _log "--- Amazon DCV authentication performed successfully. ---"
     echo "PclusterDcvServerPort=${dcv_server_port} PclusterDcvSessionId=${sessionid} PclusterDcvSessionToken=${session_token}"
 }
 

cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_alinux2.rb

@@ -27,6 +27,22 @@ def prereq_packages
                          gnu-free-serif-fonts glx-utils) + (arm_instance? ? %w(mate-terminal) : %w(gnome-terminal))
 end
 
+def dcv_server
+  "nice-dcv-server-#{node['cluster']['dcv']['server']['version']}.el7.#{dcv_url_arch}.rpm"
+end
+
+def xdcv
+  "nice-xdcv-#{node['cluster']['dcv']['xdcv']['version']}.el7.#{dcv_url_arch}.rpm"
+end
+
+def dcv_web_viewer
+  "nice-dcv-web-viewer-#{node['cluster']['dcv']['web_viewer']['version']}.el7.#{dcv_url_arch}.rpm"
+end
+
+def dcv_gl
+  "nice-dcv-gl-#{node['cluster']['dcv']['gl']['version']}.el7.#{dcv_url_arch}.rpm"
+end
+
 action_class do
   def pre_install
     package prereq_packages do

cookbooks/aws-parallelcluster-platform/resources/dcv/dcv_ubuntu20.rb

@@ -21,5 +21,5 @@
 
 def dcv_sha256sum
   # Ubuntu20 supports DCV on x86
-  '5151ad6b589dc573e2e067aed0389913e9ecd50bec81935b12e4f952ef14cc56'
+  'cf63d51a5bb7ac82569d747215c0118a7468a32c753c0b0fa9c1cf47513c0a0c'
 end