|
@@ -182,13 +182,17 @@ class GCPResources(object):
|
|
|
return self.parse_url(url_or_name)
|
|
return self.parse_url(url_or_name)
|
|
|
# Otherwise, construct resource URL with default values.
|
|
# Otherwise, construct resource URL with default values.
|
|
|
if resource not in self._resources:
|
|
if resource not in self._resources:
|
|
|
|
|
+ cb.log.warning('Unknown resource: %s', resource)
|
|
|
return None
|
|
return None
|
|
|
|
|
|
|
|
parameter_defaults = copy.copy(self._parameter_defaults)
|
|
parameter_defaults = copy.copy(self._parameter_defaults)
|
|
|
|
|
+ if project:
|
|
|
|
|
+ parameter_defaults['project'] = project
|
|
|
if region:
|
|
if region:
|
|
|
parameter_defaults['region'] = region
|
|
parameter_defaults['region'] = region
|
|
|
if zone:
|
|
if zone:
|
|
|
parameter_defaults['zone'] = zone
|
|
parameter_defaults['zone'] = zone
|
|
|
|
|
+
|
|
|
parsed_url = GCPResourceUrl(resource, self._connection)
|
|
parsed_url = GCPResourceUrl(resource, self._connection)
|
|
|
for key in self._resources[resource]['parameters']:
|
|
for key in self._resources[resource]['parameters']:
|
|
|
parsed_url.parameters[key] = parameter_defaults.get(
|
|
parsed_url.parameters[key] = parameter_defaults.get(
|