intermediate changes

ref:6e9f3b8437798630a92bd95deec18ca450f80260

9 files changed, 201 insertions, 30 deletions

diff --git a/contrib/python/boto3/py3/.dist-info/METADATA b/contrib/python/boto3/py3/.dist-info/METADATA
index f4c32f994e..27e3782189 100644
--- a/contrib/python/boto3/py3/.dist-info/METADATA
+++ b/contrib/python/boto3/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boto3
-Version: 1.22.13
+Version: 1.23.0
 Summary: The AWS SDK for Python
 Home-page: https://github.com/boto/boto3
 Author: Amazon Web Services
@@ -22,7 +22,7 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >= 3.6
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: botocore (<1.26.0,>=1.25.13)
+Requires-Dist: botocore (<1.27.0,>=1.26.0)
 Requires-Dist: jmespath (<2.0.0,>=0.7.1)
 Requires-Dist: s3transfer (<0.6.0,>=0.5.0)
 Provides-Extra: crt
diff --git a/contrib/python/boto3/py3/boto3/__init__.py b/contrib/python/boto3/py3/boto3/__init__.py
index a65b015b93..d0e6e3c03c 100644
--- a/contrib/python/boto3/py3/boto3/__init__.py
+++ b/contrib/python/boto3/py3/boto3/__init__.py
@@ -17,7 +17,7 @@ from boto3.compat import _warn_deprecated_python
 from boto3.session import Session
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.22.13'
+__version__ = '1.23.0'
 
 
 # The default Boto3 session; autoloaded when needed.
diff --git a/contrib/python/botocore/py3/.dist-info/METADATA b/contrib/python/botocore/py3/.dist-info/METADATA
index 6e81c85921..8000edb676 100644
--- a/contrib/python/botocore/py3/.dist-info/METADATA
+++ b/contrib/python/botocore/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: botocore
-Version: 1.25.13
+Version: 1.26.0
 Summary: Low-level, data-driven core of boto 3.
 Home-page: https://github.com/boto/botocore
 Author: Amazon Web Services
diff --git a/contrib/python/botocore/py3/botocore/__init__.py b/contrib/python/botocore/py3/botocore/__init__.py
index e8f623faf1..700a9dc2e2 100644
--- a/contrib/python/botocore/py3/botocore/__init__.py
+++ b/contrib/python/botocore/py3/botocore/__init__.py
@@ -16,7 +16,7 @@ import logging
 import os
 import re
 
-__version__ = '1.25.13'
+__version__ = '1.26.0'
 
 
 class NullHandler(logging.Handler):
diff --git a/contrib/python/botocore/py3/botocore/compat.py b/contrib/python/botocore/py3/botocore/compat.py
index 94907c7215..32bcbf8292 100644
--- a/contrib/python/botocore/py3/botocore/compat.py
+++ b/contrib/python/botocore/py3/botocore/compat.py
@@ -341,3 +341,10 @@ IPV6_ADDRZ_RE = re.compile("^" + IPV6_ADDRZ_PAT + "$")
 
 # These are the characters that are stripped by post-bpo-43882 urlparse().
 UNSAFE_URL_CHARS = frozenset('\t\r\n')
+
+# Detect if gzip is available for use
+try:
+    import gzip
+    HAS_GZIP = True
+except ImportError:
+    HAS_GZIP = False
diff --git a/contrib/python/botocore/py3/botocore/data/grafana/2020-08-18/service-2.json b/contrib/python/botocore/py3/botocore/data/grafana/2020-08-18/service-2.json
index f6e92d894c..e609f5b492 100644
--- a/contrib/python/botocore/py3/botocore/data/grafana/2020-08-18/service-2.json
+++ b/contrib/python/botocore/py3/botocore/data/grafana/2020-08-18/service-2.json
@@ -50,6 +50,26 @@
       "documentation":"<p>Creates a <i>workspace</i>. In a workspace, you can create Grafana dashboards and visualizations to analyze your metrics, logs, and traces. You don't have to build, package, or deploy any hardware to run the Grafana server.</p> <p>Don't use <code>CreateWorkspace</code> to modify an existing workspace. Instead, use <a href=\"https://docs.aws.amazon.com/grafana/latest/APIReference/API_UpdateWorkspace.html\">UpdateWorkspace</a>.</p>",
       "idempotent":true
     },
+    "CreateWorkspaceApiKey":{
+      "name":"CreateWorkspaceApiKey",
+      "http":{
+        "method":"POST",
+        "requestUri":"/workspaces/{workspaceId}/apikeys",
+        "responseCode":200
+      },
+      "input":{"shape":"CreateWorkspaceApiKeyRequest"},
+      "output":{"shape":"CreateWorkspaceApiKeyResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ServiceQuotaExceededException"}
+      ],
+      "documentation":"<p>Creates an API key for the workspace. This key can be used to authenticate requests sent to the workspace's HTTP API. See <a href=\" https://docs.aws.amazon.com/grafana/latest/userguide/Using-Grafana-APIs.html\"> https://docs.aws.amazon.com/grafana/latest/userguide/Using-Grafana-APIs.html</a> for available APIs and example requests.</p>"
+    },
     "DeleteWorkspace":{
       "name":"DeleteWorkspace",
       "http":{
@@ -70,6 +90,25 @@
       "documentation":"<p>Deletes an Amazon Managed Grafana workspace.</p>",
       "idempotent":true
     },
+    "DeleteWorkspaceApiKey":{
+      "name":"DeleteWorkspaceApiKey",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/workspaces/{workspaceId}/apikeys/{keyName}",
+        "responseCode":200
+      },
+      "input":{"shape":"DeleteWorkspaceApiKeyRequest"},
+      "output":{"shape":"DeleteWorkspaceApiKeyResponse"},
+      "errors":[
+        {"shape":"ResourceNotFoundException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"ConflictException"},
+        {"shape":"ValidationException"},
+        {"shape":"AccessDeniedException"},
+        {"shape":"InternalServerException"}
+      ],
+      "documentation":"<p>Deletes an API key for a workspace.</p>"
+    },
     "DescribeWorkspace":{
       "name":"DescribeWorkspace",
       "http":{
@@ -300,6 +339,15 @@
       "type":"list",
       "member":{"shape":"AllowedOrganization"}
     },
+    "ApiKeyName":{
+      "type":"string",
+      "max":100,
+      "min":1
+    },
+    "ApiKeyToken":{
+      "type":"string",
+      "sensitive":true
+    },
     "AssertionAttribute":{
       "type":"string",
       "max":256,
@@ -457,6 +505,63 @@
       },
       "exception":true
     },
+    "CreateWorkspaceApiKeyRequest":{
+      "type":"structure",
+      "required":[
+        "keyName",
+        "keyRole",
+        "secondsToLive",
+        "workspaceId"
+      ],
+      "members":{
+        "keyName":{
+          "shape":"ApiKeyName",
+          "documentation":"<p>Specifies the name of the key to create. Key names must be unique to the workspace.</p>"
+        },
+        "keyRole":{
+          "shape":"String",
+          "documentation":"<p>Specifies the permission level of the key.</p> <p>Valid Values: <code>VIEWER</code> | <code>EDITOR</code> | <code>ADMIN</code> </p>"
+        },
+        "secondsToLive":{
+          "shape":"CreateWorkspaceApiKeyRequestSecondsToLiveInteger",
+          "documentation":"<p>Specifies the time in seconds until the key expires. Keys can be valid for up to 30 days.</p>"
+        },
+        "workspaceId":{
+          "shape":"WorkspaceId",
+          "documentation":"<p>The ID of the workspace in which to create an API key.</p>",
+          "location":"uri",
+          "locationName":"workspaceId"
+        }
+      }
+    },
+    "CreateWorkspaceApiKeyRequestSecondsToLiveInteger":{
+      "type":"integer",
+      "box":true,
+      "max":2592000,
+      "min":1
+    },
+    "CreateWorkspaceApiKeyResponse":{
+      "type":"structure",
+      "required":[
+        "key",
+        "keyName",
+        "workspaceId"
+      ],
+      "members":{
+        "key":{
+          "shape":"ApiKeyToken",
+          "documentation":"<p>The key token that was created. Use this value as a bearer token to authenticate HTTP requests to the workspace.</p>"
+        },
+        "keyName":{
+          "shape":"ApiKeyName",
+          "documentation":"<p>The name of the key that was created.</p>"
+        },
+        "workspaceId":{
+          "shape":"WorkspaceId",
+          "documentation":"<p>The ID of the workspace that the key is valid for.</p>"
+        }
+      }
+    },
     "CreateWorkspaceRequest":{
       "type":"structure",
       "required":[
@@ -547,6 +652,44 @@
       "type":"list",
       "member":{"shape":"DataSourceType"}
     },
+    "DeleteWorkspaceApiKeyRequest":{
+      "type":"structure",
+      "required":[
+        "keyName",
+        "workspaceId"
+      ],
+      "members":{
+        "keyName":{
+          "shape":"ApiKeyName",
+          "documentation":"<p>The name of the API key to delete.</p>",
+          "location":"uri",
+          "locationName":"keyName"
+        },
+        "workspaceId":{
+          "shape":"WorkspaceId",
+          "documentation":"<p>The ID of the workspace to delete.</p>",
+          "location":"uri",
+          "locationName":"workspaceId"
+        }
+      }
+    },
+    "DeleteWorkspaceApiKeyResponse":{
+      "type":"structure",
+      "required":[
+        "keyName",
+        "workspaceId"
+      ],
+      "members":{
+        "keyName":{
+          "shape":"ApiKeyName",
+          "documentation":"<p>The name of the API key that was deleted.</p>"
+        },
+        "workspaceId":{
+          "shape":"WorkspaceId",
+          "documentation":"<p>The ID of the workspace where the key was deleted.</p>"
+        }
+      }
+    },
     "DeleteWorkspaceRequest":{
       "type":"structure",
       "required":["workspaceId"],
@@ -921,7 +1064,8 @@
       "type":"string",
       "enum":[
         "ADMIN",
-        "EDITOR"
+        "EDITOR",
+        "VIEWER"
       ]
     },
     "RoleValue":{
diff --git a/contrib/python/botocore/py3/botocore/loaders.py b/contrib/python/botocore/py3/botocore/loaders.py
index 698aa725e7..2511ee64f0 100644
--- a/contrib/python/botocore/py3/botocore/loaders.py
+++ b/contrib/python/botocore/py3/botocore/loaders.py
@@ -106,12 +106,23 @@ import logging
 import os
 
 from botocore import BOTOCORE_ROOT
-from botocore.compat import OrderedDict, json, six
+from botocore.compat import HAS_GZIP, OrderedDict, json, six
 from botocore.exceptions import DataNotFoundError, UnknownServiceError
 from botocore.utils import deep_merge
 
 from library.python import resource
 
+_JSON_OPEN_METHODS = {
+    '.json': open,
+}
+
+
+if HAS_GZIP:
+    from gzip import open as gzip_open
+
+    _JSON_OPEN_METHODS['.json.gz'] = gzip_open
+
+
 logger = logging.getLogger(__name__)
 
 
@@ -155,7 +166,22 @@ class JSONFileLoader:
         :return: True if file path exists, False otherwise.
 
         """
-        return os.path.isfile(file_path + '.json')
+        for ext in _JSON_OPEN_METHODS:
+            if os.path.isfile(file_path + ext):
+                return True
+        return False
+
+    def _load_file(self, full_path, open_method):
+        if not os.path.isfile(full_path):
+            return
+
+        # By default the file will be opened with locale encoding on Python 3.
+        # We specify "utf8" here to ensure the correct behavior.
+        with open_method(full_path, 'rb') as fp:
+            payload = fp.read().decode('utf-8')
+
+        logger.debug("Loading JSON file: %s", full_path)
+        return json.loads(payload, object_pairs_hook=OrderedDict)
 
     def load_file(self, file_path):
         """Attempt to load the file path.
@@ -167,17 +193,11 @@ class JSONFileLoader:
         :return: The loaded data if it exists, otherwise None.
 
         """
-        full_path = file_path + '.json'
-        if not os.path.isfile(full_path):
-            return
-
-        # By default the file will be opened with locale encoding on Python 3.
-        # We specify "utf8" here to ensure the correct behavior.
-        with open(full_path, 'rb') as fp:
-            payload = fp.read().decode('utf-8')
-
-        logger.debug("Loading JSON file: %s", full_path)
-        return json.loads(payload, object_pairs_hook=OrderedDict)
+        for (ext, open_method) in _JSON_OPEN_METHODS.items():
+            data = self._load_file(file_path + ext, open_method)
+            if data is not None:
+                return data
+        return None
 
 
 # SQS-119
diff --git a/contrib/python/botocore/py3/patches/02-fix-for-arcadia.patch b/contrib/python/botocore/py3/patches/02-fix-for-arcadia.patch
index b7d6092b5b..2b55bd6b97 100644
--- a/contrib/python/botocore/py3/patches/02-fix-for-arcadia.patch
+++ b/contrib/python/botocore/py3/patches/02-fix-for-arcadia.patch
@@ -81,17 +81,17 @@
  import os
  
  from botocore import BOTOCORE_ROOT
--from botocore.compat import OrderedDict, json
-+from botocore.compat import OrderedDict, json, six
+-from botocore.compat import HAS_GZIP, OrderedDict, json
++from botocore.compat import HAS_GZIP, OrderedDict, json, six
  from botocore.exceptions import DataNotFoundError, UnknownServiceError
  from botocore.utils import deep_merge
  
 +from library.python import resource
 +
- logger = logging.getLogger(__name__)
- 
- 
-@@ -177,6 +180,51 @@ class JSONFileLoader(object):
+ _JSON_OPEN_METHODS = {
+     '.json': open,
+ }
+@@ -197,6 +200,51 @@ class JSONFileLoader(object):
          return json.loads(payload, object_pairs_hook=OrderedDict)
  
  
@@ -143,7 +143,7 @@
  def create_loader(search_path_string=None):
      """Create a Loader class.
  
-@@ -211,7 +259,7 @@ class Loader(object):
+@@ -231,7 +279,7 @@ class Loader(object):
  
      """
 
@@ -152,7 +152,7 @@
      # The included models in botocore/data/ that we ship with botocore.
      BUILTIN_DATA_PATH = os.path.join(BOTOCORE_ROOT, 'data')
      # For convenience we automatically add ~/.aws/models to the data path.
-@@ -296,6 +344,11 @@ class Loader(object):
+@@ -316,6 +364,11 @@ class Loader(object):
                      if self.file_loader.exists(full_load_path):
                          services.add(service_name)
                          break
@@ -164,7 +164,7 @@
          return sorted(services)
  
      @instance_cache
-@@ -347,6 +400,11 @@ class Loader(object):
+@@ -367,6 +420,11 @@ class Loader(object):
                  # to the type_name passed in.
                  if self.file_loader.exists(full_path):
                      known_api_versions.add(dirname)
@@ -176,7 +176,7 @@
          if not known_api_versions:
              raise DataNotFoundError(data_path=service_name)
          return sorted(known_api_versions)
-@@ -434,6 +492,12 @@ class Loader(object):
+@@ -454,6 +512,12 @@ class Loader(object):
              found = self.file_loader.load_file(possible_path)
              if found is not None:
                  return found
diff --git a/contrib/python/botocore/py3/patches/03-extended-listings.patch b/contrib/python/botocore/py3/patches/03-extended-listings.patch
index b300046dca..2d6131e7c6 100644
--- a/contrib/python/botocore/py3/patches/03-extended-listings.patch
+++ b/contrib/python/botocore/py3/patches/03-extended-listings.patch
@@ -6,7 +6,7 @@ date: 2021-10-27T00:34:16+03:00
 
 --- contrib/python/botocore/py3/botocore/data/s3/2006-03-01/service-2.json	(73e85ed9c4be248886f10db6b7d83f27d446916c)
 +++ contrib/python/botocore/py3/botocore/data/s3/2006-03-01/service-2.json	(cc02b99f18408f40978b56abfd8e5e9b2c2492d7)
-@@ -716,6 +716,19 @@
+@@ -741,6 +741,19 @@
        ],
        "documentation":"<p>Returns some or all (up to 1,000) of the objects in a bucket with each request. You can use the request parameters as selection criteria to return a subset of the objects in a bucket. A <code>200 OK</code> response can contain valid or invalid XML. Make sure to design your application to parse the contents of the response and handle it appropriately. Objects are returned sorted in an ascending order of the respective key names in the list. For more information about listing objects, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/userguide/ListingKeysUsingAPIs.html\">Listing object keys programmatically</a> </p> <p>To use this operation, you must have READ access to the bucket.</p> <p>To use this action in an AWS Identity and Access Management (IAM) policy, you must have permissions to perform the <code>s3:ListBucket</code> action. The bucket owner has this permission by default and can grant this permission to others. For more information about permissions, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-with-s3-actions.html#using-with-s3-actions-related-to-bucket-subresources\">Permissions Related to Bucket Subresource Operations</a> and <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-access-control.html\">Managing Access Permissions to Your Amazon S3 Resources</a>.</p> <important> <p>This section describes the latest revision of this action. We recommend that you use this revised API for application development. For backward compatibility, Amazon S3 continues to support the prior version of this API, <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjects.html\">ListObjects</a>.</p> </important> <p>To get a list of your buckets, see <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListBuckets.html\">ListBuckets</a>.</p> <p>The following operations are related to <code>ListObjectsV2</code>:</p> <ul> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html\">GetObject</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html\">PutObject</a> </p> </li> <li> <p> <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/API/API_CreateBucket.html\">CreateBucket</a> </p> </li> </ul>"
      },