Skip to content

Commit d6e6ea4

Browse files
general-kroll-4-lifegeneral-kroll-4-life
committed
- revert
1 parent e771be7 commit d6e6ea4

File tree

6 files changed

+25
-22
lines changed

6 files changed

+25
-22
lines changed

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
- name: Mock Server Download
156156
run: |
157157
mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy `
158-
'-Dartifact=org.mock-server:mockserver-netty:5.14.0:jar:shaded' `
158+
'-Dartifact=org.mock-server:mockserver-netty:5.12.0:jar:shaded' `
159159
'-DoutputDirectory=test/downloads'
160160
161161
- name: Create certificates for robot tests
@@ -364,7 +364,7 @@ jobs:
364364
run: |
365365
mvn \
366366
org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy \
367-
-Dartifact=org.mock-server:mockserver-netty:5.14.0:jar:shaded \
367+
-Dartifact=org.mock-server:mockserver-netty:5.12.0:jar:shaded \
368368
-DoutputDirectory=test/downloads
369369
370370
- name: Create certificates for robot tests
@@ -620,7 +620,7 @@ jobs:
620620
run: |
621621
mvn \
622622
org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy \
623-
-Dartifact=org.mock-server:mockserver-netty:5.14.0:jar:shaded \
623+
-Dartifact=org.mock-server:mockserver-netty:5.12.0:jar:shaded \
624624
-DoutputDirectory=test/downloads
625625
626626
- name: Create certificates for robot tests
@@ -801,7 +801,7 @@ jobs:
801801
run: |
802802
mvn \
803803
org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy \
804-
-Dartifact=org.mock-server:mockserver-netty:5.14.0:jar:shaded \
804+
-Dartifact=org.mock-server:mockserver-netty:5.12.0:jar:shaded \
805805
-DoutputDirectory=test/downloads
806806
807807
- shell: wsl-bash {0}
@@ -869,6 +869,9 @@ jobs:
869869
- name: Check out code into the Go module directory
870870
uses: actions/[email protected]
871871

872+
- name: Set env # awful hack to get java 8 and support the abomnible mock server template grammar
873+
run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
874+
872875
- name: Set up Go 1.x
873876
uses: actions/[email protected]
874877
with:
@@ -954,7 +957,7 @@ jobs:
954957
run: |
955958
mvn \
956959
org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy \
957-
-Dartifact=org.mock-server:mockserver-netty:5.14.0:jar:shaded \
960+
-Dartifact=org.mock-server:mockserver-netty:5.12.0:jar:shaded \
958961
-DoutputDirectory=test/downloads
959962
960963
- name: Create certificates for robot tests
@@ -1196,7 +1199,7 @@ jobs:
11961199
run: |
11971200
mvn \
11981201
org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy \
1199-
-Dartifact=org.mock-server:mockserver-netty:5.14.0:jar:shaded \
1202+
-Dartifact=org.mock-server:mockserver-netty:5.12.0:jar:shaded \
12001203
-DoutputDirectory=test/downloads
12011204
12021205
- name: Debug info

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ RUN apt-get update \
7575
&& pip3 install PyYaml robotframework psycopg2-binary "psycopg[binary]" sqlalchemy \
7676
&& mvn \
7777
org.apache.maven.plugins:maven-dependency-plugin:3.0.2:copy \
78-
-Dartifact=org.mock-server:mockserver-netty:5.14.0:jar:shaded \
78+
-Dartifact=org.mock-server:mockserver-netty:5.12.0:jar:shaded \
7979
-DoutputDirectory=${TEST_ROOT_DIR}/test/downloads
8080

8181
FROM utility AS certificates

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ services:
106106
- bash
107107
- -c
108108
- |
109-
MOCKSERVER_JAR='/opt/test/stackql/test/downloads/mockserver-netty-5.14.0-shaded.jar'
109+
MOCKSERVER_JAR='/opt/test/stackql/test/downloads/mockserver-netty-5.12.0-shaded.jar'
110110
JSON_INIT_FILE_DIR='/opt/test/stackql/test/mockserver/expectations'
111111
java -Dfile.encoding=UTF-8 \
112112
-Dmockserver.initializationJsonPath=$${JSON_INIT_FILE_DIR}/static-gcp-expectations.json \

‎docs/examples/scripts/powershell/setup-win-vm.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@ java `
5858
'-Dfile.encoding=UTF-8' `
5959
"-Dmockserver.initializationJsonPath=${HOME}/stackql/test/mockserver/expectations/static-google-admin-expectations.json" `
6060
-jar `
61-
${HOME}/stackql/test/downloads/mockserver-netty-5.14.0-shaded.jar `
61+
${HOME}/stackql/test/downloads/mockserver-netty-5.12.0-shaded.jar `
6262
-serverPort 1098 -logLevel INFO
6363

6464
java `
6565
'-Dfile.encoding=UTF-8' `
6666
"-Dmockserver.initializationJsonPath=${HOME}/stackql/test/mockserver/expectations/static-aws-expectations.json" `
6767
-jar `
68-
${HOME}/stackql/test/downloads/mockserver-netty-5.14.0-shaded.jar `
68+
${HOME}/stackql/test/downloads/mockserver-netty-5.12.0-shaded.jar `
6969
-serverPort 1091 -logLevel INFO
7070

7171
java `
7272
'-Dfile.encoding=UTF-8' `
7373
"-Dmockserver.initializationJsonPath=${HOME}/stackql/test/mockserver/expectations/static-gcp-expectations.json" `
7474
-jar `
75-
${HOME}/stackql/test/downloads/mockserver-netty-5.14.0-shaded.jar `
75+
${HOME}/stackql/test/downloads/mockserver-netty-5.12.0-shaded.jar `
7676
-serverPort 1080 -logLevel INFO
7777

7878
.\stackql.exe `

‎test/mockserver/README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,63 +11,63 @@ Some doco on creating expectations [here](https://www.mock-server.com/mock_serve
1111
### To install
1212

1313
```bash
14-
mvn org.apache.maven.plugins:maven-dependency-plugin:3.2.0:copy -Dartifact=org.mock-server:mockserver-netty:5.14.0:jar:shaded -DoutputDirectory=${HOME}/stackql/stackql-devel/test/downloads -DdestFileName=mockserver-netty.jar -DoverWrite=true
14+
mvn org.apache.maven.plugins:maven-dependency-plugin:3.2.0:copy -Dartifact=org.mock-server:mockserver-netty:5.12.0:jar:shaded -DoutputDirectory=${HOME}/stackql/stackql-devel/test/downloads -DdestFileName=mockserver-netty.jar -DoverWrite=true
1515
```
1616

1717
### To Run
1818

1919
GCP mocks:
2020

2121
```bash
22-
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-gcp-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.14.0-shaded.jar -serverPort 1080 -logLevel INFO
22+
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-gcp-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.12.0-shaded.jar -serverPort 1080 -logLevel INFO
2323
```
2424

2525
Azure mocks:
2626

2727
```bash
28-
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-azure-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.14.0-shaded.jar -serverPort 1095 -logLevel INFO
28+
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-azure-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.12.0-shaded.jar -serverPort 1095 -logLevel INFO
2929
```
3030

3131
Okta mocks:
3232

3333
```bash
34-
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-okta-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.14.0-shaded.jar -serverPort 1090 -logLevel INFO
34+
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-okta-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.12.0-shaded.jar -serverPort 1090 -logLevel INFO
3535
```
3636

3737
AWS mocks:
3838

3939
```bash
40-
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-aws-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.14.0-shaded.jar -serverPort 1091 -logLevel INFO
40+
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-aws-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.12.0-shaded.jar -serverPort 1091 -logLevel INFO
4141
```
4242

4343
Github mocks:
4444

4545
```bash
46-
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-github-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.14.0-shaded.jar -serverPort 1093 -logLevel INFO
46+
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-github-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.12.0-shaded.jar -serverPort 1093 -logLevel INFO
4747
```
4848

4949
Sumologic mocks:
5050

5151
```bash
52-
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-sumologic-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.14.0-shaded.jar -serverPort 1096 -logLevel INFO
52+
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-sumologic-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.12.0-shaded.jar -serverPort 1096 -logLevel INFO
5353
```
5454

5555
Digitalocean mocks:
5656

5757
```bash
58-
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-digitalocean-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.14.0-shaded.jar -serverPort 1097 -logLevel INFO
58+
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-digitalocean-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.12.0-shaded.jar -serverPort 1097 -logLevel INFO
5959
```
6060

6161
`googleadmin` mocks:
6262

6363
```bash
64-
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-google-admin-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.14.0-shaded.jar -serverPort 1098 -logLevel INFO
64+
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-google-admin-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.12.0-shaded.jar -serverPort 1098 -logLevel INFO
6565
```
6666

6767
stackql auth testing mocks:
6868

6969
```bash
70-
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-auth-testing-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.14.0-shaded.jar -serverPort 1170 -logLevel INFO
70+
java -Dfile.encoding=UTF-8 -Dmockserver.initializationJsonPath=${HOME}/stackql/stackql-devel/test/mockserver/expectations/static-auth-testing-expectations.json -jar ${HOME}/stackql/stackql-devel/test/downloads/mockserver-netty-5.12.0-shaded.jar -serverPort 1170 -logLevel INFO
7171
```
7272

7373
### Expectations from local file

‎test/robot/lib/stackql_context.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,7 +546,7 @@ def get_registry_cfg(url :str, local_root :str, nop_verify :bool) -> dict:
546546
DESCRIBE_GITHUB_REPOS_PAGES = "describe github.repos.pages;"
547547
DESCRIBE_AWS_EC2_INSTANCES = "describe aws.ec2.instances;"
548548
DESCRIBE_AWS_EC2_DEFAULT_KMS_KEY_ID = "describe aws.ec2.ebs_default_kms_key_id;"
549-
MOCKSERVER_JAR = os.path.join(REPOSITORY_ROOT, 'test', 'downloads', 'mockserver-netty-5.14.0-shaded.jar')
549+
MOCKSERVER_JAR = os.path.join(REPOSITORY_ROOT, 'test', 'downloads', 'mockserver-netty-5.12.0-shaded.jar')
550550

551551
JSON_INIT_FILE_PATH_GOOGLE = os.path.join(REPOSITORY_ROOT, 'test', 'mockserver', 'expectations', 'static-gcp-expectations.json')
552552
MOCKSERVER_PORT_GOOGLE = 1080

0 commit comments

Comments
 (0)