Merge pull request #1039 from seth-reeser/develop-catapult

Platform: Define Vagrant version requirement and other optimizations.

VERSION.yml

@@ -1,5 +1,5 @@
 ---
-version: 4.8.0
+version: 4.8.1
 major:
   description: "Catapult uses Semantic Versioning. During a MAJOR increment, incompatable API changes are made which require a manual upgrade path. Please follow these directions:"
   notice: "NEW MAJOR VERSION OF CATAPULT AVAILABLE"

catapult/catapult.rb

@@ -125,8 +125,9 @@ def Command::format_repo_size(repo_size)
     end
 
 
-    # define the minimum vagrant version
-    Vagrant.require_version "> 1.4.0"
+    # define the vagrant version
+    # vagrant 2.3.5 moved to ruby 3, which is incompatible with some catapult-required vagrant plugins and catapult.rb
+    Vagrant.require_version "> 1.4.0", "<= 2.3.4"
 
 
     # ensure the user is in the correct directory when running vagrant commands to prevent git from pulling in catapult upstream master into repositories
@@ -1774,7 +1775,7 @@ def Command::getSignatureKey(key, dateStamp, regionName, serviceName)
             end
             # type
             if instance != nil
-              row.push(instance.at("item instanceType").text.ljust(12))
+              row.push(instance.at("item instanceType").text.slice!(0, 12).ljust(12))
               # write type to secrets/configuration.yml
               if !defined?(@configuration["environments"]["#{environment}"]["servers"]["#{server}"]["type"]) || (@configuration["environments"]["#{environment}"]["servers"]["#{server}"]["type"].nil?) || (@configuration["environments"]["#{environment}"]["servers"]["#{server}"]["type"] != instance.at("item instanceType").text)
                 if !defined?(@configuration["environments"]["#{environment}"]["servers"]["#{server}"]["type"])
@@ -1848,7 +1849,7 @@ def Command::getSignatureKey(key, dateStamp, regionName, serviceName)
             end
             # type
             if droplet != nil
-              row.push("#{droplet["size"]["slug"]}".ljust(12))
+              row.push("#{droplet["size"]["slug"]}".slice!(0, 12).ljust(12))
               # write slug to secrets/configuration.yml
               if !defined?(@configuration["environments"]["#{environment}"]["servers"]["#{server}"]["slug"]) || (@configuration["environments"]["#{environment}"]["servers"]["#{server}"]["slug"].nil?) || (@configuration["environments"]["#{environment}"]["servers"]["#{server}"]["slug"] != droplet["size"]["slug"])
                 if !defined?(@configuration["environments"]["#{environment}"]["servers"]["#{server}"]["slug"])
@@ -2765,7 +2766,7 @@ def Command::getSignatureKey(key, dateStamp, regionName, serviceName)
                 environment = "#{environment}."
               end
               begin
-                def Command::http_response(uri_str, limit = 10)
+                def Command::http_response(uri_str, limit = 3)
                   if limit == 0
                     row.push("loop")
                   else
@@ -2807,7 +2808,7 @@ def Command::http_response(uri_str, limit = 10)
               rescue Net::ReadTimeout
                 row.push("down".ljust(4).color(Colors::RED))
               rescue OpenSSL::SSL::SSLError
-                row.push("err".ljust(4).color(Colors::RED))
+                row.push("cert".ljust(4).color(Colors::RED))
               rescue Exception => ex
                 row.push("#{ex.class}".slice!(0, 4).ljust(4).color(Colors::RED))
               end

provisioners/provisioners.yml

@@ -232,7 +232,7 @@ software:
       repo: "https://git.drupal.org/project/drupal.git"
       branch: "7.x"
       database_config_file: "sites/default/settings.php"
-      eol: "2021-11-1"
+      eol: "2021-11-01"
       file_store_containers: ["sites/default/files"]
       file_stores: ["sites/default/files"]
       php_version: "7.1"
@@ -241,7 +241,7 @@ software:
       repo: "https://git.drupal.org/project/drupal.git"
       branch: "8.8.x"
       database_config_file: "sites/default/settings.php"
-      eol: "2021-11-1"
+      eol: "2021-11-01"
       file_store_containers: ["sites/default/files"]
       file_stores: ["sites/default/files"]
       php_version: "7.2"