Add proxy-url option to eks update-kubeconfig (#9762)

Author: ashovlin

.changes/next-release/enhancement-eks-87666.json

@@ -0,0 +1,5 @@
+{
+  "type": "enhancement",
+  "category": "``eks``",
+  "description": "Add ``proxy-url`` to ``aws eks update-kubeconfig``"
+}

awscli/customizations/eks/update_kubeconfig.py

@@ -83,6 +83,14 @@ class UpdateKubeconfigCommand(BasicCommand):
             ),
             'required': False,
         },
+        {
+            'name': 'proxy-url',
+            'help_text': (
+                "Optionally specify a proxy url to route "
+                "traffic via when connecting to a cluster."
+            ),
+            'required': False,
+        },
         {
             'name': 'dry-run',
             'action': 'store_true',
@@ -172,15 +180,11 @@ def _run_main(self, parsed_args, parsed_globals):
 
             if updating_existing:
                 uni_print(
-                    "Updated context {0} in {1}\n".format(
-                        new_context_dict["name"], config.path
-                    )
+                    f"Updated context {new_context_dict['name']} in {config.path}\n"
                 )
             else:
                 uni_print(
-                    "Added new context {0} to {1}\n".format(
-                        new_context_dict["name"], config.path
-                    )
+                    f"Added new context {new_context_dict['name']} to {config.path}\n"
                 )
 
             if parsed_args.verbose:
@@ -327,7 +331,7 @@ def get_cluster_entry(self):
         endpoint = self.cluster_description.get("endpoint")
         arn = self.cluster_description.get("arn")
 
-        return OrderedDict(
+        generated_cluster = OrderedDict(
             [
                 (
                     "cluster",
@@ -342,6 +346,13 @@ def get_cluster_entry(self):
             ]
         )
 
+        if self._parsed_args.proxy_url is not None:
+            generated_cluster["cluster"]["proxy-url"] = (
+                self._parsed_args.proxy_url
+            )
+
+        return generated_cluster
+
     def get_user_entry(self, user_alias=None):
         """
         Return a user entry generated using

tests/unit/customizations/eks/test_update_kubeconfig.py

@@ -282,7 +282,7 @@ def setUp(self):
         self._client = EKSClient(
             self._session,
             parsed_args=Namespace(
-                cluster_name="ExampleCluster", role_arn=None
+                cluster_name="ExampleCluster", role_arn=None, proxy_url=None
             ),
         )
 
@@ -316,6 +316,49 @@ def test_get_cluster_entry(self):
         )
         self._session.create_client.assert_called_once_with("eks")
 
+    def test_get_cluster_entry_with_proxy_url_passed(self):
+        proxy_url = "https://myproxy.com"
+        correct_cluster_entry_with_proxy_url = OrderedDict(
+            [
+                (
+                    "cluster",
+                    OrderedDict(
+                        [
+                            (
+                                "certificate-authority-data",
+                                describe_cluster_response()["cluster"][
+                                    "certificateAuthority"
+                                ]["data"],
+                            ),
+                            (
+                                "server",
+                                describe_cluster_response()["cluster"][
+                                    "endpoint"
+                                ],
+                            ),
+                            ("proxy-url", proxy_url),
+                        ]
+                    ),
+                ),
+                ("name", describe_cluster_response()["cluster"]["arn"]),
+            ]
+        )
+        client = EKSClient(
+            self._session,
+            parsed_args=Namespace(
+                cluster_name="ProxiedCluster",
+                role_arn=None,
+                proxy_url=proxy_url,
+            ),
+        )
+        self.assertEqual(
+            client.get_cluster_entry(), correct_cluster_entry_with_proxy_url
+        )
+        self._mock_client.describe_cluster.assert_called_once_with(
+            name="ProxiedCluster"
+        )
+        self._session.create_client.assert_called_once_with("eks")
+
     def test_get_user_entry(self):
         self.assertEqual(
             self._client.get_user_entry(), self._correct_user_entry