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

Jump to bottom

fix: update universe domain URI #572

Merged
merged 3 commits into from
Nov 5, 2024
Merged

fix: update universe domain URI #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2447d22
fix: update universe domain URI
bshaffer Aug 15, 2024
9d430a0
Merge branch 'main' into rename-universe-domain-uri
bshaffer Oct 22, 2024
b1f6168
Merge branch 'main' into rename-universe-domain-uri
bshaffer Nov 5, 2024
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: 1 addition & 1 deletion src/Credentials/GCECredentials.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class GCECredentials extends CredentialsLoader implements
/**
* The metadata path of the project ID.
*/
const UNIVERSE_DOMAIN_URI_PATH = 'v1/universe/universe_domain';
const UNIVERSE_DOMAIN_URI_PATH = 'v1/universe/universe-domain';

/**
* The header whose presence indicates GCE presence.
Expand Down
4 changes: 2 additions & 2 deletions tests/Credentials/GCECredentialsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ public function testGetUniverseDomain()
$httpHandler = function ($request) use (&$timesCalled, $expected) {
$timesCalled++;
$this->assertEquals(
'/computeMetadata/v1/universe/universe_domain',
'/computeMetadata/v1/universe/universe-domain',
$request->getUri()->getPath()
);
$this->assertEquals(1, $timesCalled, 'should only be called once');
Expand All @@ -682,7 +682,7 @@ public function testGetUniverseDomainEmptyStringReturnsDefault()
// Pretend we are on GCE and mock the MDS returning an empty string for the universe domain.
$httpHandler = function ($request) {
$this->assertEquals(
'/computeMetadata/v1/universe/universe_domain',
'/computeMetadata/v1/universe/universe-domain',
$request->getUri()->getPath()
);
return new Psr7\Response(200, [], Utils::streamFor(''));
Expand Down