Merge pull request mybuilder#101 from mybuilder/fix-travis

Fix travis
dgarlitt · Nov 16, 2017 · 6e37e0e · 6e37e0e
2 parents 7c0567a + 58c78e9
commit 6e37e0e
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 75 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,8 @@ node_js:
 before_install:
     -  docker run -d --name kong-database -e "POSTGRES_USER=kong" -e "POSTGRES_DB=kong"  postgres:9.4
     -  sleep 5
-    -  docker run -d --name kong --link kong-database:kong-database -e "KONG_DATABASE=postgres" -e "KONG_PG_HOST=kong-database" -p 127.0.0.1:8001:8001 -p 127.0.0.1:8000:8000 kong:$KONG_VERSION
+    -  docker run --rm --link kong-database:kong-database -e "KONG_DATABASE=postgres" -e "KONG_PG_HOST=kong-database" kong:latest kong migrations up
+    -  sleep 5
+    -  docker run -d --name kong --link kong-database:kong-database -e "KONG_DATABASE=postgres" -e "KONG_PG_HOST=kong-database" -e "KONG_PROXY_ACCESS_LOG=/dev/stdout" -e "KONG_ADMIN_ACCESS_LOG=/dev/stdout" -e "KONG_PROXY_ERROR_LOG=/dev/stderr" -e "KONG_ADMIN_ERROR_LOG=/dev/stderr" -p 127.0.0.1:8001:8001 -p 127.0.0.1:8000:8000 kong:$KONG_VERSION
     -  sleep 5
     -  curl localhost:8001
diff --git a/examples/consumer.example.md b/examples/consumer.example.md
@@ -36,8 +36,8 @@ HTTP 201 Created
 
 ```
 {
-  "username": "iphone-app",
   "created_at": "___created_at___",
+  "username": "iphone-app",
   "id": "2b47ba9b-761a-492d-9a0c-000000000001"
 }
 ```
@@ -56,10 +56,10 @@ HTTP 201 Created
 
 ```
 {
+  "id": "2b47ba9b-761a-492d-9a0c-000000000002",
   "created_at": "___created_at___",
-  "consumer_id": "2b47ba9b-761a-492d-9a0c-000000000001",
   "key": "very-secret-key",
-  "id": "2b47ba9b-761a-492d-9a0c-000000000002"
+  "consumer_id": "2b47ba9b-761a-492d-9a0c-000000000001"
 }
 ```
 
@@ -78,8 +78,8 @@ HTTP 201 Created
 ```
 {
   "group": "foo-group",
-  "consumer_id": "2b47ba9b-761a-492d-9a0c-000000000001",
   "created_at": "___created_at___",
-  "id": "2b47ba9b-761a-492d-9a0c-000000000003"
+  "id": "2b47ba9b-761a-492d-9a0c-000000000003",
+  "consumer_id": "2b47ba9b-761a-492d-9a0c-000000000001"
 }
 ```
diff --git a/examples/global-plugin.example.md b/examples/global-plugin.example.md
@@ -32,14 +32,14 @@ HTTP 201 Created
 
 ```
 {
-  "id": "2b47ba9b-761a-492d-9a0c-000000000001",
   "created_at": "___created_at___",
-  "enabled": true,
-  "name": "cors",
   "config": {
     "credentials": false,
-    "preflight_continue": false,
-    "max_age": 7000
-  }
+    "max_age": 7000,
+    "preflight_continue": false
+  },
+  "id": "2b47ba9b-761a-492d-9a0c-000000000001",
+  "enabled": true,
+  "name": "cors"
 }
 ```
diff --git a/examples/key-auth.example.md b/examples/key-auth.example.md
@@ -47,8 +47,8 @@ HTTP 201 Created
 
 ```
 {
-  "username": "iphone-app",
   "created_at": "___created_at___",
+  "username": "iphone-app",
   "id": "2b47ba9b-761a-492d-9a0c-000000000001"
 }
 ```
@@ -67,10 +67,10 @@ HTTP 201 Created
 
 ```
 {
+  "id": "2b47ba9b-761a-492d-9a0c-000000000002",
   "created_at": "___created_at___",
-  "consumer_id": "2b47ba9b-761a-492d-9a0c-000000000001",
   "key": "very-secret-key",
-  "id": "2b47ba9b-761a-492d-9a0c-000000000002"
+  "consumer_id": "2b47ba9b-761a-492d-9a0c-000000000001"
 }
 ```
 
@@ -88,21 +88,21 @@ HTTP 201 Created
 
 ```
 {
-  "http_if_terminated": true,
-  "id": "2b47ba9b-761a-492d-9a0c-000000000003",
-  "retries": 5,
-  "preserve_host": false,
   "created_at": "___created_at___",
-  "upstream_connect_timeout": 60000,
-  "upstream_url": "http://mockbin.com",
-  "upstream_read_timeout": 60000,
-  "https_only": false,
-  "upstream_send_timeout": 60000,
   "strip_uri": true,
-  "name": "mockbin",
+  "id": "2b47ba9b-761a-492d-9a0c-000000000003",
   "hosts": [
     "mockbin.com"
-  ]
+  ],
+  "name": "mockbin",
+  "http_if_terminated": false,
+  "preserve_host": false,
+  "upstream_url": "http://mockbin.com",
+  "upstream_connect_timeout": 60000,
+  "upstream_send_timeout": 60000,
+  "upstream_read_timeout": 60000,
+  "retries": 5,
+  "https_only": false
 }
 ```
 
@@ -120,18 +120,19 @@ HTTP 201 Created
 
 ```
 {
-  "api_id": "2b47ba9b-761a-492d-9a0c-000000000003",
-  "id": "2b47ba9b-761a-492d-9a0c-000000000004",
   "created_at": "___created_at___",
-  "enabled": true,
-  "name": "key-auth",
   "config": {
-    "hide_credentials": false,
-    "anonymous": "",
     "key_names": [
       "very-secret-key"
     ],
-    "key_in_body": false
-  }
+    "key_in_body": false,
+    "anonymous": "",
+    "run_on_preflight": true,
+    "hide_credentials": false
+  },
+  "id": "2b47ba9b-761a-492d-9a0c-000000000004",
+  "name": "key-auth",
+  "api_id": "2b47ba9b-761a-492d-9a0c-000000000003",
+  "enabled": true
 }
 ```
diff --git a/examples/simple-api.example.md b/examples/simple-api.example.md
@@ -32,20 +32,20 @@ HTTP 201 Created
 
 ```
 {
-  "http_if_terminated": true,
-  "id": "2b47ba9b-761a-492d-9a0c-000000000001",
-  "retries": 5,
-  "preserve_host": false,
   "created_at": "___created_at___",
-  "upstream_connect_timeout": 60000,
-  "upstream_url": "http://mockbin.com",
-  "upstream_read_timeout": 60000,
-  "https_only": false,
-  "upstream_send_timeout": 60000,
   "strip_uri": true,
-  "name": "mockbin",
+  "id": "2b47ba9b-761a-492d-9a0c-000000000001",
   "hosts": [
     "mockbin.com"
-  ]
+  ],
+  "name": "mockbin",
+  "http_if_terminated": false,
+  "preserve_host": false,
+  "upstream_url": "http://mockbin.com",
+  "upstream_connect_timeout": 60000,
+  "upstream_send_timeout": 60000,
+  "upstream_read_timeout": 60000,
+  "retries": 5,
+  "https_only": false
 }
 ```
diff --git a/test-integration/__snapshots__/api.test.js.snap b/test-integration/__snapshots__/api.test.js.snap
@@ -30,7 +30,7 @@ Array [
       "hosts": Array [
         "mockbin.com",
       ],
-      "http_if_terminated": true,
+      "http_if_terminated": false,
       "https_only": false,
       "id": "2b47ba9b-761a-492d-9a0c-000000000001",
       "name": "mockbin",
@@ -95,6 +95,7 @@ Array [
         "key_names": Array [
           "foobar",
         ],
+        "run_on_preflight": true,
       },
       "created_at": "___created_at___",
       "enabled": true,
@@ -137,11 +138,12 @@ exports[`API plugins should add mockbin API with a plugins 2`] = `
         attributes:
           enabled: true
           config:
-            hide_credentials: false
-            anonymous: ''
             key_names:
               - foobar
             key_in_body: false
+            anonymous: ''
+            run_on_preflight: true
+            hide_credentials: false
     attributes:
       hosts:
         - mockbin.com
@@ -153,7 +155,7 @@ exports[`API plugins should add mockbin API with a plugins 2`] = `
       upstream_read_timeout: 60000
       upstream_send_timeout: 60000
       https_only: false
-      http_if_terminated: true
+      http_if_terminated: false
 consumers: []
 plugins: []
 "
@@ -189,7 +191,7 @@ Array [
       "hosts": Array [
         "mockbin.com",
       ],
-      "http_if_terminated": true,
+      "http_if_terminated": false,
       "https_only": false,
       "id": "2b47ba9b-761a-492d-9a0c-000000000001",
       "name": "mockbin",
@@ -254,6 +256,7 @@ Array [
         "key_names": Array [
           "foobar",
         ],
+        "run_on_preflight": true,
       },
       "created_at": "___created_at___",
       "enabled": true,
@@ -371,7 +374,7 @@ exports[`API plugins should remove mockbin api plugin 2`] = `
       upstream_read_timeout: 60000
       upstream_send_timeout: 60000
       https_only: false
-      http_if_terminated: true
+      http_if_terminated: false
 consumers: []
 plugins: []
 "
@@ -407,7 +410,7 @@ Array [
       "hosts": Array [
         "mockbin.com",
       ],
-      "http_if_terminated": true,
+      "http_if_terminated": false,
       "https_only": false,
       "id": "2b47ba9b-761a-492d-9a0c-000000000001",
       "name": "mockbin",
@@ -472,6 +475,7 @@ Array [
         "key_names": Array [
           "foobar",
         ],
+        "run_on_preflight": true,
       },
       "created_at": "___created_at___",
       "enabled": true,
@@ -570,6 +574,7 @@ Array [
         "key_names": Array [
           "foobar",
         ],
+        "run_on_preflight": true,
       },
       "created_at": "___created_at___",
       "enabled": false,
@@ -612,11 +617,12 @@ exports[`API plugins should update mockbin api plugin 2`] = `
         attributes:
           enabled: false
           config:
-            hide_credentials: false
-            anonymous: ''
             key_names:
               - foobar
             key_in_body: false
+            anonymous: ''
+            run_on_preflight: true
+            hide_credentials: false
     attributes:
       hosts:
         - mockbin.com
@@ -628,7 +634,7 @@ exports[`API plugins should update mockbin api plugin 2`] = `
       upstream_read_timeout: 60000
       upstream_send_timeout: 60000
       https_only: false
-      http_if_terminated: true
+      http_if_terminated: false
 consumers: []
 plugins: []
 "
@@ -664,7 +670,7 @@ Array [
       "hosts": Array [
         "mockbin.com",
       ],
-      "http_if_terminated": true,
+      "http_if_terminated": false,
       "https_only": false,
       "id": "2b47ba9b-761a-492d-9a0c-000000000001",
       "name": "mockbin",
@@ -714,7 +720,7 @@ exports[`API should add the API 2`] = `
       upstream_read_timeout: 60000
       upstream_send_timeout: 60000
       https_only: false
-      http_if_terminated: true
+      http_if_terminated: false
 consumers: []
 plugins: []
 "
@@ -750,7 +756,7 @@ Array [
       "hosts": Array [
         "mockbin.com",
       ],
-      "http_if_terminated": true,
+      "http_if_terminated": false,
       "https_only": false,
       "id": "2b47ba9b-761a-492d-9a0c-000000000001",
       "name": "mockbin",
@@ -821,7 +827,7 @@ exports[`API should not update if already up to date 2`] = `
       upstream_read_timeout: 60000
       upstream_send_timeout: 60000
       https_only: false
-      http_if_terminated: true
+      http_if_terminated: false
 consumers: []
 plugins: []
 "
@@ -857,7 +863,7 @@ Array [
       "hosts": Array [
         "mockbin.com",
       ],
-      "http_if_terminated": true,
+      "http_if_terminated": false,
       "https_only": false,
       "id": "2b47ba9b-761a-492d-9a0c-000000000001",
       "name": "mockbin",
@@ -965,7 +971,7 @@ Array [
       "hosts": Array [
         "mockbin.com",
       ],
-      "http_if_terminated": true,
+      "http_if_terminated": false,
       "https_only": false,
       "id": "2b47ba9b-761a-492d-9a0c-000000000001",
       "name": "mockbin",
@@ -1028,7 +1034,7 @@ Array [
       "hosts": Array [
         "mockbin.com",
       ],
-      "http_if_terminated": true,
+      "http_if_terminated": false,
       "https_only": false,
       "id": "2b47ba9b-761a-492d-9a0c-000000000001",
       "name": "mockbin",
@@ -1081,7 +1087,7 @@ exports[`API should update the api 2`] = `
       upstream_read_timeout: 60000
       upstream_send_timeout: 60000
       https_only: false
-      http_if_terminated: true
+      http_if_terminated: false
 consumers: []
 plugins: []
 "

diff --git a/test-integration/__snapshots__/bugs.test.js.snap b/test-integration/__snapshots__/bugs.test.js.snap
@@ -83,7 +83,7 @@ plugins:
     attributes:
       enabled: true
       config:
-        preflight_continue: false
         credentials: false
+        preflight_continue: false
 "
 `;