Update contrib/restricted/aws libraries to nixpkgs 24.05

commit_hash:f8083acb039e6005e820cdee77b84e0a6b6c6d6d

1 files changed, 26 insertions, 0 deletions

diff --git a/contrib/restricted/aws/aws-c-auth/source/credentials_provider_imds.c b/contrib/restricted/aws/aws-c-auth/source/credentials_provider_imds.c
index e7801ab26e9..952297049d6 100644
--- a/contrib/restricted/aws/aws-c-auth/source/credentials_provider_imds.c
+++ b/contrib/restricted/aws/aws-c-auth/source/credentials_provider_imds.c
@@ -84,6 +84,7 @@ struct aws_credentials_provider *aws_credentials_provider_new_imds(
         .bootstrap = options->bootstrap,
         .function_table = options->function_table,
         .imds_version = options->imds_version,
+        .ec2_metadata_v1_disabled = options->ec2_metadata_v1_disabled,
         .shutdown_options =
             {
                 .shutdown_callback = s_on_imds_client_shutdown,
@@ -154,6 +155,18 @@ on_error:
 static void s_on_get_credentials(const struct aws_credentials *credentials, int error_code, void *user_data) {
     (void)error_code;
     struct imds_provider_user_data *wrapped_user_data = user_data;
+    if (error_code == AWS_OP_SUCCESS) {
+        AWS_LOGF_INFO(
+            AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+            "id=%p: IMDS provider successfully retrieved credentials",
+            (void *)wrapped_user_data->imds_provider);
+    } else {
+        AWS_LOGF_INFO(
+            AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+            "id=%p: IMDS provider failed to retrieve credentials: %s",
+            (void *)wrapped_user_data->imds_provider,
+            aws_error_str(error_code));
+    }
     wrapped_user_data->original_callback(
         (struct aws_credentials *)credentials, error_code, wrapped_user_data->original_user_data);
     s_imds_provider_user_data_destroy(wrapped_user_data);
@@ -179,6 +192,11 @@ static void s_on_get_role(const struct aws_byte_buf *role, int error_code, void
     return;
 
 on_error:
+    AWS_LOGF_INFO(
+        AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+        "id=%p: IMDS provider failed to retrieve role: %s",
+        (void *)wrapped_user_data->imds_provider,
+        aws_error_str(error_code));
     wrapped_user_data->original_callback(
         NULL, AWS_AUTH_CREDENTIALS_PROVIDER_IMDS_SOURCE_FAILURE, wrapped_user_data->original_user_data);
     s_imds_provider_user_data_destroy(wrapped_user_data);
@@ -189,6 +207,9 @@ static int s_credentials_provider_imds_get_credentials_async(
     aws_on_get_credentials_callback_fn callback,
     void *user_data) {
 
+    AWS_LOGF_DEBUG(
+        AWS_LS_AUTH_CREDENTIALS_PROVIDER, "id=%p: IMDS provider trying to load credentials", (void *)provider);
+
     struct aws_credentials_provider_imds_impl *impl = provider->impl;
 
     struct imds_provider_user_data *wrapped_user_data = s_imds_provider_user_data_new(provider, callback, user_data);
@@ -203,6 +224,11 @@ static int s_credentials_provider_imds_get_credentials_async(
     return AWS_OP_SUCCESS;
 
 error:
+    AWS_LOGF_ERROR(
+        AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+        "id=%p: IMDS provider failed to request credentials: %s",
+        (void *)provider,
+        aws_error_str(aws_last_error()));
     s_imds_provider_user_data_destroy(wrapped_user_data);
     return AWS_OP_ERR;
 }