Added proxy-url option to eks update-kubeconfig (aws#7623)

Author: bendudz

awscli/customizations/eks/update_kubeconfig.py

@@ -77,6 +77,12 @@ class UpdateKubeconfigCommand(BasicCommand):
                           "connect to the cluster the first time."),
             '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',
@@ -305,14 +311,19 @@ def get_cluster_entry(self):
         endpoint = self.cluster_description.get("endpoint")
         arn = self.cluster_description.get("arn")
 
-        return OrderedDict([
+        generated_cluster = OrderedDict([
             ("cluster", OrderedDict([
                 ("certificate-authority-data", cert_data),
                 ("server", endpoint)
             ])),
             ("name", arn)
         ])
 
+        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

@@ -167,6 +167,7 @@ def setUp(self):
             ])),
             ("name", describe_cluster_response()["cluster"]["arn"])
         ])
+
         self._correct_user_entry = OrderedDict([
             ("name", describe_cluster_response()["cluster"]["arn"]),
             ("user", OrderedDict([
@@ -217,7 +218,7 @@ def setUp(self):
         self._session.create_client.return_value = self._mock_client
         self._session.profile = None
 
-        self._client = EKSClient(self._session, parsed_args=Namespace(cluster_name="ExampleCluster", role_arn=None))
+        self._client = EKSClient(self._session, parsed_args=Namespace(cluster_name="ExampleCluster", role_arn=None, proxy_url=None))
 
     def test_get_cluster_description(self):
         self.assertEqual(self._client.cluster_description,
@@ -245,6 +246,27 @@ 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)