Putting back prefixes in managers (#226)

* feature(dependencies) add twine

* release - prepare 1.38.1

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

Close #224

Author: antechrestos

cloudfoundry_client/__init__.py

@@ -2,4 +2,4 @@
     This module provides a client library for cloudfoundry_client v2/v3.
 """
 
-__version__ = "1.37.1"
+__version__ = "1.38.1"

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)

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]:

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)

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)

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)

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)

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)

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)

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