Merge pull request opencart#13935 from TheCartpenter/patch-104

Upgraded aws/aws-sdk-php vendor to v3.307.0
rahulabs · May 18, 2024 · 1e57bd3 · 1e57bd3
2 parents b979147 + c184fc0
commit 1e57bd3
Show file tree

Hide file tree

Showing 21 changed files with 95 additions and 41 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/AwsClient.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/AwsClient.php
@@ -203,6 +203,13 @@ public static function getArguments()
      *   client-side parameter validation.
      * - version: (string, required) The version of the webservice to
      *   utilize (e.g., 2006-03-01).
+     * - ua_append: (string, array) To pass custom user agent parameters.
+     * - app_id: (string) an optional application specific identifier that can be set.
+     *   When set it will be appended to the User-Agent header of every request
+     *   in the form of App/{AppId}. This variable is sourced from environment
+     *   variable AWS_SDK_UA_APP_ID or the shared config profile attribute sdk_ua_app_id.
+     *   See https://docs.aws.amazon.com/sdkref/latest/guide/settings-reference.html for
+     *   more information on environment variables and shared config settings.
      *
      * @param array $args Client configuration arguments.
      *

diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/ClientResolver.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/ClientResolver.php
@@ -270,6 +270,15 @@ class ClientResolver
             'fn'       => [__CLASS__, '_apply_handler'],
             'default'  => [__CLASS__, '_default_handler']
         ],
+        'app_id' => [
+            'type' => 'value',
+            'valid' => ['string'],
+            'doc' => 'app_id(AppId) is an optional application specific identifier that can be set. 
+             When set it will be appended to the User-Agent header of every request in the form of App/{AppId}. 
+             This value is also sourced from environment variable AWS_SDK_UA_APP_ID or the shared config profile attribute sdk_ua_app_id.',
+            'fn' => [__CLASS__, '_apply_app_id'],
+            'default' => [__CLASS__, '_default_app_id']
+        ],
         'ua_append' => [
             'type'     => 'value',
             'valid'    => ['string', 'array'],
@@ -917,17 +926,43 @@ public static function _apply_http_handler($value, array &$args, HandlerList $li
         );
     }
 
+    public static function _apply_app_id($value, array &$args)
+    {
+        // AppId should not be longer than 50 chars
+        static $MAX_APP_ID_LENGTH = 50;
+        if (strlen($value) > $MAX_APP_ID_LENGTH) {
+            trigger_error("The provided or configured value for `AppId`, "
+                ."which is an user agent parameter, exceeds the maximum length of "
+            ."$MAX_APP_ID_LENGTH characters.", E_USER_WARNING);
+        }
+
+        $args['app_id'] = $value;
+    }
+
+    public static function _default_app_id(array $args)
+    {
+        return ConfigurationResolver::resolve(
+            'sdk_ua_app_id',
+            '',
+            'string',
+            $args
+        );
+    }
+
     public static function _apply_user_agent($inputUserAgent, array &$args, HandlerList $list)
     {
-        //Add SDK version
+        // Add SDK version
         $userAgent = ['aws-sdk-php/' . Sdk::VERSION];
 
-        //If on HHVM add the HHVM version
+        // User Agent Metadata
+        $userAgent[] = 'ua/2.0';
+
+        // If on HHVM add the HHVM version
         if (defined('HHVM_VERSION')) {
             $userAgent []= 'HHVM/' . HHVM_VERSION;
         }
 
-        //Add OS version
+        // Add OS version
         $disabledFunctions = explode(',', ini_get('disable_functions'));
         if (function_exists('php_uname')
             && !in_array('php_uname', $disabledFunctions, true)
@@ -938,15 +973,15 @@ public static function _apply_user_agent($inputUserAgent, array &$args, HandlerL
             }
         }
 
-        //Add the language version
+        // Add the language version
         $userAgent []= 'lang/php#' . phpversion();
 
-        //Add exec environment if present
+        // Add exec environment if present
         if ($executionEnvironment = getenv('AWS_EXECUTION_ENV')) {
             $userAgent []= $executionEnvironment;
         }
 
-        //Add endpoint discovery if set
+        // Add endpoint discovery if set
         if (isset($args['endpoint_discovery'])) {
             if (($args['endpoint_discovery'] instanceof \Aws\EndpointDiscovery\Configuration
                 && $args['endpoint_discovery']->isEnabled())
@@ -960,7 +995,7 @@ public static function _apply_user_agent($inputUserAgent, array &$args, HandlerL
             }
         }
 
-        //Add retry mode if set
+        // Add retry mode if set
         if (isset($args['retries'])) {
             if ($args['retries'] instanceof \Aws\Retry\Configuration) {
                 $userAgent []= 'cfg/retry-mode#' . $args["retries"]->getMode();
@@ -970,7 +1005,13 @@ public static function _apply_user_agent($inputUserAgent, array &$args, HandlerL
                 $userAgent []= 'cfg/retry-mode#' . $args["retries"]["mode"];
             }
         }
-        //Add the input to the end
+
+        // AppID Metadata
+        if (!empty($args['app_id'])) {
+            $userAgent[] = 'app/' . $args['app_id'];
+        }
+
+        // Add the input to the end
         if ($inputUserAgent){
             if (!is_array($inputUserAgent)) {
                 $inputUserAgent = [$inputUserAgent];
@@ -1188,7 +1229,7 @@ public static function _default_endpoint(array &$args)
 
         return $value;
     }
-  
+
     public static function _apply_region($value, array &$args)
     {
         if (empty($value)) {

diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/LakeFormation/LakeFormationClient.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/LakeFormation/LakeFormationClient.php
@@ -47,6 +47,8 @@
  * @method \GuzzleHttp\Promise\Promise extendTransactionAsync(array $args = [])
  * @method \Aws\Result getDataCellsFilter(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getDataCellsFilterAsync(array $args = [])
+ * @method \Aws\Result getDataLakePrincipal(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise getDataLakePrincipalAsync(array $args = [])
  * @method \Aws\Result getDataLakeSettings(array $args = [])
  * @method \GuzzleHttp\Promise\Promise getDataLakeSettingsAsync(array $args = [])
  * @method \Aws\Result getEffectivePermissionsForPath(array $args = [])

diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/QuickSight/QuickSightClient.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/QuickSight/QuickSightClient.php
@@ -155,6 +155,8 @@
  * @method \GuzzleHttp\Promise\Promise describeIngestionAsync(array $args = [])
  * @method \Aws\Result describeIpRestriction(array $args = [])
  * @method \GuzzleHttp\Promise\Promise describeIpRestrictionAsync(array $args = [])
+ * @method \Aws\Result describeKeyRegistration(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise describeKeyRegistrationAsync(array $args = [])
  * @method \Aws\Result describeNamespace(array $args = [])
  * @method \GuzzleHttp\Promise\Promise describeNamespaceAsync(array $args = [])
  * @method \Aws\Result describeRefreshSchedule(array $args = [])
@@ -319,6 +321,8 @@
  * @method \GuzzleHttp\Promise\Promise updateIdentityPropagationConfigAsync(array $args = [])
  * @method \Aws\Result updateIpRestriction(array $args = [])
  * @method \GuzzleHttp\Promise\Promise updateIpRestrictionAsync(array $args = [])
+ * @method \Aws\Result updateKeyRegistration(array $args = [])
+ * @method \GuzzleHttp\Promise\Promise updateKeyRegistrationAsync(array $args = [])
  * @method \Aws\Result updatePublicSharingSettings(array $args = [])
  * @method \GuzzleHttp\Promise\Promise updatePublicSharingSettingsAsync(array $args = [])
  * @method \Aws\Result updateRefreshSchedule(array $args = [])

diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/Sdk.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/Sdk.php
@@ -767,7 +767,7 @@
  */
 class Sdk
 {
-    const VERSION = '3.306.7';
+    const VERSION = '3.307.1';
 
     /** @var array Arguments for creating clients */
     private $args;

diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/data/acm-pca/2017-08-22/api-2.json.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/data/acm-pca/2017-08-22/api-2.json.php
diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/data/acm-pca/2017-08-22/waiters-2.json.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/data/acm-pca/2017-08-22/waiters-2.json.php
@@ -1,3 +1,3 @@
 <?php
 // This file was auto-generated from sdk-root/src/data/acm-pca/2017-08-22/waiters-2.json
-return [ 'version' => 2, 'waiters' => [ 'CertificateAuthorityCSRCreated' => [ 'description' => 'Wait until a Certificate Authority CSR is created', 'operation' => 'GetCertificateAuthorityCsr', 'delay' => 3, 'maxAttempts' => 60, 'acceptors' => [ [ 'state' => 'success', 'matcher' => 'status', 'expected' => 200, ], [ 'state' => 'retry', 'matcher' => 'error', 'expected' => 'RequestInProgressException', ], ], ], 'CertificateIssued' => [ 'description' => 'Wait until a certificate is issued', 'operation' => 'GetCertificate', 'delay' => 1, 'maxAttempts' => 60, 'acceptors' => [ [ 'state' => 'success', 'matcher' => 'status', 'expected' => 200, ], [ 'state' => 'retry', 'matcher' => 'error', 'expected' => 'RequestInProgressException', ], ], ], 'AuditReportCreated' => [ 'description' => 'Wait until a Audit Report is created', 'operation' => 'DescribeCertificateAuthorityAuditReport', 'delay' => 3, 'maxAttempts' => 60, 'acceptors' => [ [ 'state' => 'success', 'matcher' => 'path', 'argument' => 'AuditReportStatus', 'expected' => 'SUCCESS', ], [ 'state' => 'failure', 'matcher' => 'path', 'argument' => 'AuditReportStatus', 'expected' => 'FAILED', ], ], ], ],];
+return [ 'version' => 2, 'waiters' => [ 'CertificateAuthorityCSRCreated' => [ 'description' => 'Wait until a Certificate Authority CSR is created', 'operation' => 'GetCertificateAuthorityCsr', 'delay' => 3, 'maxAttempts' => 60, 'acceptors' => [ [ 'state' => 'success', 'matcher' => 'status', 'expected' => 200, ], [ 'state' => 'retry', 'matcher' => 'error', 'expected' => 'RequestInProgressException', ], [ 'state' => 'failure', 'matcher' => 'error', 'expected' => 'AccessDeniedException', ], ], ], 'CertificateIssued' => [ 'description' => 'Wait until a certificate is issued', 'operation' => 'GetCertificate', 'delay' => 1, 'maxAttempts' => 60, 'acceptors' => [ [ 'state' => 'success', 'matcher' => 'status', 'expected' => 200, ], [ 'state' => 'retry', 'matcher' => 'error', 'expected' => 'RequestInProgressException', ], [ 'state' => 'failure', 'matcher' => 'error', 'expected' => 'AccessDeniedException', ], ], ], 'AuditReportCreated' => [ 'description' => 'Wait until a Audit Report is created', 'operation' => 'DescribeCertificateAuthorityAuditReport', 'delay' => 3, 'maxAttempts' => 60, 'acceptors' => [ [ 'state' => 'success', 'matcher' => 'path', 'argument' => 'AuditReportStatus', 'expected' => 'SUCCESS', ], [ 'state' => 'failure', 'matcher' => 'path', 'argument' => 'AuditReportStatus', 'expected' => 'FAILED', ], [ 'state' => 'failure', 'matcher' => 'error', 'expected' => 'AccessDeniedException', ], ], ], ],];
diff --git a/...storage/vendor/aws/aws-sdk-php/src/data/application-autoscaling/2016-02-06/api-2.json.php b/...storage/vendor/aws/aws-sdk-php/src/data/application-autoscaling/2016-02-06/api-2.json.php
diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/data/codebuild/2016-10-06/api-2.json.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/data/codebuild/2016-10-06/api-2.json.php
diff --git a/.../storage/vendor/aws/aws-sdk-php/src/data/elasticloadbalancingv2/2015-12-01/api-2.json.php b/.../storage/vendor/aws/aws-sdk-php/src/data/elasticloadbalancingv2/2015-12-01/api-2.json.php
diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/data/endpoints.json.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/data/endpoints.json.php
diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/data/kafka/2018-11-14/api-2.json.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/data/kafka/2018-11-14/api-2.json.php
diff --git a/...ad/system/storage/vendor/aws/aws-sdk-php/src/data/lakeformation/2017-03-31/api-2.json.php b/...ad/system/storage/vendor/aws/aws-sdk-php/src/data/lakeformation/2017-03-31/api-2.json.php
diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/data/mwaa/2020-07-01/api-2.json.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/data/mwaa/2020-07-01/api-2.json.php
diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/data/quicksight/2018-04-01/api-2.json.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/data/quicksight/2018-04-01/api-2.json.php
diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/data/sagemaker/2017-07-24/api-2.json.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/data/sagemaker/2017-07-24/api-2.json.php
diff --git a/...d/system/storage/vendor/aws/aws-sdk-php/src/data/secretsmanager/2017-10-17/api-2.json.php b/...d/system/storage/vendor/aws/aws-sdk-php/src/data/secretsmanager/2017-10-17/api-2.json.php
diff --git a/upload/system/storage/vendor/aws/aws-sdk-php/src/data/transfer/2018-11-05/api-2.json.php b/upload/system/storage/vendor/aws/aws-sdk-php/src/data/transfer/2018-11-05/api-2.json.php
diff --git a/upload/system/storage/vendor/composer/installed.json b/upload/system/storage/vendor/composer/installed.json
@@ -59,17 +59,17 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.306.7",
-            "version_normalized": "3.306.7.0",
+            "version": "3.307.1",
+            "version_normalized": "3.307.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "bc30df54badd9d2af8d291cd0665ade6eb509598"
+                "reference": "cc79f16e1a1bd3feee421401ba2f21915abfdf91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bc30df54badd9d2af8d291cd0665ade6eb509598",
-                "reference": "bc30df54badd9d2af8d291cd0665ade6eb509598",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/cc79f16e1a1bd3feee421401ba2f21915abfdf91",
+                "reference": "cc79f16e1a1bd3feee421401ba2f21915abfdf91",
                 "shasum": ""
             },
             "require": {
@@ -110,7 +110,7 @@
                 "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages",
                 "ext-sockets": "To use client-side monitoring"
             },
-            "time": "2024-05-15T18:04:12+00:00",
+            "time": "2024-05-17T18:07:44+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -151,7 +151,7 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.306.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.307.1"
             },
             "install-path": "../aws/aws-sdk-php"
         },

diff --git a/upload/system/storage/vendor/composer/installed.php b/upload/system/storage/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'opencart/opencart',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '0d5881f2ba0b205986429f588bd61964f55ee7a2',
+        'reference' => 'fa75e790b89c6419124baa7f7355c0d38b68f500',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../../../../',
         'aliases' => array(),
@@ -20,9 +20,9 @@
             'dev_requirement' => false,
         ),
         'aws/aws-sdk-php' => array(
-            'pretty_version' => '3.306.7',
-            'version' => '3.306.7.0',
-            'reference' => 'bc30df54badd9d2af8d291cd0665ade6eb509598',
+            'pretty_version' => '3.307.1',
+            'version' => '3.307.1.0',
+            'reference' => 'cc79f16e1a1bd3feee421401ba2f21915abfdf91',
             'type' => 'library',
             'install_path' => __DIR__ . '/../aws/aws-sdk-php',
             'aliases' => array(),
@@ -67,7 +67,7 @@
         'opencart/opencart' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '0d5881f2ba0b205986429f588bd61964f55ee7a2',
+            'reference' => 'fa75e790b89c6419124baa7f7355c0d38b68f500',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../../../../',
             'aliases' => array(),