Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions docker-compose-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -368,15 +368,15 @@ services:
build:
context: .
dockerfile: testLib.Dockerfile
# cache_from:
# cache_from:
# - stackql/testlib
volumes:
- ./test/server/mtls/credentials:/opt/testlib/test/server/mtls/credentials:ro
ports:
- "1094:1094/tcp"
environment:
IS_DOCKER: "${IS_DOCKER:-false}"
command:
command:
- bash
- -c
- |
Expand All @@ -386,6 +386,29 @@ services:
--host 0.0.0.0 \
--port \
1094
retry_mockserver:
networks:
testing-network:
aliases:
- retry.test
image: stackql/testlib
build:
context: .
dockerfile: testLib.Dockerfile
ports:
- "1199:1199/tcp"
environment:
IS_DOCKER: "${IS_DOCKER:-false}"
command:
- bash
- -c
- |
flask \
--app=/opt/testlib/test/python/stackql_test_tooling/flask/retry/app \
run \
--host 0.0.0.0 \
--port \
1199

networks:
testing-network:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ require (
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.10.1
github.com/stackql/any-sdk v0.5.2-beta01
github.com/stackql/any-sdk v0.5.2-beta02
github.com/stackql/go-suffix-map v0.0.1-alpha01
github.com/stackql/psql-wire v0.1.2-beta01
github.com/stackql/stackql-parser v0.0.16-alpha01
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
github.com/stackql/any-sdk v0.5.2-beta01 h1:l6X0RyTy8v/IVMLiWN371qr2fcqIgr2qpCvYpWDR2EA=
github.com/stackql/any-sdk v0.5.2-beta01/go.mod h1:ZRTGrcDKFLaC+5yWo4OqXVs1HTNxgYM9nQsQDlq0Fe0=
github.com/stackql/any-sdk v0.5.2-beta02 h1:94CtlIHDSdlch9SL5l0ybbtV2mI4yrU19Myu1dhF2xM=
github.com/stackql/any-sdk v0.5.2-beta02/go.mod h1:ZRTGrcDKFLaC+5yWo4OqXVs1HTNxgYM9nQsQDlq0Fe0=
github.com/stackql/go-suffix-map v0.0.1-alpha01 h1:TDUDS8bySu41Oo9p0eniUeCm43mnRM6zFEd6j6VUaz8=
github.com/stackql/go-suffix-map v0.0.1-alpha01/go.mod h1:QAi+SKukOyf4dBtWy8UMy+hsXXV+yyEE4vmBkji2V7g=
github.com/stackql/psql-wire v0.1.2-beta01 h1:+0xeLLam3nbI1iv84pWJYGYw5VO5S/+eICRbdu6+dj8=
Expand Down
5 changes: 5 additions & 0 deletions test/assets/expected/retry/configured-recover.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
|---------|------|
| attempt | ok |
|---------|------|
| 5 | true |
|---------|------|
5 changes: 5 additions & 0 deletions test/assets/expected/retry/default-recover.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
|---------|------|
| attempt | ok |
|---------|------|
| 3 | true |
|---------|------|
1 change: 1 addition & 0 deletions test/assets/expected/retry/no-retry-stderr.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
http response status code: 503, response body: {"attempt":1,"ok":false}
1 change: 1 addition & 0 deletions test/assets/expected/retry/tight-budget-stderr.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
http response status code: 503, response body: {"attempt":2,"fail_until":4,"key":"tight-budget","ok":false}
Empty file.
68 changes: 68 additions & 0 deletions test/python/stackql_test_tooling/flask/retry/app.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
"""Flask mock for the retrytestprovider used by stackql retry-policy tests.

Mirrors the upstream any-sdk retry mock so the same scenarios can be exercised
end-to-end through stackql. Counters are keyed per-route so each test can reset
state and assert exactly how many attempts the retry loop made.

Run with:
flask --app=test/python/stackql_test_tooling/flask/retry/app run --host 0.0.0.0 --port 1199
"""

from collections import defaultdict
from threading import Lock

from flask import Flask, jsonify, request


def create_app() -> Flask:
app = Flask(__name__)

counters: "defaultdict[str, int]" = defaultdict(int)
lock = Lock()

@app.post("/reset")
def reset():
with lock:
counters.clear()
return jsonify({"ok": True})

@app.get("/count/<key>")
def count(key: str):
with lock:
return jsonify({"key": key, "attempts": counters[key]})

@app.get("/flaky/<key>")
def flaky(key: str):
try:
fail_until = int(request.args.get("fail_until", "0"))
except ValueError:
fail_until = 0
with lock:
counters[key] += 1
attempt = counters[key]
body = {"key": key, "attempt": attempt, "fail_until": fail_until}
if attempt <= fail_until:
return jsonify({**body, "ok": False}), 503
return jsonify({**body, "ok": True})

@app.get("/always_503")
def always_503():
with lock:
counters["always_503"] += 1
attempt = counters["always_503"]
return jsonify({"attempt": attempt, "ok": False}), 503

return app


app = create_app()


if __name__ == "__main__":
import argparse

parser = argparse.ArgumentParser()
parser.add_argument("--port", type=int, default=1199)
parser.add_argument("--host", default="0.0.0.0")
args = parser.parse_args()
app.run(host=args.host, port=args.port)
10 changes: 10 additions & 0 deletions test/python/stackql_test_tooling/registry_rewrite.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
DIGITALOCEAN_DEFAULT_PORT = 1097
STACKQL_TEST_DEFAULT_PORT = 1099
STACKQL_AUTH_TESTING_DEFAULT_PORT = 1170
RETRY_DEFAULT_PORT = 1199



Expand Down Expand Up @@ -115,6 +116,12 @@
default=STACKQL_AUTH_TESTING_DEFAULT_PORT,
help='port for stackql auth test mock service'
)
parser.add_argument(
'--retry-port',
type=int,
default=RETRY_DEFAULT_PORT,
help='port for retry policy mock service'
)

class ProviderArgs:

Expand Down Expand Up @@ -223,6 +230,9 @@ def __init__(self, processed_args :argparse.Namespace) -> None:
"stackql_oauth2_testing": {
"port": processed_args.stackql_auth_testing_port # shared port acceptable coz auth server decooupled for outh2
},
"retrytestprovider": {
"port": processed_args.retry_port
},
"__default__": {
"port": processed_args.default_port
}
Expand Down
23 changes: 23 additions & 0 deletions test/python/stackql_test_tooling/stackql_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,9 @@ def get_object_count_dict(count :int) -> dict:

MOCKSERVER_PORT_OAUTH_CLIENT_CREDENTIALS_TOKEN = 2091

MOCKSERVER_PORT_RETRY = 1199
RETRY_MOCK_BASE_URL = f"http://127.0.0.1:{MOCKSERVER_PORT_RETRY}"

JSON_INIT_FILE_PATH_REGISTRY = os.path.join(repository_root, 'test', 'mockserver', 'expectations', 'static-registry-expectations.json')

PG_SRV_PORT_MTLS = 5476
Expand Down Expand Up @@ -825,6 +828,16 @@ def get_native_table_count_by_name(table_name :str, sql_backend_str :str) -> str
SELECT_SUMOLOGIC_COLLECTORS_IDS = 'select id from sumologic.collectors.collectors order by id desc;'
SELECT_SUMOLOGIC_COLLECTORS_IDS_EXPECTED = get_output_from_local_file(os.path.join('test', 'assets', 'expected', 'sumologic', 'select-collectors-desc.txt'))

SELECT_RETRY_DEFAULT_RECOVER = "select attempt, ok from retrytestprovider.flaky.recoverable_default where fail_until = 2;"
SELECT_RETRY_CONFIGURED_RECOVER = "select attempt, ok from retrytestprovider.flaky.recoverable_configured where fail_until = 4;"
SELECT_RETRY_NO_RETRY = "select attempt, ok from retrytestprovider.flaky.no_retry;"
SELECT_RETRY_TIGHT_BUDGET = "select attempt, ok from retrytestprovider.flaky.tight_budget where fail_until = 4;"

SELECT_RETRY_DEFAULT_RECOVER_EXPECTED = get_output_from_local_file(os.path.join('test', 'assets', 'expected', 'retry', 'default-recover.txt'))
SELECT_RETRY_CONFIGURED_RECOVER_EXPECTED = get_output_from_local_file(os.path.join('test', 'assets', 'expected', 'retry', 'configured-recover.txt'))
SELECT_RETRY_NO_RETRY_STDERR_EXPECTED = get_output_from_local_file(os.path.join('test', 'assets', 'expected', 'retry', 'no-retry-stderr.txt'))
SELECT_RETRY_TIGHT_BUDGET_STDERR_EXPECTED = get_output_from_local_file(os.path.join('test', 'assets', 'expected', 'retry', 'tight-budget-stderr.txt'))

GET_IAM_POLICY_AGG_ASC_INPUT_FILE = os.path.join(repository_root, 'test', 'assets', 'input', 'select-exec-dependent-org-iam-policy.iql')
GET_IAM_POLICY_AGG_ASC_INPUT_FILE_DOCKER = os.path.join('/opt', 'stackql', 'input', 'select-exec-dependent-org-iam-policy.iql')

Expand Down Expand Up @@ -909,6 +922,8 @@ def get_registry_mock_url(execution_env :str) -> str:
'MOCKSERVER_PORT_GOOGLEADMIN': MOCKSERVER_PORT_GOOGLEADMIN,
'MOCKSERVER_PORT_STACKQL_AUTH_TESTING': MOCKSERVER_PORT_STACKQL_AUTH_TESTING,
'MOCKSERVER_PORT_OAUTH_CLIENT_CREDENTIALS_TOKEN': MOCKSERVER_PORT_OAUTH_CLIENT_CREDENTIALS_TOKEN,
'MOCKSERVER_PORT_RETRY': MOCKSERVER_PORT_RETRY,
'RETRY_MOCK_BASE_URL': RETRY_MOCK_BASE_URL,
'MOCKSERVER_PORT_K8S': MOCKSERVER_PORT_K8S,
'MOCKSERVER_PORT_OKTA': MOCKSERVER_PORT_OKTA,
'MOCKSERVER_PORT_REGISTRY': MOCKSERVER_PORT_REGISTRY,
Expand Down Expand Up @@ -1074,6 +1089,14 @@ def get_registry_mock_url(execution_env :str) -> str:
'SELECT_POSTGRES_CATALOG_JOIN_TUPLE_EXPECTED': SELECT_POSTGRES_CATALOG_JOIN_TUPLE_EXPECTED,
'SELECT_SUMOLOGIC_COLLECTORS_IDS': SELECT_SUMOLOGIC_COLLECTORS_IDS,
'SELECT_SUMOLOGIC_COLLECTORS_IDS_EXPECTED': SELECT_SUMOLOGIC_COLLECTORS_IDS_EXPECTED,
'SELECT_RETRY_DEFAULT_RECOVER': SELECT_RETRY_DEFAULT_RECOVER,
'SELECT_RETRY_DEFAULT_RECOVER_EXPECTED': SELECT_RETRY_DEFAULT_RECOVER_EXPECTED,
'SELECT_RETRY_CONFIGURED_RECOVER': SELECT_RETRY_CONFIGURED_RECOVER,
'SELECT_RETRY_CONFIGURED_RECOVER_EXPECTED': SELECT_RETRY_CONFIGURED_RECOVER_EXPECTED,
'SELECT_RETRY_NO_RETRY': SELECT_RETRY_NO_RETRY,
'SELECT_RETRY_NO_RETRY_STDERR_EXPECTED': SELECT_RETRY_NO_RETRY_STDERR_EXPECTED,
'SELECT_RETRY_TIGHT_BUDGET': SELECT_RETRY_TIGHT_BUDGET,
'SELECT_RETRY_TIGHT_BUDGET_STDERR_EXPECTED': SELECT_RETRY_TIGHT_BUDGET_STDERR_EXPECTED,
'SHELL_COMMANDS_AZURE_COMPUTE_MUTATION_GUARD': [ SELECT_AZURE_COMPUTE_VIRTUAL_MACHINES, SELECT_AZURE_COMPUTE_PUBLIC_KEYS ],
'SHELL_COMMANDS_AZURE_COMPUTE_MUTATION_GUARD_EXPECTED': get_shell_welcome_stdout(execution_env) + SELECT_AZURE_COMPUTE_VIRTUAL_MACHINES_EXPECTED + '\n' + SELECT_AZURE_COMPUTE_PUBLIC_KEYS_EXPECTED,
'SHELL_COMMANDS_AZURE_COMPUTE_MUTATION_GUARD_JSON_EXPECTED': SELECT_AZURE_COMPUTE_VIRTUAL_MACHINES_JSON_EXPECTED + SELECT_AZURE_COMPUTE_PUBLIC_KEYS_JSON_EXPECTED,
Expand Down
23 changes: 23 additions & 0 deletions test/python/stackql_test_tooling/web_service_keywords.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class web_service_keywords(Process):
_DEFAULT_MOCKSERVER_PORT_DIGITALOCEAN = 1097
_DEFAULT_MOCKSERVER_PORT_OAUTH_CLIENT_CREDENTIALS_TOKEN = 2091
_DEFAULT_MOCKSERVER_PORT_REGISTRY = 1094
_DEFAULT_MOCKSERVER_PORT_RETRY = 1199

def _get_dsn(self) -> str:
return self._sqlite_db_path
Expand Down Expand Up @@ -74,6 +75,7 @@ def __init__(
self._googleadmin_app: str = f'{_app_root}/googleadmin/app'
self._k8s_app: str = f'{_app_root}/k8s/app'
self._registry_app: str = f'{_app_root}/registry/app'
self._retry_app: str = f'{_app_root}/retry/app'
self._sumologic_app: str = f'{_app_root}/sumologic/app'

self._tls_key_path: str = tls_key_path if tls_key_path else self._DEFAULT_TLS_KEY_PATH
Expand Down Expand Up @@ -278,6 +280,26 @@ def create_registry_web_service(
cwd=self._cwd,
)

@keyword
def create_retry_web_service(
self,
port: int,
host: str = '0.0.0.0'
) -> None:
"""
Start the retry policy mock backing retrytestprovider.flaky.
"""
return self.start_process(
'flask',
f'--app={self._retry_app}',
'run',
f'--host={host}',
f'--port={port}',
stdout=os.path.abspath(os.path.join(self._log_root, f'retry-server-{port}-stdout.txt')),
stderr=os.path.abspath(os.path.join(self._log_root, f'retry-server-{port}-stderr.txt')),
cwd=self._cwd,
)

@keyword
def create_azure_web_service(
self,
Expand Down Expand Up @@ -363,6 +385,7 @@ def start_all_webservers(self, port_dict: Optional[dict] = None) -> None:
self.create_digitalocean_web_service(_port_dict.get('digitalocean', self._DEFAULT_MOCKSERVER_PORT_DIGITALOCEAN))
self.create_sumologic_web_service(_port_dict.get('sumologic', self._DEFAULT_MOCKSERVER_PORT_SUMOLOGIC))
self.create_registry_web_service(_port_dict.get('registry', self._DEFAULT_MOCKSERVER_PORT_REGISTRY))
self.create_retry_web_service(_port_dict.get('retry', self._DEFAULT_MOCKSERVER_PORT_RETRY))
self.create_k8s_web_service(_port_dict.get('k8s', self._DEFAULT_MOCKSERVER_PORT_K8S))
self.create_google_admin_web_service(_port_dict.get('googleadmin', self._DEFAULT_MOCKSERVER_PORT_GOOGLEADMIN))
self.create_azure_web_service(_port_dict.get('azure', self._DEFAULT_MOCKSERVER_PORT_AZURE))
Expand Down
18 changes: 18 additions & 0 deletions test/registry/src/retrytestprovider/v0.1.0/provider.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
id: retrytestprovider
name: retrytestprovider
openapi: 3.0.3
config:
auth:
type: null_auth
providerServices:
flaky:
description: Service backed by the local flask retry mock.
id: flaky:v0.1.0
name: flaky
preferred: true
service:
$ref: retrytestprovider/v0.1.0/services/flaky.yaml
title: Flaky service for retry policy testing
version: v0.1.0
servers: []
version: v0.1.0
Loading
Loading