Skip to content

Commit ce4d616

Browse files
authored
Revert "Fix: test password variable (#2561)" (#2624)
This reverts commit 5bfe89c.
1 parent 74fd04e commit ce4d616

7 files changed

+40
-86
lines changed

app/_how-tos/allow-multiple-authentication.md

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,13 @@ faqs:
5555
tools:
5656
- deck
5757

58+
prereqs:
59+
entities:
60+
services:
61+
- example-service
62+
routes:
63+
- example-route
64+
5865
cleanup:
5966
inline:
6067
- title: Clean up Konnect environment
@@ -63,22 +70,6 @@ cleanup:
6370
- title: Destroy the {{site.base_gateway}} container
6471
include_content: cleanup/products/gateway
6572
icon_url: /assets/icons/gateway.svg
66-
prereqs:
67-
inline:
68-
- title: Basic auth password
69-
content: |
70-
Export your Basic Auth password as an environment variable:
71-
72-
```sh
73-
export DECK_BASIC_AUTH_PASSWORD=your_password
74-
```
75-
76-
You’ll need this variable when running the tutorial commands.
77-
entities:
78-
services:
79-
- example-service
80-
routes:
81-
- example-route
8273
---
8374

8475
## Create Consumers
@@ -104,17 +95,17 @@ Add the Key Auth and Basic Auth plugins to the `example-service` Gateway Service
10495

10596
{% entity_examples %}
10697
entities:
107-
consumers:
108-
- username: Dana
109-
basicauth_credentials:
110-
- username: Dana
111-
password: ${password}
112-
- username: Mahan
113-
keyauth_credentials:
114-
- key: mahan
115-
variables:
116-
password:
117-
value: $BASIC_AUTH_PASSWORD
98+
plugins:
99+
- name: key-auth
100+
service: example-service
101+
config:
102+
hide_credentials: true
103+
anonymous: anonymous
104+
- name: basic-auth
105+
service: example-service
106+
config:
107+
hide_credentials: true
108+
anonymous: anonymous
118109
{% endentity_examples %}
119110

120111
## Test with anonymous Consumer
@@ -151,13 +142,10 @@ entities:
151142
- username: Dana
152143
basicauth_credentials:
153144
- username: Dana
154-
password: ${password}
145+
password: dana
155146
- username: Mahan
156147
keyauth_credentials:
157148
- key: mahan
158-
variables:
159-
password:
160-
value: $BASIC_AUTH_PASSWORD
161149
{% endentity_examples %}
162150

163151

app/_how-tos/authenticate-consumers-with-basic-authentication.md

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ tldr:
3535
tools:
3636
- deck
3737

38+
prereqs:
39+
entities:
40+
services:
41+
- example-service
42+
routes:
43+
- example-route
44+
3845
cleanup:
3946
inline:
4047
- title: Clean up Konnect environment
@@ -43,23 +50,6 @@ cleanup:
4350
- title: Destroy the {{site.base_gateway}} container
4451
include_content: cleanup/products/gateway
4552
icon_url: /assets/icons/gateway.svg
46-
47-
prereqs:
48-
inline:
49-
- title: Basic auth password
50-
content: |
51-
Export your Basic Auth password as an environment variable:
52-
53-
```sh
54-
export DECK_BASIC_AUTH_PASSWORD=your_password
55-
```
56-
57-
You’ll need this variable when running the tutorial commands.
58-
entities:
59-
services:
60-
- example-service
61-
routes:
62-
- example-route
6353
---
6454

6555
## Create a Consumer
@@ -75,10 +65,7 @@ entities:
7565
- username: jsmith
7666
basicauth_credentials:
7767
- username: jsmith
78-
password: ${password}
79-
variables:
80-
password:
81-
value: $BASIC_AUTH_PASSWORD
68+
password: my-password
8269
{% endentity_examples %}
8370

8471
## Enable authentication

app/_how-tos/configure-datastore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ next_steps:
6666
1. Create a `kong` user and password:
6767

6868
```
69-
CREATE USER kong WITH PASSWORD '$BASIC_AUTH_PASSWORD';
69+
CREATE USER kong WITH PASSWORD 'super_secret';
7070
```
7171
1. Create a database titled `kong` and assign the user as an owner:
7272

app/_how-tos/docker-compose.md

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,7 @@ tldr:
2626
a: "Copy the Docker Compose file and run `docker compose up -d`."
2727
prereqs:
2828
skip_product: true
29-
inline:
30-
- title: Basic auth password
31-
content: |
32-
Export your Basic Auth password as an environment variable:
33-
34-
```sh
35-
export DECK_BASIC_AUTH_PASSWORD=your_password
36-
```
37-
38-
You’ll need this variable when running the tutorial commands.
29+
inline:
3930
- title: Docker Compose
4031
content: |
4132
This guide requires [Docker](https://docs.docker.com/get-started/get-docker/) installed on your system.
@@ -74,7 +65,7 @@ x-kong-config: &kong-env
7465
KONG_PG_HOST: kong-ee-database # Hostname of the Postgres service
7566
KONG_PG_DATABASE: kong # Name of the database to connect to
7667
KONG_PG_USER: kong # Database username
77-
KONG_PG_PASSWORD: "${BASIC_AUTH_PASSWORD}" # Database password
68+
KONG_PG_PASSWORD: kong # Database password
7869
KONG_LICENSE_DATA: "\${KONG_LICENSE_DATA}" # Kong Enterprise license passed via environment variable
7970
8071
services:
@@ -90,7 +81,7 @@ services:
9081
environment:
9182
POSTGRES_USER: kong # Set DB user inside the container
9283
POSTGRES_DB: kong # Create this database on first run
93-
POSTGRES_PASSWORD: "${BASIC_AUTH_PASSWORD}" # Set the password for the DB user
84+
POSTGRES_PASSWORD: kong # Set the password for the DB user
9485
healthcheck: # Ensure the DB is ready before starting dependent services
9586
test: ["CMD", "pg_isready", "-U", "kong"]
9687
interval: 5s
@@ -110,7 +101,7 @@ services:
110101
restart: on-failure
111102
environment:
112103
<<: *kong-env # Reuse environment config from x-kong-config
113-
KONG_PASSWORD: "${BASIC_AUTH_PASSWORD}" # Admin GUI password (required for RBAC)
104+
KONG_PASSWORD: handyshake # Admin GUI password (required for RBAC)
114105
command: kong migrations bootstrap # Run DB migrations to initialize Kong schema
115106
116107
kong-cp:
@@ -124,7 +115,7 @@ services:
124115
KONG_ADMIN_LISTEN: 0.0.0.0:8001, 0.0.0.0:8444 ssl # Admin API on HTTP + HTTPS
125116
KONG_ADMIN_GUI_LISTEN: 0.0.0.0:8002, 0.0.0.0:8445 ssl # Kong Manager on HTTP + HTTPS
126117
KONG_ADMIN_GUI_URL: http://${GW_HOST:-localhost}:8002 # URL for GUI links
127-
KONG_PASSWORD: "${BASIC_AUTH_PASSWORD}" # Required for logging in to Kong Manager (RBAC)
118+
KONG_PASSWORD: handyshake # Required for logging in to Kong Manager (RBAC)
128119
depends_on:
129120
kong-bootstrap:
130121
condition: service_completed_successfully # Start only after bootstrap has succeeded

app/_how-tos/gateway-install-helm-onprem.md

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,6 @@ entities: []
2424
tldr: null
2525

2626
prereqs:
27-
inline:
28-
- title: Basic auth password
29-
content: |
30-
Export your Basic Auth password as an environment variable:
31-
32-
```sh
33-
export DECK_BASIC_AUTH_PASSWORD=your_password
34-
```
35-
36-
You’ll need this variable when running the tutorial commands.
3727
skip_product: true
3828

3929
topology_switcher: page
@@ -119,12 +109,12 @@ env:
119109
database: postgres
120110
pg_database: kong
121111
pg_user: kong
122-
pg_password: "${BASIC_AUTH_PASSWORD}"
112+
pg_password: demo123
123113
pg_host: kong-cp-postgresql.kong.svc.cluster.local
124114
pg_ssl: "on"
125115

126116
# Kong Manager password
127-
password: "${BASIC_ADMIN_PASSWORD}"
117+
password: kong_admin_password
128118

129119
# Enterprise functionality
130120
enterprise:
@@ -170,7 +160,7 @@ proxy:
170160
postgresql:
171161
enabled: true
172162
auth:
173-
password: "${BASIC_AUTH_PASSWORD}"
163+
password: demo123
174164
```
175165

176166
1. Update the database connection values in `values-cp.yaml`.

app/_how-tos/protect-sensitive-information-with-ai.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ prereqs:
5353
5454
Docker will then prompt you to enter a username and password:
5555
56-
Ensure that you export your token into an environment variable.
57-
5856
```bash
5957
Username: kong/ai-pii
60-
Password: YOUR_PASSWORD
58+
Password: YOUR-TOKEN
6159
```
6260
To pull an image:
6361

app/deck/file/kong2kic.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ consumers:
183183
custom_id: "1234567890"
184184
basicauth_credentials:
185185
- username: my_basic_user
186-
password: ${BASIC_AUTH_PASSWORD}
186+
password: my_basic_password
187187
tags:
188188
- internal
189189
plugins:
@@ -493,7 +493,7 @@ metadata:
493493
konghq.com/credential: basic-auth
494494
name: basic-auth-example-user
495495
stringData:
496-
password: ${BASIC_AUTH_PASSWORD}
496+
password: my_basic_password
497497
username: my_basic_user
498498
---
499499
apiVersion: configuration.konghq.com/v1
@@ -709,7 +709,7 @@ metadata:
709709
konghq.com/credential: basic-auth
710710
name: basic-auth-example-user
711711
stringData:
712-
password: ${BASIC_AUTH_PASSWORD}
712+
password: my_basic_password
713713
username: my_basic_user
714714
---
715715
apiVersion: configuration.konghq.com/v1

0 commit comments

Comments
 (0)