Fix default profile handling when parsing AWS configuration files

src/utilities/credentials.jl

@@ -36,11 +36,22 @@ function _get_ini_value(
 end
 
 function _aws_profile_config(ini::Inifile, profile::AbstractString)
-    if profile != "default" || !haskey(sections(ini), "default")
-        profile = "profile $profile"
+    # Prefer using "profile default" over "default"
+    section_name = if profile != "default" || haskey(sections(ini), "profile default")
+        "profile $profile"
+    else
+        "default"
+    end
+
+    content = copy(get(sections(ini), section_name, IniFile.HTSS()))
+    source_profile = pop!(content, "source_profile", nothing)
+
+    # Fallback on settings specified in the source profile
+    if !isnothing(source_profile)
+        content = merge(_aws_profile_config(ini, source_profile), content)
     end
 
-    return get(sections(ini), profile, Dict())
+    return content
 end
 
 function _aws_profile_config(ini::Inifile, profile::Nothing)

test/runtests.jl

@@ -23,7 +23,7 @@ using Dates
 using Downloads
 using GitHub
 using HTTP
-using IniFile: Inifile
+using IniFile: Inifile, sections
 using JSON
 using OrderedCollections: LittleDict, OrderedDict
 using MbedTLS: digest, MD_SHA256, MD_MD5
@@ -66,6 +66,7 @@ const AWS_CONFIG = Ref{AbstractAWSConfig}()
     @testset "Unit Tests" begin
         if RUN_UNIT_TESTS
             include("unit/AWS.jl")
+            include("unit/AWSCredentials.jl")
         else
             @warn "Skipping unit tests"
         end

test/unit/AWSCredentials.jl

@@ -0,0 +1,77 @@
+@testset "_aws_profile_config" begin
+    using AWS: _aws_profile_config
+
+    @testset "source profile" begin
+        #! format: off
+        buffer = IOBuffer(
+            """
+            [profile test]
+            output = json
+            region = us-east-1
+
+            [profile test:dev]
+            source_profile = test
+            role_arn = arn:aws:iam::123456789000:role/Dev
+
+            [profile test:sub-dev]
+            source_profile = test:dev
+            role_arn = arn:aws:iam::123456789000:role/SubDev
+            """
+        )
+        #! format: on
+        ini = Inifile()
+        read(ini, buffer)
+
+        # Only the fields from profile "test"
+        config = _aws_profile_config(ini, "test")
+        @test keys(config) ⊆ Set(["output", "region"])
+        @test config["output"] == "json"
+        @test config["region"] == "us-east-1"
+
+        # Combine the profile "test:dev" section with fields from profile "test"
+        config = _aws_profile_config(ini, "test:dev")
+        @test keys(config) ⊆ Set(["output", "region", "role_arn"])
+        @test config["output"] == "json"
+        @test config["region"] == "us-east-1"
+        @test config["role_arn"] == "arn:aws:iam::123456789000:role/Dev"
+
+        # Ensure we haven't mutated the contents of the `ini`
+        section = sections(ini)["profile test:dev"]
+        @test !haskey(section, "region")
+        @test !haskey(section, "output")
+
+        # Conflicting keys should use the first defined entry
+        config = _aws_profile_config(ini, "test:sub-dev")
+        @test keys(config) ⊆ Set(["output", "region", "role_arn"])
+        @test config["output"] == "json"
+        @test config["region"] == "us-east-1"
+        @test config["role_arn"] == "arn:aws:iam::123456789000:role/SubDev"
+
+        # Ensure we haven't mutated the contents of the `ini`
+        section = sections(ini)["profile test:sub-dev"]
+        @test !haskey(section, "region")
+        @test !haskey(section, "output")
+    end
+
+    # AWS CLI (version v2.27.15) will use "profile default" over "default" when both are
+    # defined within the configuration. This is true when `AWS_PROFILE` is unset or
+    # `AWS_PROFILE="default".
+    @testset "default profile" begin
+        #! format: off
+        buffer = IOBuffer(
+            """
+            [default]
+            region = default-1
+
+            [profile default]
+            region = default-2
+            """
+        )
+        #! format: on
+        ini = Inifile()
+        read(ini, buffer)
+
+        config = _aws_profile_config(ini, "default")
+        @test config["region"] == "default-2"
+    end
+end