Update CI to fix downstream build (#525)

Author: waahm7

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
       - 'main'
 
 env:
-  BUILDER_VERSION: v0.9.16
+  BUILDER_VERSION: v0.9.26
   BUILDER_SOURCE: releases
   BUILDER_HOST: https://d19elf31gohf1l.cloudfront.net
   PACKAGE_NAME: aws-c-io
@@ -35,7 +35,7 @@ jobs:
     - name: Build ${{ env.PACKAGE_NAME }}
       run: |
         aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
-        ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }} downstream
+        ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ matrix.image }} build -p ${{ env.PACKAGE_NAME }}
 
   linux-byo-crypto:
     runs-on: ubuntu-20.04 # latest
@@ -90,6 +90,17 @@ jobs:
         aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
         ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build -p ${{ env.PACKAGE_NAME }} --cmake-extra=-DBUILD_SHARED_LIBS=ON
 
+  # Test downstream repos.
+  # This should not be required because we can run into a chicken and egg problem if there is a change that needs some fix in a downstream repo.
+  downstream:
+    runs-on: ubuntu-20.04 # latest
+    steps:
+      # We can't use the `uses: docker://image` version yet, GitHub lacks authentication for actions -> packages
+      - name: Build ${{ env.PACKAGE_NAME }}
+        run: |
+          aws s3 cp s3://aws-crt-test-stuff/ci/${{ env.BUILDER_VERSION }}/linux-container-ci.sh ./linux-container-ci.sh && chmod a+x ./linux-container-ci.sh
+          ./linux-container-ci.sh ${{ env.BUILDER_VERSION }} aws-crt-${{ env.LINUX_BASE_IMAGE }} build downstream -p ${{ env.PACKAGE_NAME }}
+
   windows:
     runs-on: windows-2022 # latest
     steps:
@@ -129,10 +140,10 @@ jobs:
         python .\aws-c-io\build\deps\aws-c-common\scripts\appverifier_ctest.py --build_directory .\aws-c-io\build\aws-c-io
 
   osx:
-    runs-on: macos-11 # latest
+    runs-on: macos-12 # latest
     steps:
     - name: Build ${{ env.PACKAGE_NAME }} + consumers
       run: |
         python3 -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder')"
         chmod a+x builder
-        ./builder build -p ${{ env.PACKAGE_NAME }} downstream
+        ./builder build -p ${{ env.PACKAGE_NAME }}

builder.json

@@ -10,8 +10,9 @@
         }
     ],
     "downstream": [
+        { "name": "aws-c-http" },
         { "name": "aws-c-mqtt" },
-        { "name": "aws-c-http" }
+        { "name": "aws-c-event-stream" }
     ],
     "targets": {
         "linux": {

include/aws/io/channel_bootstrap.h

@@ -82,7 +82,7 @@ struct aws_client_bootstrap_options {
     /* Optional. If none is provided then default settings are used.
      * This object is deep-copied by bootstrap.
      * */
-    struct aws_host_resolution_config *host_resolution_config;
+    const struct aws_host_resolution_config *host_resolution_config;
 
     /* Optional. If provided, callback is invoked when client bootstrap has completely shut down. */
     aws_client_bootstrap_shutdown_complete_fn *on_shutdown_complete;

include/aws/io/host_resolver.h

@@ -86,7 +86,7 @@ struct aws_host_resolver_vtable {
         struct aws_host_resolver *resolver,
         const struct aws_string *host_name,
         aws_on_host_resolved_result_fn *res,
-        struct aws_host_resolution_config *config,
+        const struct aws_host_resolution_config *config,
         void *user_data);
     /** gives your implementation a hint that an address has some failed connections occuring. Do whatever you want (or
      * nothing) about it.
@@ -204,7 +204,7 @@ AWS_IO_API int aws_host_resolver_resolve_host(
     struct aws_host_resolver *resolver,
     const struct aws_string *host_name,
     aws_on_host_resolved_result_fn *res,
-    struct aws_host_resolution_config *config,
+    const struct aws_host_resolution_config *config,
     void *user_data);
 
 /**

source/host_resolver.c

@@ -69,7 +69,7 @@ int aws_host_resolver_resolve_host(
     struct aws_host_resolver *resolver,
     const struct aws_string *host_name,
     aws_on_host_resolved_result_fn *res,
-    struct aws_host_resolution_config *config,
+    const struct aws_host_resolution_config *config,
     void *user_data) {
     AWS_ASSERT(resolver->vtable && resolver->vtable->resolve_host);
     return resolver->vtable->resolve_host(resolver, host_name, res, config, user_data);
@@ -1252,7 +1252,7 @@ static inline int create_and_init_host_entry(
     struct aws_host_resolver *resolver,
     const struct aws_string *host_name,
     aws_on_host_resolved_result_fn *res,
-    struct aws_host_resolution_config *config,
+    const struct aws_host_resolution_config *config,
     uint64_t timestamp,
     void *user_data) {
     struct host_entry *new_host_entry = aws_mem_calloc(resolver->allocator, 1, sizeof(struct host_entry));
@@ -1381,7 +1381,7 @@ static int default_resolve_host(
     struct aws_host_resolver *resolver,
     const struct aws_string *host_name,
     aws_on_host_resolved_result_fn *res,
-    struct aws_host_resolution_config *config,
+    const struct aws_host_resolution_config *config,
     void *user_data) {
     int result = AWS_OP_SUCCESS;