Skip to content

Commit 0ab4d58

Browse files
Make options more const (#445)
1 parent 813c418 commit 0ab4d58

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'main'
77

88
env:
9-
BUILDER_VERSION: v0.9.59
9+
BUILDER_VERSION: v0.9.61
1010
BUILDER_SOURCE: releases
1111
BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
1212
PACKAGE_NAME: aws-c-s3

include/aws/s3/s3_client.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,9 @@ struct aws_s3_client_config {
369369
enum aws_s3_meta_request_tls_mode tls_mode;
370370

371371
/* TLS Options to be used for each connection, if tls_mode is ENABLED. When compiling with BYO_CRYPTO, and tls_mode
372-
* is ENABLED, this is required. Otherwise, this is optional. */
373-
struct aws_tls_connection_options *tls_connection_options;
372+
* is ENABLED, this is required. Otherwise, this is optional.
373+
*/
374+
const struct aws_tls_connection_options *tls_connection_options;
374375

375376
/**
376377
* Required.
@@ -387,7 +388,7 @@ struct aws_s3_client_config {
387388
*
388389
* TODO: deprecate this structure from auth, introduce a new S3 specific one.
389390
*/
390-
struct aws_signing_config_aws *signing_config;
391+
const struct aws_signing_config_aws *signing_config;
391392

392393
/**
393394
* Optional.
@@ -445,7 +446,7 @@ struct aws_s3_client_config {
445446
* If the connection_type is AWS_HPCT_HTTP_LEGACY, it will be converted to AWS_HPCT_HTTP_TUNNEL if tls_mode is
446447
* ENABLED. Otherwise, it will be converted to AWS_HPCT_HTTP_FORWARD.
447448
*/
448-
struct aws_http_proxy_options *proxy_options;
449+
const struct aws_http_proxy_options *proxy_options;
449450

450451
/**
451452
* Optional.
@@ -454,7 +455,7 @@ struct aws_s3_client_config {
454455
* configuration from environment.
455456
* Only works when proxy_options is not set. If both are set, configuration from proxy_options is used.
456457
*/
457-
struct proxy_env_var_settings *proxy_ev_settings;
458+
const struct proxy_env_var_settings *proxy_ev_settings;
458459

459460
/**
460461
* Optional.
@@ -466,15 +467,15 @@ struct aws_s3_client_config {
466467
* Optional.
467468
* Set keepalive to periodically transmit messages for detecting a disconnected peer.
468469
*/
469-
struct aws_s3_tcp_keep_alive_options *tcp_keep_alive_options;
470+
const struct aws_s3_tcp_keep_alive_options *tcp_keep_alive_options;
470471

471472
/**
472473
* Optional.
473474
* Configuration options for connection monitoring.
474475
* If the transfer speed falls below the specified minimum_throughput_bytes_per_second, the operation is aborted.
475476
* If set to NULL, default values are used.
476477
*/
477-
struct aws_http_connection_monitoring_options *monitoring_options;
478+
const struct aws_http_connection_monitoring_options *monitoring_options;
478479

479480
/**
480481
* Enable backpressure and prevent response data from downloading faster than you can handle it.
@@ -572,7 +573,7 @@ struct aws_s3_checksum_config {
572573
*
573574
* If the response checksum was validated by client, the result will indicate which algorithm was picked.
574575
*/
575-
struct aws_array_list *validate_checksum_algorithms;
576+
const struct aws_array_list *validate_checksum_algorithms;
576577
};
577578

578579
/**
@@ -760,7 +761,7 @@ struct aws_s3_meta_request_options {
760761
* - Both Host and Endpoint is set - Host header must match Authority of
761762
* Endpoint uri. Port and Scheme from endpoint is used.
762763
*/
763-
struct aws_uri *endpoint;
764+
const struct aws_uri *endpoint;
764765

765766
/**
766767
* Optional.
@@ -778,7 +779,7 @@ struct aws_s3_meta_request_options {
778779
* Set this hint to help the S3 client choose the best strategy for this particular file.
779780
* This is just used as an estimate, so it's okay to provide an approximate value if the exact size is unknown.
780781
*/
781-
uint64_t *object_size_hint;
782+
const uint64_t *object_size_hint;
782783
};
783784

784785
/* Result details of a meta request.

tests/s3_tester.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ int aws_s3_tester_bind_client(struct aws_s3_tester *tester, struct aws_s3_client
475475
config->region = g_test_s3_region;
476476
} else {
477477
if (config->signing_config) {
478-
config->signing_config->region = config->region;
478+
((struct aws_signing_config_aws *)config->signing_config)->region = config->region;
479479
}
480480
}
481481
if (!config->signing_config) {

0 commit comments

Comments
 (0)