fixes(navigation) put back /v2 and /v3 in path managers

antechrestos · antechrestos · commit 0d8473cc3ff6 · 2025-01-14T08:06:31.000+01:00
Close #224
diff --git a/cloudfoundry_client/__init__.py b/cloudfoundry_client/__init__.py
@@ -2,4 +2,4 @@
     This module provides a client library for cloudfoundry_client v2/v3.
 """
 
-__version__ = "1.38.0"
+__version__ = "1.38.1"
diff --git a/cloudfoundry_client/client.py b/cloudfoundry_client/client.py
@@ -81,7 +81,8 @@ def __init__(self, target_endpoint: str, credential_manager: "CloudFoundryClient
 
 
 class V2(object):
-    def __init__(self, target_endpoint: str, credential_manager: "CloudFoundryClient"):
+    def __init__(self, cloud_controller_v2_url: str, credential_manager: "CloudFoundryClient"):
+        target_endpoint = cloud_controller_v2_url.removesuffix("/v2")
         self.apps = AppManagerV2(target_endpoint, credential_manager)
         self.buildpacks = BuildpackManagerV2(target_endpoint, credential_manager)
         self.jobs = JobManagerV2(target_endpoint, credential_manager)
@@ -93,24 +94,25 @@ def __init__(self, target_endpoint: str, credential_manager: "CloudFoundryClient
         self.service_plans = ServicePlanManagerV2(target_endpoint, credential_manager)
         # Default implementations
         self.event = EventManager(target_endpoint, credential_manager)
-        self.organizations = EntityManagerV2(target_endpoint, credential_manager, "/organizations")
-        self.private_domains = EntityManagerV2(target_endpoint, credential_manager, "/private_domains")
+        self.organizations = EntityManagerV2(target_endpoint, credential_manager, "/v2/organizations")
+        self.private_domains = EntityManagerV2(target_endpoint, credential_manager, "/v2/private_domains")
         self.routes = RouteManager(target_endpoint, credential_manager)
-        self.services = EntityManagerV2(target_endpoint, credential_manager, "/services")
-        self.shared_domains = EntityManagerV2(target_endpoint, credential_manager, "/shared_domains")
+        self.services = EntityManagerV2(target_endpoint, credential_manager, "/v2/services")
+        self.shared_domains = EntityManagerV2(target_endpoint, credential_manager, "/v2/shared_domains")
         self.spaces = SpaceManagerV2(target_endpoint, credential_manager)
-        self.stacks = EntityManagerV2(target_endpoint, credential_manager, "/stacks")
+        self.stacks = EntityManagerV2(target_endpoint, credential_manager, "/v2/stacks")
         self.user_provided_service_instances = EntityManagerV2(
-            target_endpoint, credential_manager, "/user_provided_service_instances"
+            target_endpoint, credential_manager, "/v2/user_provided_service_instances"
         )
-        self.security_groups = EntityManagerV2(target_endpoint, credential_manager, "/security_groups")
-        self.users = EntityManagerV2(target_endpoint, credential_manager, "/users")
+        self.security_groups = EntityManagerV2(target_endpoint, credential_manager, "/v2/security_groups")
+        self.users = EntityManagerV2(target_endpoint, credential_manager, "/v2/users")
         # Resources implementation used by push operation
         self.resources = ResourceManager(target_endpoint, credential_manager)
 
 
 class V3(object):
-    def __init__(self, target_endpoint: str, credential_manager: "CloudFoundryClient"):
+    def __init__(self, cloud_controller_v3_url: str, credential_manager: "CloudFoundryClient"):
+        target_endpoint = cloud_controller_v3_url.removesuffix("/v3")
         self.apps = AppManager(target_endpoint, credential_manager)
         self.buildpacks = BuildpackManager(target_endpoint, credential_manager)
         self.domains = DomainManager(target_endpoint, credential_manager)
diff --git a/cloudfoundry_client/v2/apps.py b/cloudfoundry_client/v2/apps.py
@@ -77,7 +77,7 @@ class AppManager(EntityManager):
 
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
         super(AppManager, self).__init__(
-            target_endpoint, client, "/apps", lambda pairs: Application(target_endpoint, client, pairs)
+            target_endpoint, client, "/v2/apps", lambda pairs: Application(target_endpoint, client, pairs)
         )
 
     def get_stats(self, application_guid: str) -> Dict[str, JsonObject]:
diff --git a/cloudfoundry_client/v2/buildpacks.py b/cloudfoundry_client/v2/buildpacks.py
@@ -8,7 +8,7 @@
 
 class BuildpackManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(BuildpackManager, self).__init__(target_endpoint, client, "/buildpacks")
+        super(BuildpackManager, self).__init__(target_endpoint, client, "/v2/buildpacks")
 
     def update(self, buildpack_guid: str, parameters: dict) -> Entity:
         return super(BuildpackManager, self)._update(buildpack_guid, parameters)
diff --git a/cloudfoundry_client/v2/events.py b/cloudfoundry_client/v2/events.py
@@ -8,7 +8,7 @@
 
 class EventManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(EventManager, self).__init__(target_endpoint, client, "/events")
+        super(EventManager, self).__init__(target_endpoint, client, "/v2/events")
 
     def list_by_type(self, event_type: str) -> Generator[Entity, None, None]:
         return self._list(self.entity_uri, type=event_type)
diff --git a/cloudfoundry_client/v2/jobs.py b/cloudfoundry_client/v2/jobs.py
@@ -12,4 +12,4 @@ def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
         self.client = client
 
     def get(self, job_guid: str) -> JsonObject:
-        return self.client.get("%s/jobs/%s" % (self.target_endpoint, job_guid)).json(object_pairs_hook=JsonObject)
+        return self.client.get("%s/v2/jobs/%s" % (self.target_endpoint, job_guid)).json(object_pairs_hook=JsonObject)
diff --git a/cloudfoundry_client/v2/resources.py b/cloudfoundry_client/v2/resources.py
@@ -12,5 +12,5 @@ def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
         self.client = client
 
     def match(self, items: List[dict]) -> List[JsonObject]:
-        response = self.client.put("%s/resource_match" % self.client.info.api_endpoint, json=items)
+        response = self.client.put("%s/v2/resource_match" % self.client.info.api_endpoint, json=items)
         return response.json(object_pairs_hook=JsonObject)
diff --git a/cloudfoundry_client/v2/routes.py b/cloudfoundry_client/v2/routes.py
@@ -8,7 +8,7 @@
 
 class RouteManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(RouteManager, self).__init__(target_endpoint, client, "/routes")
+        super(RouteManager, self).__init__(target_endpoint, client, "/v2/routes")
 
     def create_tcp_route(self, domain_guid: str, space_guid: str, port: Optional[int] = None) -> Entity:
         request = self._request(domain_guid=domain_guid, space_guid=space_guid)
diff --git a/cloudfoundry_client/v2/service_bindings.py b/cloudfoundry_client/v2/service_bindings.py
@@ -8,7 +8,7 @@
 
 class ServiceBindingManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServiceBindingManager, self).__init__(target_endpoint, client, "/service_bindings")
+        super(ServiceBindingManager, self).__init__(target_endpoint, client, "/v2/service_bindings")
 
     def create(self, app_guid: str, instance_guid: str, parameters: Optional[dict] = None, name: Optional[str] = None) -> Entity:
         request = self._request(app_guid=app_guid, service_instance_guid=instance_guid)
diff --git a/cloudfoundry_client/v2/service_brokers.py b/cloudfoundry_client/v2/service_brokers.py
@@ -8,7 +8,7 @@
 
 class ServiceBrokerManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServiceBrokerManager, self).__init__(target_endpoint, client, "/service_brokers")
+        super(ServiceBrokerManager, self).__init__(target_endpoint, client, "/v2/service_brokers")
 
     def create(
         self, broker_url: str, broker_name: str, auth_username: str, auth_password: str, space_guid: Optional[str] = None
diff --git a/cloudfoundry_client/v2/service_instances.py b/cloudfoundry_client/v2/service_instances.py
@@ -10,7 +10,7 @@ class ServiceInstanceManager(EntityManager):
     list_query_parameters = ["page", "results-per-page", "order-direction", "return_user_provided_service_instances"]
 
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServiceInstanceManager, self).__init__(target_endpoint, client, "/service_instances")
+        super(ServiceInstanceManager, self).__init__(target_endpoint, client, "/v2/service_instances")
 
     def create(
         self,
diff --git a/cloudfoundry_client/v2/service_keys.py b/cloudfoundry_client/v2/service_keys.py
@@ -8,7 +8,7 @@
 
 class ServiceKeyManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServiceKeyManager, self).__init__(target_endpoint, client, "/service_keys")
+        super(ServiceKeyManager, self).__init__(target_endpoint, client, "/v2/service_keys")
 
     def create(self, service_instance_guid: str, name: str, parameters: Optional[dict] = None) -> Entity:
         request = self._request(service_instance_guid=service_instance_guid, name=name)
diff --git a/cloudfoundry_client/v2/service_plan_visibilities.py b/cloudfoundry_client/v2/service_plan_visibilities.py
@@ -8,7 +8,7 @@
 
 class ServicePlanVisibilityManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServicePlanVisibilityManager, self).__init__(target_endpoint, client, "/service_plan_visibilities")
+        super(ServicePlanVisibilityManager, self).__init__(target_endpoint, client, "/v2/service_plan_visibilities")
 
     def create(self, service_plan_guid: str, organization_guid: str) -> Entity:
         request = self._request()
diff --git a/cloudfoundry_client/v2/service_plans.py b/cloudfoundry_client/v2/service_plans.py
@@ -9,7 +9,7 @@
 
 class ServicePlanManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServicePlanManager, self).__init__(target_endpoint, client, "/service_plans")
+        super(ServicePlanManager, self).__init__(target_endpoint, client, "/v2/service_plans")
 
     def create_from_resource_file(self, path: str) -> Entity:
         raise NotImplementedError("No creation allowed")
diff --git a/cloudfoundry_client/v2/spaces.py b/cloudfoundry_client/v2/spaces.py
@@ -8,7 +8,7 @@
 
 class SpaceManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(SpaceManager, self).__init__(target_endpoint, client, "/spaces")
+        super(SpaceManager, self).__init__(target_endpoint, client, "/v2/spaces")
 
     def delete_unmapped_routes(self, space_guid: str):
         url = "%s%s/%s/unmapped_routes" % (self.target_endpoint, self.entity_uri, space_guid)
diff --git a/cloudfoundry_client/v3/apps.py b/cloudfoundry_client/v3/apps.py
@@ -9,7 +9,7 @@
 
 class AppManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(AppManager, self).__init__(target_endpoint, client, "/apps")
+        super(AppManager, self).__init__(target_endpoint, client, "/v3/apps")
 
     def restart(self, application_guid: str):
         return super(AppManager, self)._post("%s%s/%s/actions/restart" % (self.target_endpoint,
diff --git a/cloudfoundry_client/v3/buildpacks.py b/cloudfoundry_client/v3/buildpacks.py
@@ -8,7 +8,7 @@
 
 class BuildpackManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(BuildpackManager, self).__init__(target_endpoint, client, "/buildpacks")
+        super(BuildpackManager, self).__init__(target_endpoint, client, "/v3/buildpacks")
 
     def create(
         self,
diff --git a/cloudfoundry_client/v3/domains.py b/cloudfoundry_client/v3/domains.py
@@ -21,7 +21,7 @@ def __init__(self, target_endpoint: str, client: "CloudFoundryClient", **kwargs)
 
 class DomainManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(DomainManager, self).__init__(target_endpoint, client, "/domains", Domain)
+        super(DomainManager, self).__init__(target_endpoint, client, "/v3/domains", Domain)
 
     def create(
         self,
@@ -44,7 +44,7 @@ def create(
         return super(DomainManager, self)._create(data)
 
     def list_domains_for_org(self, org_guid: str, **kwargs) -> Pagination[Entity]:
-        uri = "/organizations/{guid}/domains".format(guid=org_guid)
+        uri = "/v3/organizations/{guid}/domains".format(guid=org_guid)
         return self._list(uri, **kwargs)
 
     def update(self, domain_guid: str, meta_labels: Optional[dict] = None, meta_annotations: Optional[dict] = None) -> Domain:
diff --git a/cloudfoundry_client/v3/feature_flags.py b/cloudfoundry_client/v3/feature_flags.py
@@ -8,7 +8,7 @@
 
 class FeatureFlagManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(FeatureFlagManager, self).__init__(target_endpoint, client, "/feature_flags")
+        super(FeatureFlagManager, self).__init__(target_endpoint, client, "/v3/feature_flags")
 
     def update(self, name: str, enabled: Optional[bool] = True, custom_error_message: Optional[str] = None) -> Entity:
         data = {"enabled": enabled, "custom_error_message": custom_error_message}
diff --git a/cloudfoundry_client/v3/isolation_segments.py b/cloudfoundry_client/v3/isolation_segments.py
@@ -8,7 +8,7 @@
 
 class IsolationSegmentManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(IsolationSegmentManager, self).__init__(target_endpoint, client, "/isolation_segments")
+        super(IsolationSegmentManager, self).__init__(target_endpoint, client, "/v3/isolation_segments")
 
     def create(self, name: str, meta_labels: Optional[dict] = None, meta_annotations: Optional[dict] = None) -> Entity:
         data = {"name": name, "metadata": {"labels": meta_labels, "annotations": meta_annotations}}
diff --git a/cloudfoundry_client/v3/jobs.py b/cloudfoundry_client/v3/jobs.py
@@ -15,7 +15,7 @@ class JobTimeout(Exception):
 
 class JobManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(JobManager, self).__init__(target_endpoint, client, "/jobs")
+        super(JobManager, self).__init__(target_endpoint, client, "/v3/jobs")
 
     def wait_for_job_completion(
         self,
diff --git a/cloudfoundry_client/v3/organization_quotas.py b/cloudfoundry_client/v3/organization_quotas.py
@@ -35,7 +35,7 @@ class DomainsQuota:
 
 class OrganizationQuotaManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super().__init__(target_endpoint, client, "/organization_quotas")
+        super().__init__(target_endpoint, client, "/v3/organization_quotas")
 
     def remove(self, guid: str, asynchronous: bool = True) -> Optional[str]:
         return super()._remove(guid, asynchronous)
diff --git a/cloudfoundry_client/v3/organizations.py b/cloudfoundry_client/v3/organizations.py
@@ -8,7 +8,7 @@
 
 class OrganizationManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(OrganizationManager, self).__init__(target_endpoint, client, "/organizations")
+        super(OrganizationManager, self).__init__(target_endpoint, client, "/v3/organizations")
 
     def create(
         self, name: str, suspended: bool, meta_labels: Optional[dict] = None, meta_annotations: Optional[dict] = None
diff --git a/cloudfoundry_client/v3/processes.py b/cloudfoundry_client/v3/processes.py
@@ -8,4 +8,4 @@
 
 class ProcessManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ProcessManager, self).__init__(target_endpoint, client, "/processes")
+        super(ProcessManager, self).__init__(target_endpoint, client, "/v3/processes")
diff --git a/cloudfoundry_client/v3/roles.py b/cloudfoundry_client/v3/roles.py
@@ -8,7 +8,7 @@
 
 class RoleManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(RoleManager, self).__init__(target_endpoint, client, "/roles")
+        super(RoleManager, self).__init__(target_endpoint, client, "/v3/roles")
 
     def remove(self, role_guid: str, asynchronous: bool = True) -> Optional[str]:
         return super(RoleManager, self)._remove(role_guid, asynchronous)
diff --git a/cloudfoundry_client/v3/security_groups.py b/cloudfoundry_client/v3/security_groups.py
@@ -37,7 +37,7 @@ class GloballyEnabled:
 
 class SecurityGroupManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(SecurityGroupManager, self).__init__(target_endpoint, client, "/security_groups")
+        super(SecurityGroupManager, self).__init__(target_endpoint, client, "/v3/security_groups")
 
     def create(self,
                name: str,
diff --git a/cloudfoundry_client/v3/service_brokers.py b/cloudfoundry_client/v3/service_brokers.py
@@ -8,7 +8,7 @@
 
 class ServiceBrokerManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServiceBrokerManager, self).__init__(target_endpoint, client, "/service_brokers")
+        super(ServiceBrokerManager, self).__init__(target_endpoint, client, "/v3/service_brokers")
 
     def create(
         self,
diff --git a/cloudfoundry_client/v3/service_credential_bindings.py b/cloudfoundry_client/v3/service_credential_bindings.py
@@ -9,7 +9,7 @@
 class ServiceCredentialBindingManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
         super(ServiceCredentialBindingManager, self).__init__(target_endpoint, client,
-                                                              "/service_credential_bindings")
+                                                              "/v3/service_credential_bindings")
 
     def create(
             self,
diff --git a/cloudfoundry_client/v3/service_instances.py b/cloudfoundry_client/v3/service_instances.py
@@ -9,7 +9,7 @@
 
 class ServiceInstanceManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServiceInstanceManager, self).__init__(target_endpoint, client, "/service_instances")
+        super(ServiceInstanceManager, self).__init__(target_endpoint, client, "/v3/service_instances")
 
     def create(
         self,
diff --git a/cloudfoundry_client/v3/service_offerings.py b/cloudfoundry_client/v3/service_offerings.py
@@ -8,7 +8,7 @@
 
 class ServiceOfferingsManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServiceOfferingsManager, self).__init__(target_endpoint, client, "/service_offerings")
+        super(ServiceOfferingsManager, self).__init__(target_endpoint, client, "/v3/service_offerings")
 
     def update(self, guid: str, meta_labels: Optional[dict] = None, meta_annotations: Optional[dict] = None) -> Entity:
         payload = dict()
diff --git a/cloudfoundry_client/v3/service_plans.py b/cloudfoundry_client/v3/service_plans.py
@@ -8,7 +8,7 @@
 
 class ServicePlanManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(ServicePlanManager, self).__init__(target_endpoint, client, "/service_plans")
+        super(ServicePlanManager, self).__init__(target_endpoint, client, "/v3/service_plans")
 
     def update(
         self,
diff --git a/cloudfoundry_client/v3/spaces.py b/cloudfoundry_client/v3/spaces.py
@@ -8,7 +8,7 @@
 
 class SpaceManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(SpaceManager, self).__init__(target_endpoint, client, "/spaces")
+        super(SpaceManager, self).__init__(target_endpoint, client, "/v3/spaces")
 
     def create(self, name: str, org_guid: str) -> Entity:
         return super(SpaceManager, self)._create(dict(name=name, relationships=dict(organization=ToOneRelationship(org_guid))))
diff --git a/cloudfoundry_client/v3/tasks.py b/cloudfoundry_client/v3/tasks.py
@@ -8,7 +8,7 @@
 
 class TaskManager(EntityManager):
     def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):
-        super(TaskManager, self).__init__(target_endpoint, client, "/tasks")
+        super(TaskManager, self).__init__(target_endpoint, client, "/v3/tasks")
 
     def create(
         self,
@@ -24,7 +24,7 @@ def create(
         request["disk_in_mb"] = disk_in_mb
         request["memory_in_mb"] = memory_in_mb
         request["droplet_guid"] = droplet_guid
-        return self._post("%s/apps/%s/tasks" % (self.target_endpoint, application_guid), data=request)
+        return self._post("%s/v3/apps/%s/tasks" % (self.target_endpoint, application_guid), data=request)
 
     def cancel(self, task_guid: str) -> Entity:
-        return self._post("%s/tasks/%s/actions/cancel" % (self.target_endpoint, task_guid))
+        return self._post("%s/v3/tasks/%s/actions/cancel" % (self.target_endpoint, task_guid))
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ exclude = '''
 
 [tool.poetry]
 name = "cloudfoundry_client"
-version = "1.38.0"
+version = "1.38.1"
 description = "A client library for CloudFoundry"
 authors = ["Benjamin Einaudi <antechrestos@gmail.com>"]
 readme = "README.rst"

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class AppManager(EntityManager):`
`77`	`77`
`78`	`78`	`def __init__(self, target_endpoint: str, client: "CloudFoundryClient"):`
`79`	`79`	`super(AppManager, self).__init__(`
`80`		`- target_endpoint, client, "/apps", lambda pairs: Application(target_endpoint, client, pairs)`
	`80`	`+ target_endpoint, client, "/v2/apps", lambda pairs: Application(target_endpoint, client, pairs)`
`81`	`81`	`)`
`82`	`82`
`83`	`83`	`def get_stats(self, application_guid: str) -> Dict[str, JsonObject]:`