CiscoDevNet · v-zhuravlev · Oct 17, 2021 · Sep 30, 2021 · Sep 30, 2021 · Sep 30, 2021
diff --git a/molecule/db/converge.yml b/molecule/db/converge.yml
@@ -10,7 +10,7 @@
   roles:
     - role: appdynamics.agents.db
   vars:
-    agent_version: 20.9.0
+    agent_version: latest
     agent_type: db
     controller_account_access_key: "2498dd59-d059-48c1-8ec2-8dc2f3efa112" # Please add this to your Vault
     controller_host_name: "lncontroller20103-2010-o8evv8rp.appd-cx.com" # Your AppDynamics controller

diff --git a/molecule/dotnet/converge.yml b/molecule/dotnet/converge.yml
@@ -5,7 +5,7 @@
     - role: appdynamics.agents.dotnet
   vars:
     # Define Agent Type and Version
-    agent_version: 20.11.0
+    agent_version: latest
     agent_type: dotnet
     # The applicationName
     application_name: DotnetApp

diff --git a/molecule/dotnetcore/converge.yml b/molecule/dotnetcore/converge.yml
@@ -11,7 +11,7 @@
     - role: appdynamics.agents.dotnetcore
   vars:
     # Define Agent Type and Version
-    agent_version: 20.9.0
+    agent_version: latest
     agent_type: dotnetcore
 
     # The applicationName

diff --git a/molecule/java-jboss/converge.yml b/molecule/java-jboss/converge.yml
@@ -5,7 +5,7 @@
     - role: appdynamics.agents.java
   vars:
       # Define Agent Type and Version
-      agent_version: 21.1.0
+      agent_version: latest
       agent_type: sun-java
       agent_log_level: "debug"
       # Your controller details

diff --git a/molecule/java-tomcat-single-app-mode/converge.yml b/molecule/java-tomcat-single-app-mode/converge.yml
@@ -5,7 +5,7 @@
     - role: appdynamics.agents.java
   vars:
       # Define Agent Type and Version
-      agent_version: 21.1.0
+      agent_version: latest
       agent_type: sun-java
 
       agent_log_level: "debug"

diff --git a/molecule/java-tomcat/converge.yml b/molecule/java-tomcat/converge.yml
@@ -5,7 +5,7 @@
     - role: appdynamics.agents.java
   vars:
       # Define Agent Type and Version
-      agent_version: 21.1.0
+      agent_version: latest
       agent_type: sun-java
 
       agent_log_level: "debug"

diff --git a/molecule/java/converge.yml b/molecule/java/converge.yml
@@ -11,7 +11,7 @@
     - role: appdynamics.agents.java
   vars:
       # Define Agent Type and Version
-      agent_version: 20.8.0
+      agent_version: latest
       agent_type: sun-java
       # The applicationName
       application_name: "IoT_API"

diff --git a/molecule/machine/converge.yml b/molecule/machine/converge.yml
@@ -11,7 +11,7 @@
     - role: appdynamics.agents.machine
   vars:
     # Define Agent Type and Version
-    agent_version: 20.9.0
+    agent_version: latest
     agent_type: machine #machine-win for Windows host
     agent_log_level: "debug"
     # Your controller details

diff --git a/roles/common/files/get-agent.sh b/roles/common/files/get-agent.sh
@@ -49,7 +49,7 @@ _usage() {
   echo
   echo "  download AGENT                       Agent to download (choices: sun-java | java | sun-java8 | java8 | ibm-java | machine | machine-win | dotnet | dotnet-core | dotnetcore | db | db-win)"
   echo "    -v, --version  version             Version number for the supplied agent"
-  echo "    -d, --dryrun                       Rturns only the download URL if specificed, it is recommended to use this arg for provisioning tools such as ansible, chef, etc "
+  echo "    -d, --dryrun                       Returns only the download URL if specificed, it is recommended to use this arg for provisioning tools such as ansible, chef, etc "
   echo
 }
 
@@ -192,7 +192,12 @@ get_download_url() {
   _version="$2"
   #portal_page="https://download.appdynamics.com/download/downloadfile/?version=${_version}&apm=${_app_agent}&os=${_os_platform}&platform_admin_os=${_os_platform}&events=${_events}&eum=${_eum}&apm_os=windows%2Clinux%2Calpine-linux%2Cosx%2Csolaris%2Csolaris-sparc%2Caix"
 
-  portal_page="https://download.appdynamics.com/download/downloadfile/?version=${_version}&apm=${_app_agent}&os=${_os_platform}&platform_admin_os=${_os_platform}&events=${_events}&eum=${_eum}&apm_os=${_os_platform}"
+  if [ "$_version" == "latest" ]; then
+    # download latest version available
+    portal_page="https://download.appdynamics.com/download/downloadfile/?apm=${_app_agent}&os=${_os_platform}&platform_admin_os=${_os_platform}&events=${_events}&eum=${_eum}&apm_os=${_os_platform}"
+  else
+    portal_page="https://download.appdynamics.com/download/downloadfile/?version=${_version}&apm=${_app_agent}&os=${_os_platform}&platform_admin_os=${_os_platform}&events=${_events}&eum=${_eum}&apm_os=${_os_platform}"
+  fi
 
   http_response=$(curl -s -o "${DOWNLOAD_PAGE_OUTPUT}" -w "%{http_code}" -X GET "$portal_page")
 
@@ -306,7 +311,7 @@ download() {
   done
 
   if [ -z "${agent:-}" ] || [ -z "${version:-}" ]; then
-    exit_bad_args "missing one or more of agent type and  version"
+    exit_bad_args "missing one or more of agent type and version"
   fi
 
   if [ -z "${dryrun:-}" ]; then

diff --git a/roles/java/tasks/java-agent-linux.yml b/roles/java/tasks/java-agent-linux.yml
@@ -71,7 +71,7 @@
     - name: Find the version specific directory name
       find:
         paths: "{{ java_agent_dest_folder_linux }}"
-        patterns: "ver{{ agent_version }}*"
+        patterns: "ver*"
         file_type: directory
       register: result
 

diff --git a/roles/java/tasks/java-agent-windows.yml b/roles/java/tasks/java-agent-windows.yml
@@ -64,7 +64,7 @@
 - name: Find the version specific directory name
   win_find:
     paths: "{{ java_agent_dest_folder_win }}"
-    patterns: "ver{{ agent_version }}*"
+    patterns: "ver*"
     file_type: directory
   register: result