Skip to content

Commit b23bc7f

Browse files
committed
Change default port of backend to 7007 due to MacOS Control Center update
Signed-off-by: Otto Sichert <[email protected]>
1 parent fb03c47 commit b23bc7f

File tree

73 files changed

+137
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+137
-137
lines changed

.tugboat/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
services:
22
backstage:
33
image: tugboatqa/node:lts
4-
expose: 7000
4+
expose: 7007
55
default: true
66
commands:
77
init:
@@ -14,4 +14,4 @@ services:
1414
- yarn workspace example-app build
1515
start:
1616
# wget the endpoint. Will retry every 2 seconds. 30 retries = 1m for service to come up. Plenty.
17-
- wget -O /dev/null -o /dev/null --tries=30 --timeout=5 --retry-connrefused http://localhost:7000
17+
- wget -O /dev/null -o /dev/null --tries=30 --timeout=5 --retry-connrefused http://localhost:7007

app-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ app:
2323
title: '#backstage'
2424

2525
backend:
26-
baseUrl: http://localhost:7000
26+
baseUrl: http://localhost:7007
2727
listen:
28-
port: 7000
28+
port: 7007
2929
database:
3030
client: sqlite3
3131
connection: ':memory:'

contrib/chart/backstage/files/app-config.development.yaml.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
backend:
22
lighthouseHostname: {{ include "lighthouse.serviceName" . | quote }}
33
listen:
4-
port: {{ .Values.appConfig.backend.listen.port | default 7000 }}
4+
port: {{ .Values.appConfig.backend.listen.port | default 7007 }}
55
database:
66
client: {{ .Values.appConfig.backend.database.client | quote }}
77
connection:

contrib/chart/backstage/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ backend:
2626
repository: martinaif/backstage-k8s-demo-backend
2727
tag: 20210423T1550
2828
pullPolicy: IfNotPresent
29-
containerPort: 7000
29+
containerPort: 7007
3030
serviceType: ClusterIP
3131
postgresCertMountEnabled: true
3232
resources:
@@ -96,7 +96,7 @@ appConfig:
9696
backend:
9797
baseUrl: https://demo.example.com
9898
listen:
99-
port: 7000
99+
port: 7007
100100
cors:
101101
origin: https://demo.example.com
102102
database:

contrib/docker/devops/makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ docker_name_prefix := backstage-make
99
# to the host computer
1010
frontend_port := 3000
1111
frontend_host_port := 3000
12-
backend_port := 7000
13-
backend_host_port := 7000
12+
backend_port := 7007
13+
backend_host_port := 7007
1414

1515
# path to this "makefile"
1616
my_dir_path = $(dir $(CURDIR)/$(firstword $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
@@ -191,10 +191,10 @@ test: check-tests
191191
check: check-code check-docs check-type-dependencies check-styles
192192

193193
# run development instance
194-
# BUG: the frontend seems to run on "$(backend_port)" (7000 default).
194+
# BUG: the frontend seems to run on "$(backend_port)" (7007 default).
195195
# The documentation states "This is going to start two things,
196-
# the frontend (:3000) and the backend (:7000)."
197-
# However, the frontend seems to end up running on 7000.
196+
# the frontend (:3000) and the backend (:7007)."
197+
# However, the frontend seems to end up running on 7007.
198198
.PHONY: dev
199199
dev: build
200200
@docker run --rm -it \

contrib/kubernetes/basic_kubernetes_example_with_helm/backend.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ spec:
2222
image: spotify/backstage-backend:latest
2323
imagePullPolicy: IfNotPresent
2424
ports:
25-
- containerPort: 7000
25+
- containerPort: 7007
2626
name: backend
2727
protocol: TCP

contrib/kubernetes/basic_kubernetes_example_with_helm/backstage/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ backend:
6363
pullPolicy: IfNotPresent
6464
service:
6565
type: ClusterIP
66-
port: 7000
66+
port: 7007
6767
ingress:
6868
enabled: false
6969
annotations:

contrib/kubernetes/basic_kubernetes_example_with_helm/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ spec:
3030
component: backend
3131
ports:
3232
- name: backend
33-
port: 7000
33+
port: 7007
3434
protocol: TCP
3535
targetPort: backend

cypress/cypress.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"baseUrl": "http://localhost:7000",
2+
"baseUrl": "http://localhost:7007",
33
"integrationFolder": "./src/integration",
44
"supportFile": "./src/support",
55
"fixturesFolder": "./src/fixtures",

docs/auth/add-auth-provider.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ name.
229229

230230
### Test the new provider
231231

232-
You can `curl -i localhost:7000/api/auth/providerA/start` and which should
232+
You can `curl -i localhost:7007/api/auth/providerA/start` and which should
233233
provide a `302` redirect with a `Location` header. Paste the url from that
234234
header into a web browser and you should be able to trigger the authorization
235235
flow.

docs/auth/atlassian/provider.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Name your integration and click on the `Create` button.
2828

2929
Settings for local development:
3030

31-
- Callback URL: `http://localhost:7000/api/auth/atlassian`
31+
- Callback URL: `http://localhost:7007/api/auth/atlassian`
3232
- Use rotating refresh tokens
3333
- For permissions, you **must** enable `View user profile` for the currently
3434
logged-in user, under `User identity API`

docs/auth/auth0/provider.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ provider that can authenticate users using OAuth.
1717
- Application type: Single Page Web Application
1818
4. Click on the Settings tab
1919
5. Add under `Application URIs` > `Allowed Callback URLs`:
20-
`http://localhost:7000/api/auth/auth0/handler/frame`
20+
`http://localhost:7007/api/auth/auth0/handler/frame`
2121
6. Click `Save Changes`
2222

2323
## Configuration

docs/auth/bitbucket/provider.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Click Add Consumer.
2020
Settings for local development:
2121

2222
- Application name: Backstage (or your custom app name)
23-
- Callback URL: `http://localhost:7000/api/auth/bitbucket`
23+
- Callback URL: `http://localhost:7007/api/auth/bitbucket`
2424
- Other are optional
2525
- (IMPORTANT) **Permissions: Account - Read, Workspace membership - Read**
2626

docs/auth/github/provider.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Settings for local development:
2424

2525
- Application name: Backstage (or your custom app name)
2626
- Homepage URL: `http://localhost:3000`
27-
- Authorization callback URL: `http://localhost:7000/api/auth/github`
27+
- Authorization callback URL: `http://localhost:7007/api/auth/github`
2828

2929
## Configuration
3030

docs/auth/gitlab/provider.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ should point to your Backstage backend auth handler.
1717
Settings for local development:
1818

1919
- Name: Backstage (or your custom app name)
20-
- Redirect URI: `http://localhost:7000/api/auth/gitlab/handler/frame`
20+
- Redirect URI: `http://localhost:7007/api/auth/gitlab/handler/frame`
2121
- Scopes: read_user
2222

2323
## Configuration

docs/auth/google/provider.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ To support Google authentication, you must create OAuth credentials:
2626
- `Name`: Backstage (or your custom app name)
2727
- `Authorized JavaScript origins`: http://localhost:3000
2828
- `Authorized Redirect URIs`:
29-
http://localhost:7000/api/auth/google/handler/frame
29+
http://localhost:7007/api/auth/google/handler/frame
3030
7. Click Create
3131

3232
## Configuration

docs/auth/microsoft/provider.md

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

2727
## Configuration

docs/auth/okta/provider.md

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

docs/auth/onelogin/provider.md

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

docs/conf/writing.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ app:
1616
baseUrl: http://localhost:3000
1717

1818
backend:
19-
listen: 0.0.0.0:7000
20-
baseUrl: http://localhost:7000
19+
listen: 0.0.0.0:7007
20+
baseUrl: http://localhost:7007
2121

2222
organization:
2323
name: CNCF

docs/deployment/docker.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ docker image build . -f packages/backend/Dockerfile --tag backstage
105105
To try out the image locally you can run the following:
106106

107107
```sh
108-
docker run -it -p 7000:7000 backstage
108+
docker run -it -p 7007:7007 backstage
109109
```
110110

111111
You should then start to get logs in your terminal, and then you can open your
112-
browser at `http://localhost:7000`
112+
browser at `http://localhost:7007`
113113

114114
## Multi-stage Build
115115

@@ -208,11 +208,11 @@ docker image build -t backstage .
208208
To try out the image locally you can run the following:
209209

210210
```sh
211-
docker run -it -p 7000:7000 backstage
211+
docker run -it -p 7007:7007 backstage
212212
```
213213

214214
You should then start to get logs in your terminal, and then you can open your
215-
browser at `http://localhost:7000`
215+
browser at `http://localhost:7007`
216216

217217
## Separate Frontend
218218

docs/deployment/k8s.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ spec:
351351
imagePullPolicy: IfNotPresent
352352
ports:
353353
- name: http
354-
containerPort: 7000
354+
containerPort: 7007
355355
envFrom:
356356
- secretRef:
357357
name: postgres-secrets
@@ -361,11 +361,11 @@ spec:
361361
# https://backstage.io/docs/plugins/observability#health-checks
362362
# readinessProbe:
363363
# httpGet:
364-
# port: 7000
364+
# port: 7007
365365
# path: /healthcheck
366366
# livenessProbe:
367367
# httpGet:
368-
# port: 7000
368+
# port: 7007
369369
# path: /healthcheck
370370
```
371371

@@ -449,7 +449,7 @@ spec:
449449
```
450450

451451
The `selector` here is telling the Service which pods to target, and the port
452-
mapping translates normal HTTP port 80 to the backend http port (7000) on the
452+
mapping translates normal HTTP port 80 to the backend http port (7007) on the
453453
pod.
454454

455455
Apply this Service to the Kubernetes cluster:
@@ -464,10 +464,10 @@ reveal**_, you can forward a local port to the service:
464464

465465
```shell
466466
$ sudo kubectl port-forward --namespace=backstage svc/backstage 80:80
467-
Forwarding from 127.0.0.1:80 -> 7000
467+
Forwarding from 127.0.0.1:80 -> 7007
468468
```
469469

470-
This shows port 7000 since `port-forward` doesn't _really_ support services, so
470+
This shows port 7007 since `port-forward` doesn't _really_ support services, so
471471
it cheats by looking up the first pod for a service and connecting to the mapped
472472
pod port.
473473

@@ -486,7 +486,7 @@ organization:
486486
backend:
487487
baseUrl: http://localhost
488488
listen:
489-
port: 7000
489+
port: 7007
490490
cors:
491491
origin: http://localhost
492492
```

docs/features/techdocs/configuration.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,11 @@ techdocs:
138138
# (Optional and Legacy) TechDocs makes API calls to techdocs-backend using this URL. e.g. get docs of an entity, get metadata, etc.
139139
# You don't have to specify this anymore.
140140

141-
requestUrl: http://localhost:7000/api/techdocs
141+
requestUrl: http://localhost:7007/api/techdocs
142142

143143
# (Optional and Legacy) Just another route in techdocs-backend where TechDocs requests the static files from. This URL uses an HTTP middleware
144144
# to serve files from either a local directory or an External storage provider.
145145
# You don't have to specify this anymore.
146146

147-
storageUrl: http://localhost:7000/api/techdocs/static/docs
147+
storageUrl: http://localhost:7007/api/techdocs/static/docs
148148
```

docs/getting-started/contributors.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ the project root. Make sure you have run the above mentioned commands first.
4343
$ yarn dev
4444
```
4545

46-
This is going to start two things, the frontend (:3000) and the backend (:7000).
46+
This is going to start two things, the frontend (:3000) and the backend (:7007).
4747

4848
This should open a local instance of Backstage in your browser, otherwise open
4949
one of the URLs printed in the terminal.

docs/getting-started/index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ guide to do a repository-based installation.
3737
- `docker` [installation](https://docs.docker.com/engine/install/)
3838
- `git` [installation](https://github.com/git-guides/install-git)
3939
- If the system is not directly accessible over your network, the following
40-
ports need to be opened: 3000, 7000
40+
ports need to be opened: 3000, 7007
4141

4242
### Create your Backstage App
4343

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ cd packages/backend
7070
yarn start
7171
```
7272

73-
That starts up a backend instance on port 7000.
73+
That starts up a backend instance on port 7007.
7474

7575
In the other window, we will then launch the frontend. This command is run from
7676
the project root, not inside the backend directory.

docs/openapi/definitions/auth.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ externalDocs:
2121
description: Backstage official documentation
2222
url: https://github.com/backstage/backstage/blob/master/docs/README.md
2323
servers:
24-
- url: http://localhost:7000/api/auth/
24+
- url: http://localhost:7007/api/auth/
2525
tags:
2626
- name: provider
2727
description: List of endpoints per provider

docs/plugins/backend-plugin.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ cd plugins/carmen-backend
4444
yarn start
4545
```
4646

47-
This will think for a bit, and then say `Listening on :7000`. In a different
47+
This will think for a bit, and then say `Listening on :7007`. In a different
4848
terminal window, now run
4949

5050
```sh
51-
curl localhost:7000/carmen/health
51+
curl localhost:7007/carmen/health
5252
```
5353

5454
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.
107107
108108
```sh
109109
# Note the extra /api here
110-
curl localhost:7000/api/carmen/health
110+
curl localhost:7007/api/carmen/health
111111
```
112112
113113
This should return `{"status":"ok"}` like before. Success!

packages/app/cypress/integration/components/search/SearchPage.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
const API_ENDPOINT = 'http://localhost:7000/api/search/query';
17+
const API_ENDPOINT = 'http://localhost:7007/api/search/query';
1818

1919
describe('SearchPage', () => {
2020
describe('Given a search context with a term, results, and filter values', () => {

packages/app/src/App.test.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ describe('App', () => {
2727
data: {
2828
app: {
2929
title: 'Test',
30-
support: { url: 'http://localhost:7000/support' },
30+
support: { url: 'http://localhost:7007/support' },
3131
},
32-
backend: { baseUrl: 'http://localhost:7000' },
32+
backend: { baseUrl: 'http://localhost:7007' },
3333
lighthouse: {
3434
baseUrl: 'http://localhost:3003',
3535
},
3636
techdocs: {
37-
storageUrl: 'http://localhost:7000/api/techdocs/static/docs',
37+
storageUrl: 'http://localhost:7007/api/techdocs/static/docs',
3838
},
3939
},
4040
context: 'test',

0 commit comments

Comments
 (0)