AMBARI-26601 : rebase frontend refactor branch with latest changes from the trunk branch

Jenkinsfile

@@ -121,6 +121,13 @@ pipeline {
 
                 stage('Ambari Server PyTests') {
                     steps {
+                        sh '''
+                           # Install pyOpenSSL in one step
+                           pip3 install --user --upgrade pyOpenSSL
+                           # Verify installations
+                           pip3 --version
+                           openssl version
+                           '''
                         sh 'mvn clean -am test -pl ambari-server -DskipSurefireTests -Dmaven.test.failure.ignore -Dmaven.artifact.threads=10 -Drat.skip -Dcheckstyle.skip -DskipAdminWebTests=true'
                     }
                 }

ambari-admin/pom.xml

@@ -23,7 +23,6 @@
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-admin</artifactId>
   <packaging>jar</packaging>
   <name>Ambari Admin View</name>
@@ -60,7 +59,7 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>1.3</version>
+        <version>1.11.0</version>
         <configuration>
           <nodeVersion>v4.5.0</nodeVersion>
           <npmVersion>2.15.0</npmVersion>

ambari-admin/src/main/resources/ui/ambari-admin/src/InactivityTimeout.tsx

@@ -1,3 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import React, { useState, useEffect, useRef } from 'react';
 import {Button, Modal} from 'react-bootstrap';
 

ambari-agent/pom.xml

@@ -23,7 +23,6 @@
     <relativePath>../ambari-project</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.ambari</groupId>
   <artifactId>ambari-agent</artifactId>
   <name>Ambari Agent</name>
   <description>Ambari Agent</description>
@@ -54,6 +53,23 @@
     <customActionsLocation>${target.cache.dir}/custom_actions</customActionsLocation>
     <empty.dir>src/packages/tarball</empty.dir> <!-- any directory in project with not very big amount of files (not to waste-load them) -->
     <python.test.mask>[Tt]est*.py</python.test.mask>
+
+    <commons-cli.version>1.5.0</commons-cli.version>
+    <commons-collections.version>3.2.2</commons-collections.version>
+    <commons-configuration2.version>2.8.0</commons-configuration2.version>
+    <commons-lang.version>2.6</commons-lang.version>
+    <commons-lang3.version>3.12.0</commons-lang3.version>
+    <commons-io.version>2.14.0</commons-io.version>
+    <commons-logging.version>1.1.3</commons-logging.version>
+    <commons-compress.version>1.26.0</commons-compress.version>
+    <guava.version>27.0-jre</guava.version>
+    <hadoop.version>3.3.4</hadoop.version>
+    <hadoop-auth.version>3.3.4</hadoop-auth.version>
+    <hadoop-shaded-guava.version>1.1.1</hadoop-shaded-guava.version>
+    <slf4j.version>1.7.36</slf4j.version>
+    <woodstox-core.version>5.4.0</woodstox-core.version>
+    <stax2-api.version>4.2.1</stax2-api.version>
+    <curator.version>4.2.0</curator.version>
   </properties>
   <dependencies>
     <dependency>
@@ -73,41 +89,65 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
+      <version>${commons-cli.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>${commons-collections.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <version>4.4</version>
+      <artifactId>commons-configuration2</artifactId>
+      <version>${commons-configuration2.version}</version>
     </dependency>
     <dependency>
-      <groupId>commons-configuration</groupId>
-      <artifactId>commons-configuration</artifactId>
-      <version>1.6</version>
-      <exclusions>
-        <exclusion>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils-core</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>${commons-lang3.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
+      <version>${commons-lang.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>${commons-io.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
+      <version>${commons-logging.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-compress</artifactId>
+      <version>${commons-compress.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.1.3-jre</version>
+      <version>${guava.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
-      <version>2.7.3</version>
+      <version>${hadoop.version}</version>
       <exclusions>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-servlet</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-server</artifactId>
+        </exclusion>
         <exclusion>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
@@ -136,16 +176,57 @@
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-log4j12</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-servlet</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-json</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.sun.jersey</groupId>
+          <artifactId>jersey-server</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-auth</artifactId>
+      <version>${hadoop-auth.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop.thirdparty</groupId>
+      <artifactId>hadoop-shaded-guava</artifactId>
+      <version>${hadoop-shaded-guava.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.woodstox</groupId>
+      <artifactId>woodstox-core</artifactId>
+      <version>${woodstox-core.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>stax2-api</artifactId>
+      <version>${stax2-api.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper-jute</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-test</artifactId>
-      <version>4.2.0</version>
+      <version>${curator.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -157,13 +238,13 @@
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-framework</artifactId>
-      <version>4.2.0</version>
+      <version>${curator.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.curator</groupId>
       <artifactId>curator-client</artifactId>
-      <version>4.2.0</version>
+      <version>${curator.version}</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -341,7 +422,7 @@
             <fileEncoding>utf-8</fileEncoding>
           </postremoveScriptlet>
 
-          <needarch>x86_64</needarch>
+	  <needarch>${build.os_arch}</needarch>
           <autoRequires>false</autoRequires>
           <mappings>
             <mapping>

ambari-agent/src/main/python/ambari_agent/AlertStatusReporter.py

@@ -53,7 +53,7 @@ def run(self):
     Run an endless loop which reports all the alert statuses got from collector
     """
     if self.alert_reports_interval == 0:
-      logger.warn(
+      logger.warning(
         "AlertStatusReporter is turned off. Some functionality might not work correctly."
       )
       return
@@ -142,7 +142,7 @@ def get_changed_alerts(self, alerts):
         ):
           changed_alerts.append(alert)
       else:
-        logger.warn(
+        logger.warning(
           "Cannot find alert definition for alert='{0}', alert_state='{1}'.".format(
             alert_name, alert_state
           )

ambari-agent/src/main/python/ambari_agent/AmbariConfig.py

@@ -107,22 +107,22 @@ def __init__(self):
     global content
     self.config = configparser.RawConfigParser()
     self.config.readfp(io.StringIO(content))
-    self._cluster_cache_dir = os.path.join(
-      self.cache_dir, FileCache.CLUSTER_CACHE_DIRECTORY
-    )
-    self._alerts_cachedir = os.path.join(
-      self.cache_dir, FileCache.ALERTS_CACHE_DIRECTORY
-    )
+
+    # initialize derived paths for the cache directories
+    self._recalculate_cache_paths()
+
+  def _recalculate_cache_paths(self):
+    """
+    Recalculate all cache-related paths based on the current cache_dir value.
+    Keeps derived instance variables consistent with the parser-backed `cache_dir`.
+    """
+    self._cluster_cache_dir = os.path.join(self.cache_dir, FileCache.CLUSTER_CACHE_DIRECTORY)
+    self._alerts_cachedir = os.path.join(self.cache_dir, FileCache.ALERTS_CACHE_DIRECTORY)
     self._stacks_dir = os.path.join(self.cache_dir, FileCache.STACKS_CACHE_DIRECTORY)
-    self._common_services_dir = os.path.join(
-      self.cache_dir, FileCache.COMMON_SERVICES_DIRECTORY
-    )
-    self._extensions_dir = os.path.join(
-      self.cache_dir, FileCache.EXTENSIONS_CACHE_DIRECTORY
-    )
-    self._host_scripts_dir = os.path.join(
-      self.cache_dir, FileCache.HOST_SCRIPTS_CACHE_DIRECTORY
-    )
+    self._common_services_dir = os.path.join(self.cache_dir, FileCache.COMMON_SERVICES_DIRECTORY)
+    self._extensions_dir = os.path.join(self.cache_dir, FileCache.EXTENSIONS_CACHE_DIRECTORY)
+    self._host_scripts_dir = os.path.join(self.cache_dir, FileCache.HOST_SCRIPTS_CACHE_DIRECTORY)
+
 
   def get(self, section, value, default=None):
     try:
@@ -143,6 +143,8 @@ def has_section(self, section):
 
   def setConfig(self, customConfig):
     self.config = customConfig
+    # Recalculate derived paths when the underlying parser changes
+    self._recalculate_cache_paths()
 
   def getConfig(self):
     return self.config
@@ -160,7 +162,7 @@ def get_resolved_config(cls, home_dir=""):
         raise Exception(f"No config found at {configPath}, use default")
 
     except Exception as err:
-      logger.warn(err)
+      logger.warning(err)
     setattr(cls, "_conf_cache", config)
     return config
 
@@ -292,7 +294,7 @@ def command_file_retention_policy(self):
     policy = self.get(
       "agent",
       self.COMMAND_FILE_RETENTION_POLICY_PROPERTY,
-      default=self.COMMAND_FILE_RETENTION_POLICY_KEEP,
+      default=self.COMMAND_FILE_RETENTION_POLICY_REMOVE,
     )
     policies = [
       self.COMMAND_FILE_RETENTION_POLICY_KEEP,
@@ -363,9 +365,13 @@ def remove_option(self, section, option):
 
   def load(self, data):
     self.config = configparser.RawConfigParser(data)
+    # Recalculate derived paths after loading config data
+    self._recalculate_cache_paths()
 
   def read(self, filename):
     self.config.read(filename)
+    # Recalculate derived paths after reading configuration file
+    self._recalculate_cache_paths()
 
   def getServerOption(self, url, name, default=None):
     from ambari_agent.NetUtil import NetUtil

ambari-agent/src/main/python/ambari_agent/CommandStatusReporter.py

@@ -37,7 +37,7 @@ def run(self):
     Run an endless loop which reports all the commands results (IN_PROGRESS, FAILED, COMPLETE) every self.command_reports_interval seconds.
     """
     if self.command_reports_interval == 0:
-      logger.warn(
+      logger.warning(
         "CommandStatusReporter is turned off. Some functionality might not work correctly."
       )
       return

ambari-agent/src/main/python/ambari_agent/ComponentStatusExecutor.py

@@ -56,7 +56,7 @@ def run(self):
     Run an endless loop which executes all status commands every 'status_commands_run_interval' seconds.
     """
     if self.status_commands_run_interval == 0:
-      self.logger.warn(
+      self.logger.warning(
         "ComponentStatusExecutor is turned off. Some functionality might not work correctly."
       )
       return

ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py

@@ -147,7 +147,7 @@ def cancel_command(self, task_id, reason):
         log_process_information(logger)
         shell.kill_process_with_children(pid)
       else:
-        logger.warn(f"Unable to find process associated with taskId = {task_id}")
+        logger.warning(f"Unable to find process associated with taskId = {task_id}")
 
   def get_py_executor(self, forced_command_name):
     """