Skip to content

Commit 7f72991

Browse files
general-kroll-4-lifegeneral-kroll-4-life
committed
- Improving.
1 parent d4cf0be commit 7f72991

File tree

7 files changed

+97
-18
lines changed

7 files changed

+97
-18
lines changed

‎test/assets/credentials/dummy/google/docker-functional-test-dummy-sa-key.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"client_email": "[email protected]",
77
"client_id": "11",
88
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
9-
"token_uri": "http://host.docker.internal:2091/google/simple/token",
9+
"token_uri": "https://host.docker.internal:2091/google/simple/token",
1010
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
1111
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/silly-sa%40silly-project-01.iam.gserviceaccount.com"
1212
}

‎test/assets/credentials/dummy/google/functional-test-dummy-sa-key.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"client_email": "[email protected]",
77
"client_id": "11",
88
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
9-
"token_uri": "http://localhost:2091/google/simple/token",
9+
"token_uri": "https://localhost:2091/google/simple/token",
1010
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
1111
"client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/silly-sa%40silly-project-01.iam.gserviceaccount.com"
1212
}

‎test/python/flask/README.md‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,74 +18,80 @@ pgrep -f flask | xargs kill -9
1818
GCP mocks:
1919

2020
```bash
21-
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/gcp/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --port 1080
21+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/gcp/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 1080
2222
```
2323

2424
Azure mocks:
2525

2626
```bash
27-
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/azure/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --port 1095
27+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/azure/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 1095
2828
```
2929

3030
Okta mocks:
3131

3232
```bash
33-
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/okta/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --port 1090
33+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/okta/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 1090
3434
```
3535

3636
AWS mocks:
3737

3838
```bash
39-
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/aws/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --port 1091
39+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/aws/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 1091
4040
```
4141

4242
Github mocks:
4343

4444
```bash
45-
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/github/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --port 1093
45+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/github/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 1093
4646
```
4747

4848
Sumologic mocks:
4949

5050
```bash
51-
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/okta/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --port 1096
51+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/okta/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 1096
5252
```
5353

5454
Digitalocean mocks:
5555

5656
```bash
57-
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/digitalocean/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --port 1097
57+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/digitalocean/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 1097
5858
```
5959

6060
`googleadmin` mocks:
6161

6262
```bash
63-
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/googleadmin/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --port 1098
63+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/googleadmin/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 1098
6464
```
6565

6666
stackql auth testing mocks:
6767

6868
```bash
69-
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/static_auth/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --port 1170
69+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/static_auth/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 1170
70+
```
71+
72+
Token server mocks:
73+
74+
```bash
75+
flask --app=${HOME}/stackql/stackql-devel/test/python/flask/static_auth/app run --cert=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_cert.pem --key=${HOME}/stackql/stackql-devel/test/server/mtls/credentials/pg_server_key.pem --host 0.0.0.0 --port 2091
7076
```
7177

7278

7379
### Manually testing mocks
7480

75-
With embedded `sqlite` (default):
81+
With embedded `sqlite` (default), from the root of this repository:
7682

7783
```bash
78-
export workspaceFolder='/path/to/repository/root' # change this
84+
export workspaceFolder="$(pwd)"
7985

8086
stackql --registry="{ \"url\": \"file://${workspaceFolder}/test/registry-mocked\", \"localDocRoot\": \"${workspaceFolder}/test/registry-mocked\", \"verifyConfig\": { \"nopVerify\": true } }" --tls.allowInsecure shell
8187
```
8288

83-
With `postgres`:
89+
With `postgres`, from the root of this repository:
8490

8591
```bash
8692
docker compose -f docker-compose-externals.yml up postgres_stackql -d
8793

88-
export workspaceFolder='/path/to/repository/root' # change this
94+
export workspaceFolder="$(pwd)"
8995

9096
stackql --registry="{ \"url\": \"file://${workspaceFolder}/test/registry-mocked\", \"localDocRoot\": \"${workspaceFolder}/test/registry-mocked\", \"verifyConfig\": { \"nopVerify\": true } }" --tls.allowInsecure --sqlBackend="{ \"dbEngine\": \"postgres_tcp\", \"sqlDialect\": \"postgres\", \"dsn\": \"postgres://stackql:[email protected]:7432/stackql\" }" shell
9197
```

‎test/registry/src/stackql_oauth2_testing/v0.1.0/provider.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ config:
2727
client_secret_env_var: 'YOUR_OAUTH2_CLIENT_SECRET_ENV_VAR'
2828
type: "oauth2"
2929
grant_type: "client_credentials"
30-
token_url: 'http://localhost:2091/{{ .__env__YOUR_OAUTH2_SOME_SYSTEM_ACCOUNT_ID }}/simple/token'
30+
token_url: 'https://localhost:2091/{{ .__env__YOUR_OAUTH2_SOME_SYSTEM_ACCOUNT_ID }}/simple/token'
3131
scopes:
3232
- 'scope-01'
3333
- 'scope-02'

‎test/robot/lib/stackql_context.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ def get_local_temp_path(inode_name: str, execution_env: str) -> str:
249249
"grant_type": "client_credentials",
250250
"client_id": "dummy_client_id",
251251
"client_secret": "dummy_client_secret",
252-
"token_url": "http://localhost:2091/contrived/simple/error/token",
252+
"token_url": "https://localhost:2091/contrived/simple/error/token",
253253
"scopes": ["scope1", "scope2"]
254254
}
255255

@@ -312,7 +312,7 @@ def get_local_temp_path(inode_name: str, execution_env: str) -> str:
312312
"grant_type": "client_credentials",
313313
"client_id": "dummy_client_id",
314314
"client_secret": "dummy_client_secret",
315-
"token_url": "http://host.docker.internal:2091/contrived/simple/error/token",
315+
"token_url": "https://host.docker.internal:2091/contrived/simple/error/token",
316316
"scopes": ["scope1", "scope2"]
317317
}
318318

‎test/tcp/reverse-proxy/nginx/elegant-sni-proxy.conf‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
worker_processes 1;
2+
3+
#error_log logs/error.log;
4+
#error_log logs/error.log notice;
5+
#error_log logs/error.log info;
6+
7+
#pid logs/nginx.pid;
8+
9+
10+
events {
11+
worker_connections 1024;
12+
}
13+
14+
stream {
15+
16+
map $ssl_preread_server_name $targetBackend {
17+
storage.googleapis.com 127.0.0.1:1080;
18+
localhost 127.0.0.1:2091;
19+
}
20+
21+
server {
22+
listen 1443;
23+
24+
proxy_connect_timeout 1s;
25+
proxy_timeout 3s;
26+
resolver 1.1.1.1;
27+
28+
proxy_pass $targetBackend;
29+
ssl_preread on;
30+
}
31+
}

‎test/tcp/reverse-proxy/nginx/mocks-tls-pass-through.conf‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
worker_processes 1;
2+
3+
#error_log logs/error.log;
4+
#error_log logs/error.log notice;
5+
#error_log logs/error.log info;
6+
7+
#pid logs/nginx.pid;
8+
9+
10+
events {
11+
worker_connections 1024;
12+
}
13+
14+
stream {
15+
upstream web_server {
16+
# Our web server, listening for SSL traffic
17+
# Note the web server will expect traffic
18+
# at this xip.io "domain", just for our
19+
# example here
20+
server 127.0.0.1:1080;
21+
}
22+
23+
upstream token_server {
24+
# Our web server, listening for SSL traffic
25+
# Note the web server will expect traffic
26+
# at this xip.io "domain", just for our
27+
# example here
28+
server 127.0.0.1:2091;
29+
}
30+
31+
server {
32+
listen 1443;
33+
server_name storage.googleapis.com;
34+
proxy_pass web_server;
35+
}
36+
37+
server {
38+
listen 1443;
39+
server_name localhost;
40+
proxy_pass token_server;
41+
}
42+
}

0 commit comments

Comments
 (0)