Skip to content

feat: InstanceProfileProvider updates #3115

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: InstanceProfileProvider updates #3115

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
a21d9e7
feat: add accountid support for imds provider
Apr 28, 2025
e4a3a99
feat: add accountid support; remove imdsv1 support
May 7, 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
7 changes: 7 additions & 0 deletions .changes/nextrelease/imds-updates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"type": "feature",
"category": "Credentials",
"description": "Adds `InstanceProfileProvider` support for sourcing account id and removes support for imdsv1."
}
]
9 changes: 9 additions & 0 deletions .github/workflows/git-secrets-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ jobs:
'/"AccountId": "123456789012"/'
'/"AccountId": "999999999999"/'
'/"AccountId": "012345678901"/'
'/"AccountId": "345678910112"/'
'/"AccountId": "314253647589"/'
'/"AccountId": "234567891011"/'
'/"AccountId": "123456789101"/'
'/"accountId": "314253647589"/'
'/"accountId": "345678910112"/'
'/"accountId": "234567891011"/'
'/"accountId": "123456789101"/'
'/"AccessKeyId": "ASIAIOSFODNN7EXAMPLE"/'
'/"AWS::Auth::AccountId": "012345678901"/'
'/123456789012/'
'/999999999999/'
Expand Down
14 changes: 3 additions & 11 deletions src/Configuration/ConfigurationResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ public static function resolve(
$config = []
)
{
$iniOptions = isset($config['ini_resolver_options'])
? $config['ini_resolver_options']
: [];
$iniOptions = $config['ini_resolver_options'] ?? [];

$envValue = self::env($key, $expectedType);
if (!is_null($envValue)) {
Expand Down Expand Up @@ -115,10 +113,7 @@ public static function ini(
//TODO change after deprecation
$data = @\Aws\parse_ini_file($filename, true, INI_SCANNER_NORMAL);

if (isset($options['section'])
&& isset($options['subsection'])
&& isset($options['key']))
{
if (isset($options['section'], $options['subsection'], $options['key'])) {
return self::retrieveValueFromIniSubsection(
$data,
$profile,
Expand All @@ -128,10 +123,7 @@ public static function ini(
);
}

if ($data === false
|| !isset($data[$profile])
|| !isset($data[$profile][$key])
) {
if (empty($data[$profile][$key]) || $data === false) {
return null;
}

Expand Down
Loading