Merge branch 'develop' into 'update-v2'

aws-sdk-python-automation · aws-sdk-python-automation · commit 857c1c723d6b · 2023-04-05T14:19:29.000-07:00
diff --git a/.changes/1.27.106.json b/.changes/1.27.106.json
@@ -0,0 +1,42 @@
+[
+  {
+    "category": "``amplifyuibuilder``",
+    "description": "Support StorageField and custom displays for data-bound options in form builder. Support non-string operands for predicates in collections. Support choosing client to get token from.",
+    "type": "api-change"
+  },
+  {
+    "category": "``autoscaling``",
+    "description": "Documentation updates for Amazon EC2 Auto Scaling",
+    "type": "api-change"
+  },
+  {
+    "category": "``dataexchange``",
+    "description": "This release updates the value of MaxResults.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "C6in, M6in, M6idn, R6in and R6idn bare metal instances are powered by 3rd Generation Intel Xeon Scalable processors and offer up to 200 Gbps of network bandwidth.",
+    "type": "api-change"
+  },
+  {
+    "category": "``elastic-inference``",
+    "description": "Updated public documentation for the Describe and Tagging APIs.",
+    "type": "api-change"
+  },
+  {
+    "category": "``sagemaker-runtime``",
+    "description": "Update sagemaker-runtime command to latest version",
+    "type": "api-change"
+  },
+  {
+    "category": "``sagemaker``",
+    "description": "Amazon SageMaker Asynchronous Inference now allows customer's to receive failure model responses in S3 and receive success/failure model responses in SNS notifications.",
+    "type": "api-change"
+  },
+  {
+    "category": "``wafv2``",
+    "description": "This release rolls back association config feature for webACLs that protect CloudFront protections.",
+    "type": "api-change"
+  }
+]
diff --git a/.changes/1.27.107.json b/.changes/1.27.107.json
@@ -0,0 +1,47 @@
+[
+  {
+    "category": "eks",
+    "description": "Fix eks kubeconfig validations closes `#6564 <https://github.com/aws/aws-cli/issues/6564>`__, fixes `#4843 <https://github.com/aws/aws-cli/issues/4843>`__, fixes `#5532 <https://github.com/aws/aws-cli/issues/5532>`__",
+    "type": "bugfix"
+  },
+  {
+    "category": "``apprunner``",
+    "description": "App Runner adds support for seven new vCPU and memory configurations.",
+    "type": "api-change"
+  },
+  {
+    "category": "``config``",
+    "description": "This release adds resourceType enums for types released in March 2023.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ecs``",
+    "description": "This is a document only updated to add information about Amazon Elastic Inference (EI).",
+    "type": "api-change"
+  },
+  {
+    "category": "``identitystore``",
+    "description": "Documentation updates for Identity Store CLI command reference.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ivs-realtime``",
+    "description": "Fix ParticipantToken ExpirationTime format",
+    "type": "api-change"
+  },
+  {
+    "category": "``network-firewall``",
+    "description": "AWS Network Firewall now supports IPv6-only subnets.",
+    "type": "api-change"
+  },
+  {
+    "category": "``servicecatalog``",
+    "description": "removed incorrect product type value",
+    "type": "api-change"
+  },
+  {
+    "category": "``vpc-lattice``",
+    "description": "This release removes the entities in the API doc model package for auth policies.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5161,6 +5161,33 @@ CHANGELOG
 * feature:wizard: Added support for AWS CLI Wizards. See `#3752 <https://github.com/aws/aws-cli/issues/3752>`__.
 
 
+1.27.107
+========
+
+* bugfix:eks: Fix eks kubeconfig validations closes `#6564 <https://github.com/aws/aws-cli/issues/6564>`__, fixes `#4843 <https://github.com/aws/aws-cli/issues/4843>`__, fixes `#5532 <https://github.com/aws/aws-cli/issues/5532>`__
+* api-change:``apprunner``: App Runner adds support for seven new vCPU and memory configurations.
+* api-change:``config``: This release adds resourceType enums for types released in March 2023.
+* api-change:``ecs``: This is a document only updated to add information about Amazon Elastic Inference (EI).
+* api-change:``identitystore``: Documentation updates for Identity Store CLI command reference.
+* api-change:``ivs-realtime``: Fix ParticipantToken ExpirationTime format
+* api-change:``network-firewall``: AWS Network Firewall now supports IPv6-only subnets.
+* api-change:``servicecatalog``: removed incorrect product type value
+* api-change:``vpc-lattice``: This release removes the entities in the API doc model package for auth policies.
+
+
+1.27.106
+========
+
+* api-change:``amplifyuibuilder``: Support StorageField and custom displays for data-bound options in form builder. Support non-string operands for predicates in collections. Support choosing client to get token from.
+* api-change:``autoscaling``: Documentation updates for Amazon EC2 Auto Scaling
+* api-change:``dataexchange``: This release updates the value of MaxResults.
+* api-change:``ec2``: C6in, M6in, M6idn, R6in and R6idn bare metal instances are powered by 3rd Generation Intel Xeon Scalable processors and offer up to 200 Gbps of network bandwidth.
+* api-change:``elastic-inference``: Updated public documentation for the Describe and Tagging APIs.
+* api-change:``sagemaker-runtime``: Update sagemaker-runtime command to latest version
+* api-change:``sagemaker``: Amazon SageMaker Asynchronous Inference now allows customer's to receive failure model responses in S3 and receive success/failure model responses in SNS notifications.
+* api-change:``wafv2``: This release rolls back association config feature for webACLs that protect CloudFront protections.
+
+
 1.27.105
 ========
 
diff --git a/awscli/customizations/eks/kubeconfig.py b/awscli/customizations/eks/kubeconfig.py
@@ -65,10 +65,10 @@ def has_cluster(self, name):
         Return true if this kubeconfig contains an entry
         For the passed cluster name.
         """
-        if 'clusters' not in self.content:
+        if self.content.get('clusters') is None:
             return False
         return name in [cluster['name']
-                        for cluster in self.content['clusters']]
+                        for cluster in self.content['clusters'] if 'name' in cluster]
 
 
 class KubeconfigValidator(object):
@@ -86,7 +86,7 @@ def validate_config(self, config):
         """
         if not isinstance(config, Kubeconfig):
             raise KubeconfigCorruptedError("Internal error: "
-                                           "Not a Kubeconfig object.")
+                                           f"Not a {Kubeconfig}.")
         self._validate_config_types(config)
         self._validate_list_entry_types(config)
 
@@ -99,18 +99,14 @@ def _validate_config_types(self, config):
         :type config: Kubeconfig
         """
         if not isinstance(config.content, dict):
-            raise KubeconfigCorruptedError("Content not a dictionary.")
+            raise KubeconfigCorruptedError(f"Content not a {dict}.")
         for key, value in self._validation_content.items():
             if (key in config.content and
                     config.content[key] is not None and
                     not isinstance(config.content[key], type(value))):
                 raise KubeconfigCorruptedError(
-                    "{0} is wrong type:{1} "
-                    "(Should be {2})".format(
-                        key,
-                        type(config.content[key]),
-                        type(value)
-                    )
+                    f"{key} is wrong type: {type(config.content[key])} "
+                    f"(Should be {type(value)})"
                 )
 
     def _validate_list_entry_types(self, config):
@@ -127,14 +123,14 @@ def _validate_list_entry_types(self, config):
                 for element in config.content[key]:
                     if not isinstance(element, OrderedDict):
                         raise KubeconfigCorruptedError(
-                            "Entry in {0} not a dictionary.".format(key))
+                            f"Entry in {key} not a {dict}. ")
 
 
 class KubeconfigLoader(object):
-    def __init__(self, validator=None):
+    def __init__(self, validator = None):
         if validator is None:
-            validator = KubeconfigValidator()
-        self._validator = validator
+            validator=KubeconfigValidator()
+        self._validator=validator
 
     def load_kubeconfig(self, path):
         """
@@ -158,15 +154,15 @@ def load_kubeconfig(self, path):
                 loaded_content = ordered_yaml_load(stream)
         except IOError as e:
             if e.errno == errno.ENOENT:
-                loaded_content = None
+                loaded_content=None
             else:
                 raise KubeconfigInaccessableError(
-                    "Can't open kubeconfig for reading: {0}".format(e))
+                    f"Can't open kubeconfig for reading: {e}")
         except yaml.YAMLError as e:
             raise KubeconfigCorruptedError(
-                "YamlError while loading kubeconfig: {0}".format(e))
+                f"YamlError while loading kubeconfig: {e}")
 
-        loaded_config = Kubeconfig(path, loaded_content)
+        loaded_config=Kubeconfig(path, loaded_content)
         self._validator.validate_config(loaded_config)
 
         return loaded_config
@@ -184,56 +180,58 @@ def write_kubeconfig(self, config):
         :raises KubeconfigInaccessableError: if the kubeconfig
         can't be opened for writing
         """
-        directory = os.path.dirname(config.path)
+        directory=os.path.dirname(config.path)
 
         try:
             os.makedirs(directory)
         except OSError as e:
             if e.errno != errno.EEXIST:
                 raise KubeconfigInaccessableError(
-                        "Can't create directory for writing: {0}".format(e))
+                    f"Can't create directory for writing: {e}")
         try:
             with compat_open(
                     config.path, "w+", access_permissions=0o600) as stream:
                 ordered_yaml_dump(config.content, stream)
         except IOError as e:
             raise KubeconfigInaccessableError(
-                "Can't open kubeconfig for writing: {0}".format(e))
+                f"Can't open kubeconfig for writing: {e}")
 
 
 class KubeconfigAppender(object):
-    def insert_entry(self, config, key, entry):
+    def insert_entry(self, config, key, new_entry):
         """
-        Insert entry into the array at content[key]
+        Insert entry into the entries list at content[key]
         Overwrite an existing entry if they share the same name
 
         :param config: The kubeconfig to insert an entry into
         :type config: Kubeconfig
         """
-        if key not in config.content:
-            config.content[key] = []
-        array = config.content[key]
-        if not isinstance(array, list):
-            raise KubeconfigError("Tried to insert into {0},"
-                                  "which is a {1} "
-                                  "not a {2}".format(key,
-                                                     type(array),
-                                                     list))
-        found = False
-        for counter, existing_entry in enumerate(array):
-            if "name" in existing_entry and\
-               "name" in entry and\
-               existing_entry["name"] == entry["name"]:
-                array[counter] = entry
-                found = True
-
-        if not found:
-            array.append(entry)
-
-        config.content[key] = array
+        entries=self._setdefault_existing_entries(config, key)
+        same_name_index=self._index_same_name(entries, new_entry)
+        if same_name_index is None:
+            entries.append(new_entry)
+        else:
+            entries[same_name_index]=new_entry
         return config
 
-    def _make_context(self, cluster, user, alias=None):
+    def _setdefault_existing_entries(self, config, key):
+        config.content[key]=config.content.get(key) or []
+        entries=config.content[key]
+        if not isinstance(entries, list):
+            raise KubeconfigError(f"Tried to insert into {key}, "
+                                  f"which is a {type(entries)} "
+                                  f"not a {list}")
+        return entries
+
+    def _index_same_name(self, entries, new_entry):
+        if "name" in new_entry:
+            name_to_search=new_entry["name"]
+            for i, entry in enumerate(entries):
+                if "name" in entry and entry["name"] == name_to_search:
+                    return i
+        return None
+
+    def _make_context(self, cluster, user, alias = None):
         """ Generate a context to associate cluster and user with a given alias."""
         return OrderedDict([
             ("context", OrderedDict([
@@ -243,7 +241,7 @@ def _make_context(self, cluster, user, alias=None):
             ("name", alias or user["name"])
         ])
 
-    def insert_cluster_user_pair(self, config, cluster, user, alias=None):
+    def insert_cluster_user_pair(self, config, cluster, user, alias = None):
         """
         Insert the passed cluster entry and user entry,
         then make a context to associate them
@@ -265,11 +263,11 @@ def insert_cluster_user_pair(self, config, cluster, user, alias=None):
         :return: The generated context
         :rtype: OrderedDict
         """
-        context = self._make_context(cluster, user, alias=alias)
+        context=self._make_context(cluster, user, alias = alias)
         self.insert_entry(config, "clusters", cluster)
         self.insert_entry(config, "users", user)
         self.insert_entry(config, "contexts", context)
 
-        config.content["current-context"] = context["name"]
+        config.content["current-context"]=context["name"]
 
         return context
diff --git a/tests/functional/eks/testdata/valid_null_cluster b/tests/functional/eks/testdata/valid_null_cluster
@@ -0,0 +1,24 @@
+apiVersion: v1
+clusters: null
+contexts:
+- context:
+    cluster: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+    user: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+  name: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+current-context: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+kind: Config
+preferences: {}
+users:
+- name: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+  user:
+    exec:
+      apiVersion: client.authentication.k8s.io/v1alpha1
+      args:
+      - --region
+      - us-west-2
+      - eks
+      - get-token
+      - --cluster-name
+      - Existing
+      command: aws
+
diff --git a/tests/functional/eks/testdata/valid_null_context b/tests/functional/eks/testdata/valid_null_context
@@ -0,0 +1,24 @@
+apiVersion: v1
+contexts: null
+clusters:
+- cluster:
+    certificate-authority-data: DATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATA=
+    server: https://existingEndpoint.eks.amazonaws.com
+  name: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+current-context: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+kind: Config
+preferences: {}
+users:
+- name: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+  user:
+    exec:
+      apiVersion: client.authentication.k8s.io/v1alpha1
+      args:
+      - --region
+      - us-west-2
+      - eks
+      - get-token
+      - --cluster-name
+      - Existing
+      command: aws
+
diff --git a/tests/functional/eks/testdata/valid_null_user b/tests/functional/eks/testdata/valid_null_user
@@ -0,0 +1,16 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: DATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATADATA=
+    server: https://existingEndpoint.eks.amazonaws.com
+  name: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+contexts:
+- context:
+    cluster: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+    user: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+  name: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+current-context: arn:aws:eks:us-west-2:111222333444:cluster/Existing
+users: null
+kind: Config
+preferences: {}
+
diff --git a/tests/unit/customizations/eks/test_kubeconfig.py b/tests/unit/customizations/eks/test_kubeconfig.py
