Skip to content

Ensure CDN catalog entries are not checked for regions #615

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

Merged
merged 1 commit into from
Jul 13, 2015
Merged

Ensure CDN catalog entries are not checked for regions #615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions lib/OpenCloud/Common/Service/CatalogItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,16 +134,18 @@ public function getEndpoints()
/**
* Using a standard data object, extract its endpoint.
*
* @param $region
* @param string $region
* @param bool $isRegionless
*
* @return mixed
* @throws \OpenCloud\Common\Exceptions\EndpointError
*/
public function getEndpointFromRegion($region)
public function getEndpointFromRegion($region, $isRegionless = false)
{
foreach ($this->endpoints as $endpoint) {
// Return the endpoint if it is regionless OR if the endpoint's
// region matches the $region supplied by the caller.
if (!isset($endpoint->region) || $endpoint->region == $region) {
if ($isRegionless || !isset($endpoint->region) || $endpoint->region == $region) {
return $endpoint;
}
}
Expand Down
3 changes: 2 additions & 1 deletion lib/OpenCloud/Common/Service/CatalogService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,8 @@ private function findEndpoint()
// Search each service to find The One
foreach ($catalog->getItems() as $service) {
if ($service->hasType($this->type) && $service->hasName($this->name)) {
return Endpoint::factory($service->getEndpointFromRegion($this->region), static::SUPPORTED_VERSION, $this->getClient());
$endpoint = $service->getEndpointFromRegion($this->region, $this->regionless);
return Endpoint::factory($endpoint, static::SUPPORTED_VERSION, $this->getClient());
}
}

Expand Down