Skip to content

Commit f8a5d31

Browse files
- Docker test fix.
1 parent 9e9f35b commit f8a5d31

File tree

5 files changed

+36
-6
lines changed

5 files changed

+36
-6
lines changed

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.9"
33
services:
44
stackqlsrv:
55
user: "${UID}:${GID}"
6-
image: "${STACKQL_IMAGE_NAME:-stackql/stackql}"
6+
image: "${STACKQL_IMAGE_NAME:-stackql/stackql-devel:busted}"
77
build:
88
context: .
99
cache_from:
@@ -47,6 +47,7 @@ services:
4747
- ./test/assets/credentials/dummy:/opt/stackql/credentials/dummy:ro
4848
- ./test/assets/input:/opt/stackql/input:ro
4949
- ./test/tmp:/opt/test/tmp:rw
50+
- ./test/server:/opt/test/server:ro
5051
- ${DB_SETUP_SRC:-./test/db/sqlite}:/opt/stackql/db:ro
5152
- ${REGISTRY_SRC:-./test/registry-mocked}:/opt/stackql/registry:ro
5253
- ./cicd/vol/stackql/config:/opt/stackql/.stackql:rw

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/spf13/cobra v1.4.0
2020
github.com/spf13/pflag v1.0.5
2121
github.com/spf13/viper v1.10.1
22-
github.com/stackql/any-sdk v0.1.2-alpha20
22+
github.com/stackql/any-sdk v0.1.2-alpha21
2323
github.com/stackql/go-suffix-map v0.0.1-alpha01
2424
github.com/stackql/psql-wire v0.1.1-alpha07
2525
github.com/stackql/stackql-parser v0.0.14-alpha05

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
482482
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
483483
github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
484484
github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
485-
github.com/stackql/any-sdk v0.1.2-alpha20 h1:NoL6WJfPmnCZbK+pahAWRWuAvD9H2xDKoKDgvrmFm84=
486-
github.com/stackql/any-sdk v0.1.2-alpha20/go.mod h1:4jYKpPoX2GWEK+qBnlGLvr8SUfndiYwHMIkg1dn9tFM=
485+
github.com/stackql/any-sdk v0.1.2-alpha21 h1:FKB2L+SzzDuWrAzi+YLQ5bA8mOXeN9ZtSrAs0x8+W38=
486+
github.com/stackql/any-sdk v0.1.2-alpha21/go.mod h1:4jYKpPoX2GWEK+qBnlGLvr8SUfndiYwHMIkg1dn9tFM=
487487
github.com/stackql/go-suffix-map v0.0.1-alpha01 h1:TDUDS8bySu41Oo9p0eniUeCm43mnRM6zFEd6j6VUaz8=
488488
github.com/stackql/go-suffix-map v0.0.1-alpha01/go.mod h1:QAi+SKukOyf4dBtWy8UMy+hsXXV+yyEE4vmBkji2V7g=
489489
github.com/stackql/psql-wire v0.1.1-alpha07 h1:LQWVUlx4Bougk6dztDNG5tmXxpIVeeTSsInTj801xCs=

test/registry/src/local_openssl/v0.1.0/services/keys.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,32 @@ components:
181181
callbacks: {}
182182
requestBodies: {}
183183
resources:
184+
x509:
185+
id: openssl_local.keys.x509
186+
name: x509
187+
title: x509
188+
methods:
189+
describe_certificate:
190+
summary: Describe an x509 certificate.
191+
description: |
192+
Describe an x509 certificate.
193+
Classical usage:
194+
openssl x509 -in test/server/mtls/credentials/pg_server_cert.pem -noout -text
195+
operation:
196+
inline:
197+
- '{{ or .parameters.executable "openssl" }}'
198+
- x509
199+
- -in
200+
- '{{ .parameters.cert_file }}'
201+
- -noout
202+
- -text
203+
parameters:
204+
cert_file:
205+
in: inline
206+
required: true
207+
response:
208+
mediaType: application/json
209+
openAPIDocKey: '200'
184210
rsa:
185211
id: openssl_local.keys.rsa
186212
name: rsa

test/robot/functional/stackql_mocked_from_cmd_line.robot

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7600,8 +7600,11 @@ Local Execution Openssl RSA Show Methods
76007600
... stderr=${CURDIR}/tmp/Local-Execution-Openssl-RSA-Show-Methods-stderr.tmp
76017601

76027602
Local Execution Openssl Create RSA Key Pair
7603-
${inputStr} = Catenate
7604-
... insert into local_openssl.keys.rsa(config_file, key_out_file, cert_out_file, days) select 'test/server/mtls/openssl.cnf', 'test/tmp/manual_key.pem', 'test/tmp/manuial_cert.pem', 90;
7603+
${inputStrNative} = Catenate
7604+
... insert into local_openssl.keys.rsa(config_file, key_out_file, cert_out_file, days) select 'test/server/mtls/openssl.cnf', 'test/tmp/manual_key.pem', 'test/tmp/manual_cert.pem', 90;
7605+
${inputStrDocker} = Catenate
7606+
... insert into local_openssl.keys.rsa(config_file, key_out_file, cert_out_file, days) select '/opt/test/server/mtls/openssl.cnf', '/opt/test/tmp/manual_key.pem', '/opt/test/tmp/manual_cert.pem', 90;
7607+
${inputStr} = Set Variable If "${EXECUTION_PLATFORM}" == "docker" ${inputStrDocker} ${inputStrNative}
76057608
Should Stackql Exec Inline Contain Both Streams
76067609
... ${STACKQL_EXE}
76077610
... ${OKTA_SECRET_STR}

0 commit comments

Comments
 (0)