remove proxy for imds

Author: Krish

include/aws/auth/credentials.h

@@ -228,12 +228,6 @@ struct aws_credentials_provider_imds_options {
 
     /* For mocking the http layer in tests, leave NULL otherwise */
     struct aws_auth_http_system_vtable *function_table;
-
-    /*
-     * (Optional) Settings propagated down to http connection manager to choose proxy options from environment. Read
-     * aws_http_credentials_provider.h for more information.
-     */
-    const struct proxy_env_var_settings *proxy_ev_settings;
 };
 
 /*

source/credentials_provider_default_chain.c

@@ -66,7 +66,6 @@ static struct aws_credentials_provider *s_aws_credentials_provider_new_ecs_or_im
         struct aws_credentials_provider_imds_options imds_options = {
             .shutdown_options = *shutdown_options,
             .bootstrap = bootstrap,
-            .proxy_ev_settings = proxy_ev_settings,
         };
         return aws_credentials_provider_new_imds(allocator, &imds_options);
     }

source/credentials_provider_imds.c

@@ -90,7 +90,6 @@ struct aws_credentials_provider *aws_credentials_provider_new_imds(
                 .shutdown_callback = s_on_imds_client_shutdown,
                 .shutdown_user_data = provider,
             },
-        .proxy_ev_settings = options->proxy_ev_settings,
     };
 
     impl->client = aws_imds_client_new(allocator, &client_options);

tests/CMakeLists.txt

@@ -41,7 +41,6 @@ add_test_case(credentials_provider_imds_insecure_then_secure_success)
 add_test_case(credentials_provider_imds_success_multi_part_role_name)
 add_test_case(credentials_provider_imds_success_multi_part_doc)
 add_test_case(credentials_provider_imds_real_new_destroy)
-add_net_test_case(credentials_provider_imds_proxy_routing_enabled_test)
 
 if(AWS_BUILDING_ON_EC2)
     add_test_case(credentials_provider_imds_real_success)

tests/credentials_provider_imds_tests.c

@@ -12,7 +12,6 @@
 #include <aws/common/environment.h>
 #include <aws/common/string.h>
 #include <aws/common/thread.h>
-#include <aws/http/proxy.h>
 #include <aws/http/request_response.h>
 #include <aws/http/status_code.h>
 #include <aws/io/channel_bootstrap.h>
@@ -63,8 +62,6 @@ struct aws_mock_imds_tester {
     bool token_header_exist[IMDS_MAX_REQUESTS];
     bool token_header_expected[IMDS_MAX_REQUESTS];
     bool alternate_closed_connections;
-
-    struct proxy_env_var_settings *proxy_config;
 };
 
 static struct aws_mock_imds_tester s_tester;
@@ -102,12 +99,6 @@ static struct aws_http_connection_manager *s_aws_http_connection_manager_new_moc
     (void)allocator;
     (void)options;
 
-    if (s_tester.proxy_config != NULL) {
-        AWS_FATAL_ASSERT(options->proxy_ev_settings->env_var_type == s_tester.proxy_config->env_var_type);
-        AWS_FATAL_ASSERT(options->proxy_ev_settings->connection_type == s_tester.proxy_config->connection_type);
-        AWS_FATAL_ASSERT(options->proxy_ev_settings->tls_options == s_tester.proxy_config->tls_options);
-    }
-
     return (struct aws_http_connection_manager *)1;
 }
 
@@ -1198,49 +1189,3 @@ static int s_credentials_provider_imds_real_success(struct aws_allocator *alloca
 }
 
 AWS_TEST_CASE(credentials_provider_imds_real_success, s_credentials_provider_imds_real_success);
-
-static int s_credentials_provider_imds_proxy_routing_enabled_test(struct aws_allocator *allocator, void *ctx) {
-    (void)ctx;
-
-    s_aws_imds_tester_init(allocator);
-
-    struct proxy_env_var_settings proxy_config = {
-        .env_var_type = AWS_HPEV_ENABLE,
-    };
-
-    s_tester.proxy_config = &proxy_config;
-
-    struct aws_credentials_provider_imds_options options = {
-        .bootstrap = s_tester.bootstrap,
-        .function_table = &s_mock_function_table,
-        .shutdown_options =
-            {
-                .shutdown_callback = s_on_shutdown_complete,
-                .shutdown_user_data = NULL,
-            },
-        .proxy_ev_settings = &proxy_config,
-    };
-
-    struct aws_credentials_provider *provider = aws_credentials_provider_new_imds(allocator, &options);
-
-    aws_credentials_provider_get_credentials(provider, s_get_credentials_callback, NULL);
-
-    s_aws_wait_for_credentials_result();
-
-    ASSERT_TRUE(s_tester.credentials == NULL);
-
-    aws_credentials_provider_release(provider);
-
-    s_aws_wait_for_provider_shutdown_callback();
-
-    struct aws_credentials_provider_imds_impl *impl = provider->impl;
-    aws_mem_release(provider->allocator, impl->client);
-    aws_mem_release(provider->allocator, provider);
-
-    ASSERT_SUCCESS(s_aws_imds_tester_cleanup());
-
-    return 0;
-}
-AWS_TEST_CASE(
-    credentials_provider_imds_proxy_routing_enabled_test,
-    s_credentials_provider_imds_proxy_routing_enabled_test);