Merge branch 'dev' into USAGOV-2214-orphaned-description

bin/cloudgov/db-portforward

@@ -30,14 +30,13 @@ cf create-service-key database db-portforward >/dev/null 2>&1
 echo "Collecting connection info"
 CF_APP_GUID=$(cf app cms --guid)
 CF_PROCESS_GUID=`cf curl /v3/apps/${CF_APP_GUID}/processes | jq --raw-output '.resources | .[] | select(.type == "web").guid'`
-CF_INFO=$(cf curl /v2/info)
 CF_DB_INFO=$(cf service-key database db-portforward)
 CF_DB_PORT=$(echo "$CF_DB_INFO" | grep '"port":' | sed 's/.*"port": "\([^"]*\)".*/\1/')
 CF_DB_HOST=$(echo "$CF_DB_INFO" | grep '"host":' | sed 's/.*"host": "\([^"]*\)".*/\1/')
 CF_DB_USER=$(echo "$CF_DB_INFO" | grep '"username":' | sed 's/.*"username": "\([^"]*\)".*/\1/')
 CF_DB_PASS=$(echo "$CF_DB_INFO" | grep '"password":' | sed 's/.*"password": "\([^"]*\)".*/\1/')
 CF_DB_NAME=$(echo "$CF_DB_INFO" | grep '"db_name":' | sed 's/.*"db_name": "\([^"]*\)".*/\1/')
-CF_SSH_ENDPOINT=$(echo "$CF_INFO" | grep '"app_ssh_endpoint":' | sed 's/.*"app_ssh_endpoint": "\([^:]*\).*".*/\1/')
+CF_SSH_ENDPOINT=`cf curl / | jq -r '.links.app_ssh.href | split(":")[0]'`
 
 echo "Creating sql connection"
 nohup sshpass -p $(cf ssh-code) ssh -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -4 -N -p 2222 -L $LOCAL_PORT:$CF_DB_HOST:$CF_DB_PORT cf:$CF_PROCESS_GUID/0@$CF_SSH_ENDPOINT >/dev/null 2>&1 &

bin/cloudgov/deploy-services

@@ -42,7 +42,7 @@ generate_string()
 generate_cert_json()
 {
   if command -v openssl >/dev/null ; then
-    SECAUTHSECRETS=$(cf curl /v2/user_provided_service_instances/$(cf service secauthsecrets --guid) | jq -r '.entity | select(.name == "secauthsecrets") | .credentials' )
+    SECAUTHSECRETS=$(cf curl /v3/service_instances/$(cf service secauthsecrets --guid)/credentials)
     SP_KEY=$(echo -E "$SECAUTHSECRETS" | jq -r '.spkey')
     SP_CRT=$(echo -E "$SECAUTHSECRETS" | jq -r '.spcrt')
 
@@ -141,15 +141,15 @@ generate_cert_json()
   echo "Configuring Secrets Service"
   if service_exists "secrets" ; then
     echo "secrets already created: updating"
-    CURR_SECRETS=$(cf curl /v2/user_provided_service_instances/$(cf service secrets --guid))
-    CURR_CRON_KEY=$(echo $CURR_SECRETS | jq -r '.entity.credentials.CRON_KEY')
-    CURR_HASH_SALT=$(echo $CURR_SECRETS | jq -r '.entity.credentials.HASH_SALT')
-    CURR_ROOT_USER_NAME=$(echo $CURR_SECRETS | jq -r '.entity.credentials.ROOT_USER_NAME')
-    CURR_ROOT_USER_PASS=$(echo $CURR_SECRETS | jq -r '.entity.credentials.ROOT_USER_PASS')
-    CURR_NEW_RELIC_DISPLAY_NAME=$(echo $CURR_SECRETS | jq -r '.entity.credentials.NEW_RELIC_DISPLAY_NAME')
-    CURR_NEW_RELIC_APP_NAME=$(echo $CURR_SECRETS | jq -r '.entity.credentials.NEW_RELIC_APP_NAME')
-    CURR_NEW_RELIC_LICENSE_KEY=$(echo $CURR_SECRETS | jq -r '.entity.credentials.NEW_RELIC_LICENSE_KEY')
-    CURR_NEW_RELIC_API_KEY=$(echo $CURR_SECRETS | jq -r '.entity.credentials.NEW_RELIC_API_KEY')
+    CURR_SECRETS=$(cf curl /v3/service_instances/$(cf service secrets --guid)/credentials)
+    CURR_CRON_KEY=$(echo $CURR_SECRETS | jq -r '.CRON_KEY')
+    CURR_HASH_SALT=$(echo $CURR_SECRETS | jq -r '.HASH_SALT')
+    CURR_ROOT_USER_NAME=$(echo $CURR_SECRETS | jq -r '.ROOT_USER_NAME')
+    CURR_ROOT_USER_PASS=$(echo $CURR_SECRETS | jq -r '.ROOT_USER_PASS')
+    CURR_NEW_RELIC_DISPLAY_NAME=$(echo $CURR_SECRETS | jq -r '.NEW_RELIC_DISPLAY_NAME')
+    CURR_NEW_RELIC_APP_NAME=$(echo $CURR_SECRETS | jq -r '.NEW_RELIC_APP_NAME')
+    CURR_NEW_RELIC_LICENSE_KEY=$(echo $CURR_SECRETS | jq -r '.NEW_RELIC_LICENSE_KEY')
+    CURR_NEW_RELIC_API_KEY=$(echo $CURR_SECRETS | jq -r '.NEW_RELIC_API_KEY')
     if [ -n "$NEW_RELIC_DISPLAY_NAME" ]; then
       CURR_NEW_RELIC_DISPLAY_NAME=${NEW_RELIC_DISPLAY_NAME}
     fi

bin/cloudgov/gsaauth-filegen.sh

@@ -6,7 +6,7 @@ if [ -z "$SPACE" ]; then
   exit 1
 fi;
 
-SECAUTHSECRETS=$(cf curl /v2/user_provided_service_instances/$(cf service secauthsecrets --guid) | jq -r '.entity | select(.name == "secauthsecrets") | .credentials' )
+SECAUTHSECRETS=$(cf curl /v3/service_instances/$(cf service secauthsecrets --guid)/credentials)
 SP_KEY=$(echo -E "$SECAUTHSECRETS" | jq -r '.spkey')
 SP_CRT=$(echo -E "$SECAUTHSECRETS" | jq -r '.spcrt')
 

bin/cloudgov/scp-from

@@ -18,7 +18,7 @@ instance_index=${4:-0}
 # https://cloud.gov/knowledge-base/2021-05-17-troubleshooting-ssh-connections/#changes-to-your-app-in-the-capi
 # We need the PROCESS_GUID for the "web process" for our app. 
 echo "getting ssh_host"
-ssh_host=`cf curl /v2/info | jq .app_ssh_endpoint | awk -F : '{print $1}' | sed 's/\"//g'`
+ssh_host=`cf curl / | jq -r '.links.app_ssh.href | split(":")[0]'`
 
 echo "getting app_guid"
 app_guid=`cf env ${app_name} | grep application_id | awk '{print $2}' | sed 's/\"//g' | sed 's/,//g'`

bin/cloudgov/scp-to

@@ -18,7 +18,7 @@ instance_index=${4:-0}
 # https://cloud.gov/knowledge-base/2021-05-17-troubleshooting-ssh-connections/#changes-to-your-app-in-the-capi
 # We need the PROCESS_GUID for the "web process" for our app. 
 echo "getting ssh_host"
-ssh_host=`cf curl /v2/info | jq .app_ssh_endpoint | awk -F : '{print $1}' | sed 's/\"//g'`
+ssh_host=`cf curl / | jq -r '.links.app_ssh.href | split(":")[0]'`
 
 echo "getting app_guid"
 app_guid=`cf env ${app_name} | grep application_id | awk '{print $2}' | sed 's/\"//g' | sed 's/,//g'`

bin/snapshot-backups/old-db-pull-docker.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+#!/bin/bash
 
 CF_SVC_USER=$1
 CF_SVC_PASS=$2
@@ -12,7 +13,6 @@ cf login -a https://api.fr.cloud.gov -u $CF_SVC_USER -p $CF_SVC_PASS
 echo "[INFO] Creating access keys"
 cf create-service-key database db-dump >/dev/null 2>&1
 CF_GUID=$(cf app cms --guid)
-CF_INFO=$(cf curl /v2/info)
 CF_DB_INFO=$(cf service-key database db-dump)
 
 CF_DB_PORT=$(echo "$CF_DB_INFO" | grep '"port":' | sed 's/.*"port": "\([^"]*\)".*/\1/')
@@ -21,7 +21,7 @@ CF_DB_USER=$(echo "$CF_DB_INFO" | grep '"username":' | sed 's/.*"username": "\([
 CF_DB_PASS=$(echo "$CF_DB_INFO" | grep '"password":' | sed 's/.*"password": "\([^"]*\)".*/\1/')
 CF_DB_NAME=$(echo "$CF_DB_INFO" | grep '"db_name":' | sed 's/.*"db_name": "\([^"]*\)".*/\1/')
 
-CF_SSH_ENDPOINT=$(echo "$CF_INFO" | grep '"app_ssh_endpoint":' | sed 's/.*"app_ssh_endpoint": "\([^:]*\).*".*/\1/')
+CF_SSH_ENDPOINT=`cf curl / | jq -r '.links.app_ssh.href | split(":")[0]'`
 CF_SSH_CODE=$(cf ssh-code)
 
 echo "[INFO] Creating local sql connection"

web/modules/custom/usa_twig_vars/src/Event/DatalayerAlterEvent.php

@@ -3,10 +3,19 @@
 namespace Drupal\usa_twig_vars\Event;
 
 use Drupal\Component\EventDispatcher\Event;
+// phpcs:ignore
+use Drupal\usa_twig_vars\TaxonomyDatalayerBuilder;
 
+
+/**
+ * @phpstan-import-type TaxonomyBreadcrumb from TaxonomyDatalayerBuilder
+ */
 class DatalayerAlterEvent extends Event {
   const EVENT_NAME = 'usa_twig_vars.datalayer_alter';
 
+  /**
+   * @param TaxonomyBreadcrumb $datalayer
+   */
   public function __construct(
     public array $datalayer,
   ) {}

web/modules/custom/usa_twig_vars/src/TaxonomyDatalayerBuilder.php

@@ -5,10 +5,31 @@
 use Drupal\Core\Breadcrumb\ChainBreadcrumbBuilderInterface;
 use Drupal\Core\Entity\EntityMalformedException;
 use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\node\Entity\Node;
+use Drupal\node\NodeInterface;
 
 /**
  * Builds a datalayer array we can serialize to JSON in our twig template.
+ *
+ * @phpstan-type TaxonomyBreadcrumb array{
+ *   "nodeID"?: string,
+ *   language?: "es"|"en",
+ *   homepageTest?: "homepage"|"not_homepage",
+ *   basicPagesubType?: null|string,
+ *   contentType?: string,
+ *   Page_Type?: string,
+ *   Taxonomy_Text_1: string,
+ *   Taxonomy_Text_2: string,
+ *   Taxonomy_Text_3: string,
+ *   Taxonomy_Text_4: string,
+ *   Taxonomy_Text_5: string,
+ *   Taxonomy_Text_6: string,
+ *   Taxonomy_URL_1: string,
+ *   Taxonomy_URL_2: string,
+ *   Taxonomy_URL_3: string,
+ *   Taxonomy_URL_4: string,
+ *   Taxonomy_URL_5: string,
+ *   Taxonomy_URL_6: string,
+ * }
  */
 class TaxonomyDatalayerBuilder {
 
@@ -50,7 +71,7 @@ class TaxonomyDatalayerBuilder {
   public function __construct(
     private RouteMatchInterface $routeMatch,
     private ChainBreadcrumbBuilderInterface $breadcrumbManager,
-    public Node $node,
+    public NodeInterface $node,
     bool $isFront,
     public ?string $basicPagesubType,
   ) {
@@ -60,7 +81,7 @@ public function __construct(
   /**
    * Builds the datalayer array.
    *
-   * @return array
+   * @return TaxonomyBreadcrumb
    *   Initial datalayer payload.
    *
    * @throws \Drupal\Core\Entity\EntityMalformedException
@@ -123,7 +144,7 @@ public function build(): array {
   /**
    * Build Taxonomy entries based on menu breadcrumbs.
    *
-   * @return array
+   * @return TaxonomyBreadcrumb
    *   Breadcrumb info to send.
    *
    * @throws \Drupal\Core\Entity\EntityMalformedException
@@ -179,7 +200,7 @@ public function fromBreadcrumb(): array {
   /**
    * Get Taxonomy Entries for homepage.
    *
-   * @return array
+   * @return array<string, non-empty-string>
    *   Breadcrumb info to send.
    */
   public function getHomepage(): array {
@@ -188,15 +209,16 @@ public function getHomepage(): array {
     $taxonomy = [];
     for ($i = 1; $i < 7; $i++) {
       switch ($this->langcode) {
-        case 'en':
-          $taxonomy["Taxonomy_Text_" . $i] = self::HOME_TITLE_EN;
-          $taxonomy["Taxonomy_URL_" . $i] = self::HOME_URL_EN;
-          break;
-
         case 'es':
           $taxonomy["Taxonomy_Text_" . $i] = self::HOME_TITLE_ES;
           $taxonomy["Taxonomy_URL_" . $i] = self::HOME_URL_ES;
           break;
+
+        case 'en':
+        default:
+          $taxonomy["Taxonomy_Text_" . $i] = self::HOME_TITLE_EN;
+          $taxonomy["Taxonomy_URL_" . $i] = self::HOME_URL_EN;
+          break;
       }
     }
 
@@ -206,7 +228,7 @@ public function getHomepage(): array {
   /**
    * Get Taxonomy info for a Federal Agency node.
    *
-   * @return array
+   * @return TaxonomyBreadcrumb
    *   Breadcrumb info to send.
    *
    * @throws \Drupal\Core\Entity\EntityMalformedException
@@ -250,9 +272,7 @@ public function getFederalAgency(): array {
   /**
    * Get Taxonomy info for a Sate Agency node.
    *
-   * @return array
-   *   Breadcrumb info to send.
-   *
+   * @return TaxonomyBreadcrumb
    * @throws \Drupal\Core\Entity\EntityMalformedException
    */
   public function getStateDirectory(): array {