From 8f4a6d83dcaca9423937e03a7908f565b751f96f Mon Sep 17 00:00:00 2001
From: "jacob.delaspenas" <jacob.delaspenas@randstad.es>
Date: Wed, 31 Jan 2024 13:34:36 +0100
Subject: [PATCH 1/2] Added target-server flag to options and target endpoint
 generation

---
 bin/openapi2apigee                                 | 1 +
 lib/commands/generateApi/generateTargetEndPoint.js | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bin/openapi2apigee b/bin/openapi2apigee
index f997c3d..5a02ff1 100755
--- a/bin/openapi2apigee
+++ b/bin/openapi2apigee
@@ -45,6 +45,7 @@ program
   .option('-t, --token <token>', 'Apigee Edge Auth Token to Deploy')
   .option('-U, --backendurl <backendurl>','Specify the target backend url')
   .option('-O, --oauth <oauth>','Apigee enable oauth')
+  .option('-T, --target-server <targetserver>', 'Apigee existing target server')
 
   .description('Generates Apigee API Bundle')
   .action(function(apiProxy, options) {
diff --git a/lib/commands/generateApi/generateTargetEndPoint.js b/lib/commands/generateApi/generateTargetEndPoint.js
index 984bb73..64bc4bc 100644
--- a/lib/commands/generateApi/generateTargetEndPoint.js
+++ b/lib/commands/generateApi/generateTargetEndPoint.js
@@ -57,7 +57,13 @@ module.exports = function generateTargetEndPoint (apiProxy, options, api, cb) {
 
   if (options.backendurl) {
     httpTargetConn.ele('URL', {}, options.backendurl)
-  } else {
+  }
+  else if (options.targetServer) {
+    httpTargetConn.ele('LoadBalancer')
+      .ele('Server', {'name': options.targetServer})
+    httpTargetConn.ele('Path', {}, options.basepath)
+  }
+  else {
     if (api.openapi) {
       httpTargetConn.ele('URL', {}, api.servers[0].url)
     } else {

From 1bc158fd96b9302a4dbb7add3dfbff8a4179b793 Mon Sep 17 00:00:00 2001
From: "jacob.delaspenas" <jacob.delaspenas@randstad.es>
Date: Wed, 31 Jan 2024 14:16:45 +0100
Subject: [PATCH 2/2] Add condition to target endpoint target server path

---
 lib/commands/generateApi/generateTargetEndPoint.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/commands/generateApi/generateTargetEndPoint.js b/lib/commands/generateApi/generateTargetEndPoint.js
index 64bc4bc..3716545 100644
--- a/lib/commands/generateApi/generateTargetEndPoint.js
+++ b/lib/commands/generateApi/generateTargetEndPoint.js
@@ -61,7 +61,9 @@ module.exports = function generateTargetEndPoint (apiProxy, options, api, cb) {
   else if (options.targetServer) {
     httpTargetConn.ele('LoadBalancer')
       .ele('Server', {'name': options.targetServer})
-    httpTargetConn.ele('Path', {}, options.basepath)
+    if (options.basepath) {
+      httpTargetConn.ele('Path', {}, options.basepath)
+    }
   }
   else {
     if (api.openapi) {