Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Config File Parsing Logic to Parse Services Section #309

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Update Config File Parsing Logic to Parse Services Section #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d291475
new services section
waahm7 Jan 7, 2025
4eccd98
latest sdk utils
waahm7 Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Source/AwsCommonRuntimeKit/sdkutils/FileBasedConfiguration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ extension FileBasedConfiguration {
public enum SectionType {
case profile
case ssoSession
case services
}

/// Source of file based config
Expand Down Expand Up @@ -197,6 +198,7 @@ extension FileBasedConfiguration.SectionType {
switch self {
case .profile: return AWS_PROFILE_SECTION_TYPE_PROFILE
case .ssoSession: return AWS_PROFILE_SECTION_TYPE_SSO_SESSION
case .services: return AWS_PROFILE_SECTION_TYPE_SERVICES
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions Test/AwsCommonRuntimeKitTests/Resources/example_profile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ credential_process = echo '{"Version": 1, "AccessKeyId": "AccessKey123", "Secret
aws_access_key_id = example_access_key_id
aws_secret_access_key = example_secret_access_key

[services test-service]
s3 = test-url

3 changes: 3 additions & 0 deletions Test/AwsCommonRuntimeKitTests/sdkutils/FileBasedConfigurationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ class FileBasedConfigurationTests: XCBaseTestCase {
XCTAssertEqual("accessKey1", credSection.getProperty(name: "aws_access_key_id")?.value)
XCTAssertEqual(credSection.propertyCount, 2)

let servicesSection = fileBasedConfiguration.getSection(name: "test-service", sectionType: .services)!
XCTAssertEqual("test-url", servicesSection.getProperty(name: "s3")?.value)
XCTAssertEqual(servicesSection.propertyCount, 1)
}

func testCollectionOutOfScope() throws {
Expand Down
2 changes: 1 addition & 1 deletion aws-common-runtime/aws-c-sdkutils
Open in desktop
Submodule aws-c-sdkutils updated 7 files
+80 −30 .github/workflows/ci.yml
+18 −12 .github/workflows/codecov.yml
+1 −0 include/aws/sdkutils/aws_profile.h
+47 −29 source/aws_profile.c
+3 −2 tests/CMakeLists.txt
+297 −299 tests/aws_profile_tests.c
+2 −2 tests/endpoints_regex_tests.c
Loading