From 572abfe121ed8b0d2610addf1f246f93138fde93 Mon Sep 17 00:00:00 2001
From: Andrew Thauer <6507159+andrewthauer@users.noreply.github.com>
Date: Sat, 26 Sep 2020 06:06:47 -0400
Subject: [PATCH] fix(circleci): add api route prefix to proxy rewrite path

---
 app-config.yaml            | 3 ---
 docs/plugins/proxying.md   | 6 +++---
 plugins/circleci/README.md | 3 ---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app-config.yaml b/app-config.yaml
index a29240fd9c..71cbecd12b 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -16,9 +16,6 @@ backend:
 proxy:
   '/circleci/api':
     target: https://circleci.com/api/v1.1
-    changeOrigin: true
-    pathRewrite:
-      '^/proxy/circleci/api/': '/'
     headers:
       Circle-Token:
         $secret:
diff --git a/docs/plugins/proxying.md b/docs/plugins/proxying.md
index f799d5fd33..a691c7f0bc 100644
--- a/docs/plugins/proxying.md
+++ b/docs/plugins/proxying.md
@@ -49,7 +49,7 @@ Each key under the proxy configuration entry is a route to match, below the
 prefix that the proxy plugin is mounted on. It must start with a slash. For
 example, if the backend mounts the proxy plugin as `/proxy`, the above
 configuration will lead to the proxy acting on backend requests to
-`/proxy/simple-example/...` and `/proxy/larger-example/v1/...`.
+`/api/proxy/simple-example/...` and `/api/proxy/larger-example/v1/...`.
 
 The value inside each route is either a simple URL string, or an object on the
 format accepted by
@@ -74,6 +74,6 @@ except with the following caveats for convenience:
   commonly useful value.
 - If `pathRewrite` is not specified, it is set to a single rewrite that removes
   the entire prefix and route. In the above example, a rewrite of
-  `'^/proxy/larger-example/v1/': '/'` is added. That means that a request to
-  `/proxy/larger-example/v1/some/path` will be translated to a request to
+  `'^/api/proxy/larger-example/v1/': '/'` is added. That means that a request to
+  `/api/proxy/larger-example/v1/some/path` will be translated to a request to
   `http://larger.example.com:8080/svc.v1/some/path`.
diff --git a/plugins/circleci/README.md b/plugins/circleci/README.md
index 48e1bee6cc..19c2c35899 100644
--- a/plugins/circleci/README.md
+++ b/plugins/circleci/README.md
@@ -55,9 +55,6 @@ import { Router as CircleCIRouter } from '@backstage/plugin-circleci';
 proxy:
   '/circleci/api':
     target: https://circleci.com/api/v1.1
-    changeOrigin: true
-    pathRewrite:
-      '^/proxy/circleci/api/': '/'
     headers:
       Circle-Token:
         $secret: