Merge remote-tracking branch 'origin/master' into natasha/b2b-auth

Signed-off-by: Mike Lewis <mtlewis@users.noreply.github.com>

docs/architecture-decisions/adr012-use-luxon-locale-and-date-presets.md

@@ -1,6 +1,6 @@
 ---
 id: adrs-adr012
-title: ADR000: Use Luxon.toLocaleString and date/time presets
+title: ADR012: Use Luxon.toLocaleString and date/time presets
 description: Architecture Decision Record (ADR) for using Luxon's toLocaleString method and date/time presets for displaying dates and times
 ---
 

docs/auth/add-auth-provider.md

@@ -229,7 +229,7 @@ name.
 
 ### Test the new provider
 
-You can `curl -i localhost:7000/api/auth/providerA/start` and which should
+You can `curl -i localhost:7007/api/auth/providerA/start` and which should
 provide a `302` redirect with a `Location` header. Paste the url from that
 header into a web browser and you should be able to trigger the authorization
 flow.

docs/auth/atlassian/provider.md

@@ -28,7 +28,7 @@ Name your integration and click on the `Create` button.
 
 Settings for local development:
 
-- Callback URL: `http://localhost:7000/api/auth/atlassian`
+- Callback URL: `http://localhost:7007/api/auth/atlassian`
 - Use rotating refresh tokens
 - For permissions, you **must** enable `View user profile` for the currently
   logged-in user, under `User identity API`

docs/auth/auth0/provider.md

@@ -17,7 +17,7 @@ provider that can authenticate users using OAuth.
    - Application type: Single Page Web Application
 4. Click on the Settings tab
 5. Add under `Application URIs` > `Allowed Callback URLs`:
-   `http://localhost:7000/api/auth/auth0/handler/frame`
+   `http://localhost:7007/api/auth/auth0/handler/frame`
 6. Click `Save Changes`
 
 ## Configuration

docs/auth/bitbucket/provider.md

@@ -20,7 +20,7 @@ Click Add Consumer.
 Settings for local development:
 
 - Application name: Backstage (or your custom app name)
-- Callback URL: `http://localhost:7000/api/auth/bitbucket`
+- Callback URL: `http://localhost:7007/api/auth/bitbucket`
 - Other are optional
 - (IMPORTANT) **Permissions: Account - Read, Workspace membership - Read**
 

docs/auth/github/provider.md

@@ -24,7 +24,7 @@ Settings for local development:
 
 - Application name: Backstage (or your custom app name)
 - Homepage URL: `http://localhost:3000`
-- Authorization callback URL: `http://localhost:7000/api/auth/github`
+- Authorization callback URL: `http://localhost:7007/api/auth/github`
 
 ## Configuration
 

docs/auth/gitlab/provider.md

@@ -17,7 +17,7 @@ should point to your Backstage backend auth handler.
 Settings for local development:
 
 - Name: Backstage (or your custom app name)
-- Redirect URI: `http://localhost:7000/api/auth/gitlab/handler/frame`
+- Redirect URI: `http://localhost:7007/api/auth/gitlab/handler/frame`
 - Scopes: read_user
 
 ## Configuration

docs/auth/google/provider.md

@@ -26,7 +26,7 @@ To support Google authentication, you must create OAuth credentials:
    - `Name`: Backstage (or your custom app name)
    - `Authorized JavaScript origins`: http://localhost:3000
    - `Authorized Redirect URIs`:
-     http://localhost:7000/api/auth/google/handler/frame
+     http://localhost:7007/api/auth/google/handler/frame
 7. Click Create
 
 ## Configuration

docs/auth/microsoft/provider.md

@@ -21,7 +21,7 @@ To support Azure authentication, you must create an App Registration:
 4. Register an application
    - Name: Backstage (or your custom app name)
    - Redirect URI: Web >
-     `http://localhost:7000/api/auth/microsoft/handler/frame`
+     `http://localhost:7007/api/auth/microsoft/handler/frame`
 5. Navigate to **Certificates & secrets > New client secret** to create a secret
 
 ## Configuration

docs/auth/okta/provider.md

@@ -22,8 +22,8 @@ To add Okta authentication, you must create an Application from Okta:
    - `App integration name`: `Backstage` (or your custom app name)
    - `Grant type`: `Authorization Code` & `Refresh Token`
    - `Sign-in redirect URIs`:
-     `http://localhost:7000/api/auth/okta/handler/frame`
-   - `Sign-out redirect URIs`: `http://localhost:7000`
+     `http://localhost:7007/api/auth/okta/handler/frame`
+   - `Sign-out redirect URIs`: `http://localhost:7007`
    - `Controlled access`: (select as appropriate)
    - Click Save
 

docs/auth/onelogin/provider.md

@@ -18,7 +18,7 @@ To support OneLogin authentication, you must create an Application:
 3. Click Save
 4. Go to the Configuration tab for the Application and set:
    - `Login Url`: `http://localhost:3000`
-   - `Redirect URIs`: `http://localhost:7000/api/auth/onelogin/handler/frame`
+   - `Redirect URIs`: `http://localhost:7007/api/auth/onelogin/handler/frame`
 5. Click Save
 6. Go to the SSO tab for the Application and set:
    - `Token Endpoint` > `Authentication Method`: `POST`

docs/conf/writing.md

@@ -16,8 +16,8 @@ app:
   baseUrl: http://localhost:3000
 
 backend:
-  listen: 0.0.0.0:7000
-  baseUrl: http://localhost:7000
+  listen: 0.0.0.0:7007
+  baseUrl: http://localhost:7007
 
 organization:
   name: CNCF

docs/deployment/docker.md

@@ -105,11 +105,11 @@ docker image build . -f packages/backend/Dockerfile --tag backstage
 To try out the image locally you can run the following:
 
 ```sh
-docker run -it -p 7000:7000 backstage
+docker run -it -p 7007:7007 backstage
 ```
 
 You should then start to get logs in your terminal, and then you can open your
-browser at `http://localhost:7000`
+browser at `http://localhost:7007`
 
 ## Multi-stage Build
 
@@ -208,11 +208,11 @@ docker image build -t backstage .
 To try out the image locally you can run the following:
 
 ```sh
-docker run -it -p 7000:7000 backstage
+docker run -it -p 7007:7007 backstage
 ```
 
 You should then start to get logs in your terminal, and then you can open your
-browser at `http://localhost:7000`
+browser at `http://localhost:7007`
 
 ## Separate Frontend
 

docs/deployment/k8s.md

@@ -351,7 +351,7 @@ spec:
           imagePullPolicy: IfNotPresent
           ports:
             - name: http
-              containerPort: 7000
+              containerPort: 7007
           envFrom:
             - secretRef:
                 name: postgres-secrets
@@ -361,11 +361,11 @@ spec:
 # https://backstage.io/docs/plugins/observability#health-checks
 #          readinessProbe:
 #            httpGet:
-#              port: 7000
+#              port: 7007
 #              path: /healthcheck
 #          livenessProbe:
 #            httpGet:
-#              port: 7000
+#              port: 7007
 #              path: /healthcheck
 ```
 
@@ -449,7 +449,7 @@ spec:
 ```
 
 The `selector` here is telling the Service which pods to target, and the port
-mapping translates normal HTTP port 80 to the backend http port (7000) on the
+mapping translates normal HTTP port 80 to the backend http port (7007) on the
 pod.
 
 Apply this Service to the Kubernetes cluster:
@@ -464,10 +464,10 @@ reveal**_, you can forward a local port to the service:
 
 ```shell
 $ sudo kubectl port-forward --namespace=backstage svc/backstage 80:80
-Forwarding from 127.0.0.1:80 -> 7000
+Forwarding from 127.0.0.1:80 -> 7007
 ```
 
-This shows port 7000 since `port-forward` doesn't _really_ support services, so
+This shows port 7007 since `port-forward` doesn't _really_ support services, so
 it cheats by looking up the first pod for a service and connecting to the mapped
 pod port.
 
@@ -486,7 +486,7 @@ organization:
 backend:
   baseUrl: http://localhost
   listen:
-    port: 7000
+    port: 7007
   cors:
     origin: http://localhost
 ```

docs/features/techdocs/configuration.md

@@ -138,11 +138,11 @@ techdocs:
   # (Optional and Legacy) TechDocs makes API calls to techdocs-backend using this URL. e.g. get docs of an entity, get metadata, etc.
   # You don't have to specify this anymore.
 
-  requestUrl: http://localhost:7000/api/techdocs
+  requestUrl: http://localhost:7007/api/techdocs
 
   # (Optional and Legacy) Just another route in techdocs-backend where TechDocs requests the static files from. This URL uses an HTTP middleware
   # to serve files from either a local directory or an External storage provider.
   # You don't have to specify this anymore.
 
-  storageUrl: http://localhost:7000/api/techdocs/static/docs
+  storageUrl: http://localhost:7007/api/techdocs/static/docs
 ```

docs/getting-started/contributors.md

@@ -43,7 +43,7 @@ the project root. Make sure you have run the above mentioned commands first.
 $ yarn dev
 ```
 
-This is going to start two things, the frontend (:3000) and the backend (:7000).
+This is going to start two things, the frontend (:3000) and the backend (:7007).
 
 This should open a local instance of Backstage in your browser, otherwise open
 one of the URLs printed in the terminal.

docs/getting-started/index.md

@@ -37,7 +37,7 @@ guide to do a repository-based installation.
 - `docker` [installation](https://docs.docker.com/engine/install/)
 - `git` [installation](https://github.com/git-guides/install-git)
 - If the system is not directly accessible over your network, the following
-  ports need to be opened: 3000, 7000
+  ports need to be opened: 3000, 7007
 
 ### Create your Backstage App
 

docs/getting-started/running-backstage-locally.md

@@ -70,7 +70,7 @@ cd packages/backend
 yarn start
 ```
 
-That starts up a backend instance on port 7000.
+That starts up a backend instance on port 7007.
 
 In the other window, we will then launch the frontend. This command is run from
 the project root, not inside the backend directory.

docs/openapi/definitions/auth.yaml

@@ -21,7 +21,7 @@ externalDocs:
   description: Backstage official documentation
   url: https://github.com/backstage/backstage/blob/master/docs/README.md
 servers:
-  - url: http://localhost:7000/api/auth/
+  - url: http://localhost:7007/api/auth/
 tags:
   - name: provider
     description: List of endpoints per provider

docs/plugins/backend-plugin.md

@@ -44,11 +44,11 @@ cd plugins/carmen-backend
 yarn start
 ```
 
-This will think for a bit, and then say `Listening on :7000`. In a different
+This will think for a bit, and then say `Listening on :7007`. In a different
 terminal window, now run
 
 ```sh
-curl localhost:7000/carmen/health
+curl localhost:7007/carmen/health
 ```
 
 This should return `{"status":"ok"}`. Success! Press `Ctrl + c` to kill it
@@ -107,7 +107,7 @@ root), you should be able to fetch data from it.
 
 ```sh
 # Note the extra /api here
-curl localhost:7000/api/carmen/health
+curl localhost:7007/api/carmen/health
 ```
 
 This should return `{"status":"ok"}` like before. Success!