Merge pull request #773 from anaik91/feat/proxy-endpoint-unifier-enhancements

feat: added enhancements to endpoint-unifier

Author: danistrebel

.gitignore

@@ -8,3 +8,7 @@
 *.jar
 *.iml
 .idea
+__pycache__/
+test/transformed/
+test/transformed_zipped_bundles/
+venv/

tools/proxy-endpoint-unifier/README.md

@@ -1,6 +1,6 @@
 # Apigee API Proxy Endpoint Unifier
 
-Apigee X and hybrid have a limitation of hosting up to 5 Proxy Endpoints per API Proxy. Apigee Edge has no such limitation.
+Apigee X and hybrid have a limitation of hosting up to [10 Proxy Endpoints](https://cloud.google.com/apigee/docs/api-platform/reference/limits#api-proxies) per API Proxy. Apigee Edge has no such limitation.
 The objective of this tool is to take a proxy bundle and intelligently convert its proxy endpoints into logically
 grouped conditional flows, in order to stay within the Proxy Endpoint limit.
 
@@ -27,6 +27,40 @@ This is not an officially supported Google product.
     gcp_project_id=xxx-xxx-xxx                          # Apigee Project for proxy validation
 ```
 
+Folder Structure of `input_apis`
+
+```
+apis/
+├── <exaple_api_1>
+│   └── apiproxy
+│       ├── exaple_api_1.xml
+│       ├── manifests
+│       │   └── manifest.xml
+│       ├── policies
+│       │   ├── example.xml
+│       ├── proxies
+│       │   ├── example.xml
+│       ├── resources
+│       │   └── jsc
+│       │       ├── example.js
+│       └── targets
+│           ├── default.xml
+├── <exaple_api_2>
+│   └── apiproxy
+│       ├── exaple_api_2.xml
+│       ├── manifests
+│       │   └── manifest.xml
+│       ├── policies
+│       │   ├── example.xml
+│       ├── proxies
+│       │   ├── example.xml
+│       ├── resources
+│       │   └── jsc
+│       │       ├── example.js
+│       └── targets
+│           ├── default.xml
+```
+
 * If enabling validation, please run the following command to authenticate against Apigee APIs:
 
 ```

tools/proxy-endpoint-unifier/input.properties

@@ -16,7 +16,7 @@
 input_apis=test/api_bundles
 processed_apis=test/transformed
 proxy_bundle_directory=test/transformed_zipped_bundles
-proxy_endpoint_count=4
+proxy_endpoint_count=10
 debug=false
 
 [validate]

tools/proxy-endpoint-unifier/main.py

@@ -34,11 +34,13 @@ def main():
     proxies = utils.list_dir(proxy_dir)
     final_dict = {}
     processed_dict = {}
+    if validation_enabled:
+        utils.is_token_valid(os.getenv('APIGEE_ACCESS_TOKEN', ''))
 
     for each_dir in proxies:
         each_proxy_dict = utils.read_proxy_artifacts(
                         f"{proxy_dir}/{each_dir}/apiproxy",
-                        utils.parse_proxy_root(f"{proxy_dir}/{each_dir}/apiproxy")
+                        utils.parse_proxy_root(f"{proxy_dir}/{each_dir}/apiproxy")  # noqa
                             )
         if len(each_proxy_dict) > 0:
             each_proxy_rel = utils.get_proxy_objects_relationships(
@@ -72,20 +74,21 @@ def main():
                 'ProxyEndpoints': []
             }
             for each_path, pes in each_group.items():
-                each_pe = '-'.join(pes)
-                merged_pes[each_pe] = utils.merge_proxy_endpoints(
+                each_merged_pe = utils.merge_proxy_endpoints(
                     processing_final_dict[each_api],
                     each_path,
                     pes
                 )
+                each_merged_pe_name = each_merged_pe['ProxyEndpoint']['@name']
+                merged_pes[each_merged_pe_name] = each_merged_pe
                 merged_objects[f"{each_api}_{index}"]['Name'] = f"{final_dict[each_api]['proxyName']}_{index}"  # noqa
                 merged_objects[f"{each_api}_{index}"]['Policies'].extend(  # noqa
                     [ item for pe in pes for item in processed_dict[each_api][pe]['Policies']])  # noqa
                 merged_objects[f"{each_api}_{index}"]['TargetEndpoints'].extend(  # noqa
                     [ item for pe in pes for item in processed_dict[each_api][pe]['TargetEndpoints']])  # noqa
                 merged_objects[f"{each_api}_{index}"]['Policies'] = list(set(merged_objects[f"{each_api}_{index}"]['Policies']))  # noqa
                 merged_objects[f"{each_api}_{index}"]['TargetEndpoints'] = list(set(merged_objects[f"{each_api}_{index}"]['TargetEndpoints']))  # noqa
-                merged_objects[f"{each_api}_{index}"]['ProxyEndpoints'].append(each_pe)  # noqa
+                merged_objects[f"{each_api}_{index}"]['ProxyEndpoints'].append(each_merged_pe_name)  # noqa
 
     for each_api, grouped_api in bundled_group.items():
         for index, each_group in enumerate(grouped_api):