From 4bf5ad3219885a1239726d9ff281fde4014f0dba Mon Sep 17 00:00:00 2001 From: Sarvani Vakkalanka Date: Wed, 22 Feb 2017 09:57:19 -0800 Subject: [PATCH 1/7] Deprecate x-security --- test/bookstore/swagger.json | 199 ++++++++------------------- test/bookstore/swagger_template.json | 199 ++++++++------------------- test/echo/echo.json | 45 ++---- test/echo/swagger.json | 21 +-- 4 files changed, 130 insertions(+), 334 deletions(-) diff --git a/test/bookstore/swagger.json b/test/bookstore/swagger.json index f5f4ec66c..396943ca9 100644 --- a/test/bookstore/swagger.json +++ b/test/bookstore/swagger.json @@ -91,23 +91,15 @@ "description": "get message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences":[] - } + "test_jwk": [] }, { - "test_x509": { - "audiences":[] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.echo.audience" - ] - } + "test_symmetric": [] } ] }, @@ -122,23 +114,15 @@ "description": "post message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences":[] - } + "test_jwk": [] }, { - "test_x509": { - "audiences":[] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.echo.audience" - ] - } + "test_symmetric": [] } ] } @@ -185,52 +169,27 @@ } } }, - "x-security": [ - { - "google_id_token": { - "audiences": [ - "848149964201.apps.googleusercontent.com", - "841077041629.apps.googleusercontent.com", - "488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com", - "488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" - ] - } + "security": [ + { + "google_id_token": [] }, { - "google_identity_toolkit": { - "audiences": [] - } + "google_identity_toolkit": [] }, { - "auth0_symmetric": { - "audiences": [ - "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" - ] - } + "auth0_symmetric": [] }, { - "auth0_jwk": { - "audiences": [ - "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" - ] - } + "auth0_jwk": [] }, { - "test_jwk": { - "audiences": [] - } + "test_jwk": [] }, { - "test_x509": { - "audiences": [] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.esp.audience" - ] - } + "test_symmetric": [] } ] } @@ -260,55 +219,27 @@ } } }, - "security": [], - "x-security": [ - { - "google_id_token": { - "audiences": [ - "848149964201.apps.googleusercontent.com", - "841077041629.apps.googleusercontent.com", - "488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com", - "488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" - ] - } + "security": [ + { + "google_id_token": [] }, { - "google_identity_toolkit": { - "audiences": [ - "esp-test-client" - ] - } + "google_identity_toolkit": [] }, { - "auth0_symmetric": { - "audiences": [ - "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" - ] - } + "auth0_symmetric": [] }, { - "auth0_jwk": { - "audiences": [ - "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" - ] - } + "auth0_jwk": [] }, { - "test_jwk": { - "audiences": [] - } + "test_jwk": [] }, { - "test_x509": { - "audiences": [] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.esp.audience" - ] - } + "test_symmetric": [] } ] }, @@ -426,54 +357,27 @@ } } }, - "x-security": [ - { - "google_id_token": { - "audiences": [ - "848149964201.apps.googleusercontent.com", - "841077041629.apps.googleusercontent.com", - "488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com", - "488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" - ] - } + "security": [ + { + "google_id_token": [] }, { - "google_identity_toolkit": { - "audiences": [ - "esp-test-client" - ] - } + "google_identity_toolkit": [] }, { - "auth0_symmetric": { - "audiences": [ - "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" - ] - } + "auth0_symmetric": [] }, { - "auth0_jwk": { - "audiences": [ - "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" - ] - } + "auth0_jwk": [] }, { - "test_jwk": { - "audiences": [] - } + "test_jwk": [] }, { - "test_x509": { - "audiences": [] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.esp.audience" - ] - } + "test_symmetric": [] } ] }, @@ -608,50 +512,55 @@ "authorizationUrl": "https://esp-jwk.auth0.com/authorize", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://esp-jwk.auth0.com/", - "x-jwks_uri": "https://esp-jwk.auth0.com/.well-known/jwks.json" + "x-google-issuer": "https://esp-jwk.auth0.com/", + "x-google-jwks_uri": "https://esp-jwk.auth0.com/.well-known/jwks.json", + "x-google-audiences": "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" }, "auth0_symmetric": { "authorizationUrl": "https://esp-symmetric.auth0.com/authorize", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://esp-symmetric.auth0.com/", - "x-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-https_esp-symmetric_auth0_com" + "x-google-issuer": "https://esp-symmetric.auth0.com/", + "x-google-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-https_esp-symmetric_auth0_com", + "x-google-audiences" : "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" }, "google_id_token": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://accounts.google.com", - "x-jwks_uri": "https://www.googleapis.com/oauth2/v1/certs" + "x-google-issuer": "https://accounts.google.com", + "x-google-jwks_uri": "https://www.googleapis.com/oauth2/v1/certs", + "x-google-audiences": "848149964201.apps.googleusercontent.com, 841077041629.apps.googleusercontent.com, 488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com, 488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" }, "google_identity_toolkit": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://securetoken.google.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/securetoken@system.gserviceaccount.com" + "x-google-issuer": "https://securetoken.google.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/securetoken@system.gserviceaccount.com", + "x-google-audiences": "esp-test-client" }, "test_jwk": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com" + "x-google-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com" }, "test_symmetric": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://test.esp.client", - "x-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_esp_client" + "x-google-issuer": "https://test.esp.client", + "x-google-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_esp_client", + "x-google-audiences": "test.echo.audience, test.esp.audience" }, "test_x509": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com" + "x-google-issuer": "23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com" } } } diff --git a/test/bookstore/swagger_template.json b/test/bookstore/swagger_template.json index 95213693b..4b1d33e93 100644 --- a/test/bookstore/swagger_template.json +++ b/test/bookstore/swagger_template.json @@ -91,23 +91,15 @@ "description": "get message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences":[] - } + "test_jwk": [] }, { - "test_x509": { - "audiences":[] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.echo.audience" - ] - } + "test_symmetric": [] } ] }, @@ -122,23 +114,15 @@ "description": "post message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences":[] - } + "test_jwk": [] }, { - "test_x509": { - "audiences":[] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.echo.audience" - ] - } + "test_symmetric": [] } ] } @@ -185,52 +169,27 @@ } } }, - "x-security": [ - { - "google_id_token": { - "audiences": [ - "848149964201.apps.googleusercontent.com", - "841077041629.apps.googleusercontent.com", - "488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com", - "488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" - ] - } + "security": [ + { + "google_id_token": [] }, { - "google_identity_toolkit": { - "audiences": [] - } + "google_identity_toolkit": [] }, { - "auth0_symmetric": { - "audiences": [ - "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" - ] - } + "auth0_symmetric": [] }, { - "auth0_jwk": { - "audiences": [ - "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" - ] - } + "auth0_jwk": [] }, { - "test_jwk": { - "audiences": [] - } + "test_jwk": [] }, { - "test_x509": { - "audiences": [] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.esp.audience" - ] - } + "test_symmetric": [] } ] } @@ -260,55 +219,27 @@ } } }, - "security": [], - "x-security": [ - { - "google_id_token": { - "audiences": [ - "848149964201.apps.googleusercontent.com", - "841077041629.apps.googleusercontent.com", - "488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com", - "488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" - ] - } + "security": [ + { + "google_id_token": [] }, { - "google_identity_toolkit": { - "audiences": [ - "esp-test-client" - ] - } + "google_identity_toolkit": [] }, { - "auth0_symmetric": { - "audiences": [ - "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" - ] - } + "auth0_symmetric": [] }, { - "auth0_jwk": { - "audiences": [ - "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" - ] - } + "auth0_jwk": [] }, { - "test_jwk": { - "audiences": [] - } + "test_jwk": [] }, { - "test_x509": { - "audiences": [] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.esp.audience" - ] - } + "test_symmetric": [] } ] }, @@ -426,54 +357,27 @@ } } }, - "x-security": [ - { - "google_id_token": { - "audiences": [ - "848149964201.apps.googleusercontent.com", - "841077041629.apps.googleusercontent.com", - "488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com", - "488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" - ] - } + "security": [ + { + "google_id_token": [] }, { - "google_identity_toolkit": { - "audiences": [ - "esp-test-client" - ] - } + "google_identity_toolkit": [] }, { - "auth0_symmetric": { - "audiences": [ - "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" - ] - } + "auth0_symmetric": [] }, { - "auth0_jwk": { - "audiences": [ - "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" - ] - } + "auth0_jwk": [] }, { - "test_jwk": { - "audiences": [] - } + "test_jwk": [] }, { - "test_x509": { - "audiences": [] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.esp.audience" - ] - } + "test_symmetric": [] } ] }, @@ -608,50 +512,55 @@ "authorizationUrl": "https://esp-jwk.auth0.com/authorize", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://esp-jwk.auth0.com/", - "x-jwks_uri": "https://esp-jwk.auth0.com/.well-known/jwks.json" + "x-google-issuer": "https://esp-jwk.auth0.com/", + "x-google-jwks_uri": "https://esp-jwk.auth0.com/.well-known/jwks.json", + "x-google-audiences": "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" }, "auth0_symmetric": { "authorizationUrl": "https://esp-symmetric.auth0.com/authorize", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://esp-symmetric.auth0.com/", - "x-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-https_esp-symmetric_auth0_com" + "x-google-issuer": "https://esp-symmetric.auth0.com/", + "x-google-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-https_esp-symmetric_auth0_com", + "x-google-audiences": "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" }, "google_id_token": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://accounts.google.com", - "x-jwks_uri": "https://www.googleapis.com/oauth2/v1/certs" + "x-google-issuer": "https://accounts.google.com", + "x-google-jwks_uri": "https://www.googleapis.com/oauth2/v1/certs", + "x-google-audiences": "848149964201.apps.googleusercontent.com, 841077041629.apps.googleusercontent.com, 488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com, 488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" }, "google_identity_toolkit": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://securetoken.google.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/securetoken@system.gserviceaccount.com" + "x-google-issuer": "https://securetoken.google.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/securetoken@system.gserviceaccount.com", + "x-google-audiences": "esp-test-client" }, "test_jwk": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com" + "x-google-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com" }, "test_symmetric": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://test.esp.client", - "x-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_esp_client" + "x-google-issuer": "https://test.esp.client", + "x-google-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_esp_client", + "x-google-audiences": "test.echo.audience, test.esp.audience" }, "test_x509": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com" + "x-google-issuer": "23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com" } } } diff --git a/test/echo/echo.json b/test/echo/echo.json index 1bcf5e4e3..4c472f6dc 100644 --- a/test/echo/echo.json +++ b/test/echo/echo.json @@ -16,22 +16,23 @@ "type": "oauth2", "authorizationUrl": "", "flow": "implicit", - "x-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com" + "x-google-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com" }, "test_x509": { "type": "oauth2", "authorizationUrl": "", "flow": "implicit", - "x-issuer": "account-1@esp-echo.iam.gserviceaccount.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/account-1@esp-echo.iam.gserviceaccount.com" + "x-google-issuer": "account-1@esp-echo.iam.gserviceaccount.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/account-1@esp-echo.iam.gserviceaccount.com" }, "test_symmetric": { "type": "oauth2", "authorizationUrl": "", "flow": "implicit", - "x-issuer": "https://test.echo.client", - "x-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_echo_client" + "x-google-issuer": "https://test.echo.client", + "x-google-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_echo_client", + "x-google-audiences": "test.echo.audience" } }, "security": [ @@ -124,23 +125,15 @@ "description": "get message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences":[] - } + "test_jwk": [] }, { - "test_x509": { - "audiences":[] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.echo.audience" - ] - } + "test_symmetric": [] } ] }, @@ -155,23 +148,15 @@ "description": "post message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences":[] - } + "test_jwk": [] }, { - "test_x509": { - "audiences":[] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.echo.audience" - ] - } + "test_symmetric": [] } ] } diff --git a/test/echo/swagger.json b/test/echo/swagger.json index 8bb863fae..7a189b237 100644 --- a/test/echo/swagger.json +++ b/test/echo/swagger.json @@ -91,13 +91,9 @@ "description": "get message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences": [ - "echo-${MY_PROJECT_ID}.appspot.com" - ] - } + "test_jwk": [] } ] }, @@ -112,13 +108,9 @@ "description": "post message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences":[ - "echo-${MY_PROJECT_ID}.appspot.com" - ] - } + "test_jwk": [] } ] } @@ -169,8 +161,9 @@ "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com" + "x-google-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com", + "x-google-audiences": "echo-${MY_PROJECT_ID}.appspot.com" } } } From 202f221d4b616c65a83b4936634446bf913f027f Mon Sep 17 00:00:00 2001 From: Sarvani Vakkalanka Date: Wed, 22 Feb 2017 10:19:55 -0800 Subject: [PATCH 2/7] Add one more swagger file --- .../example/bookstore_swagger_template.json | 199 +++++------------- 1 file changed, 55 insertions(+), 144 deletions(-) diff --git a/tools/src/deploy/example/bookstore_swagger_template.json b/tools/src/deploy/example/bookstore_swagger_template.json index 0577999f4..57c7e4e2e 100644 --- a/tools/src/deploy/example/bookstore_swagger_template.json +++ b/tools/src/deploy/example/bookstore_swagger_template.json @@ -91,23 +91,15 @@ "description": "get message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences":[] - } + "test_jwk": [] }, { - "test_x509": { - "audiences":[] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.echo.audience" - ] - } + "test_symmetric": [] } ] }, @@ -122,23 +114,15 @@ "description": "post message response" } }, - "x-security": [ + "security": [ { - "test_jwk": { - "audiences":[] - } + "test_jwk": [] }, { - "test_x509": { - "audiences":[] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.echo.audience" - ] - } + "test_symmetric": [] } ] } @@ -185,52 +169,27 @@ } } }, - "x-security": [ - { - "google_id_token": { - "audiences": [ - "848149964201.apps.googleusercontent.com", - "841077041629.apps.googleusercontent.com", - "488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com", - "488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" - ] - } + "security": [ + { + "google_id_token": [] }, { - "google_identity_toolkit": { - "audiences": [] - } + "google_identity_toolkit": [] }, { - "auth0_symmetric": { - "audiences": [ - "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" - ] - } + "auth0_symmetric": [] }, { - "auth0_jwk": { - "audiences": [ - "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" - ] - } + "auth0_jwk": [] }, { - "test_jwk": { - "audiences": [] - } + "test_jwk": [] }, { - "test_x509": { - "audiences": [] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.esp.audience" - ] - } + "test_symmetric": [] } ] } @@ -261,54 +220,27 @@ } }, "security": [], - "x-security": [ - { - "google_id_token": { - "audiences": [ - "848149964201.apps.googleusercontent.com", - "841077041629.apps.googleusercontent.com", - "488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com", - "488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" - ] - } + "security": [ + { + "google_id_token": [] }, { - "google_identity_toolkit": { - "audiences": [ - "esp-test-client" - ] - } + "google_identity_toolkit": [] }, { - "auth0_symmetric": { - "audiences": [ - "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" - ] - } + "auth0_symmetric": [] }, { - "auth0_jwk": { - "audiences": [ - "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" - ] - } + "auth0_jwk": [] }, { - "test_jwk": { - "audiences": [] - } + "test_jwk": [] }, { - "test_x509": { - "audiences": [] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.esp.audience" - ] - } + "test_symmetric": [] } ] }, @@ -426,54 +358,27 @@ } } }, - "x-security": [ - { - "google_id_token": { - "audiences": [ - "848149964201.apps.googleusercontent.com", - "841077041629.apps.googleusercontent.com", - "488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com", - "488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" - ] - } + "security": [ + { + "google_id_token": [] }, { - "google_identity_toolkit": { - "audiences": [ - "esp-test-client" - ] - } + "google_identity_toolkit": [] }, { - "auth0_symmetric": { - "audiences": [ - "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" - ] - } + "auth0_symmetric": [] }, { - "auth0_jwk": { - "audiences": [ - "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" - ] - } + "auth0_jwk": [] }, { - "test_jwk": { - "audiences": [] - } + "test_jwk": [] }, { - "test_x509": { - "audiences": [] - } + "test_x509": [] }, { - "test_symmetric": { - "audiences": [ - "test.esp.audience" - ] - } + "test_symmetric": [] } ] }, @@ -608,50 +513,56 @@ "authorizationUrl": "https://esp-jwk.auth0.com/authorize", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://esp-jwk.auth0.com/", - "x-jwks_uri": "https://esp-jwk.auth0.com/.well-known/jwks.json" + "x-google-issuer": "https://esp-jwk.auth0.com/", + "x-google-jwks_uri": "https://esp-jwk.auth0.com/.well-known/jwks.json", + "x-google-audiences": "Uuts8fJWf1yieO9Ocv0Uk6LBqsUTePQq" }, "auth0_symmetric": { "authorizationUrl": "https://esp-symmetric.auth0.com/authorize", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://esp-symmetric.auth0.com/", - "x-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-https_esp-symmetric_auth0_com" + "x-google-issuer": "https://esp-symmetric.auth0.com/", + "x-google-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-https_esp-symmetric_auth0_com", + "x-google-audiences": "sI0N2qOcfYoizZtstfnkEbsUWt6bluT0" }, "google_id_token": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://accounts.google.com", - "x-jwks_uri": "https://www.googleapis.com/oauth2/v1/certs" + "x-google-issuer": "https://accounts.google.com", + "x-google-jwks_uri": "https://www.googleapis.com/oauth2/v1/certs", + "x-google-audiences": "848149964201.apps.googleusercontent.com, 841077041629.apps.googleusercontent.com, 488010225785-g97tab3t7jdj51fr8vbqvmh4bfic3g5k.apps.googleusercontent.com, 488010225785-qvp4qbiak296t4afcej35dh4maoufmhc.apps.googleusercontent.com" + }, "google_identity_toolkit": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://securetoken.google.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/securetoken@system.gserviceaccount.com" + "x-google-issuer": "https://securetoken.google.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/securetoken@system.gserviceaccount.com", + "x-google-audiences": "esp-test-client" }, "test_jwk": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com" + "x-google-issuer": "loadtest@esp-test-client.iam.gserviceaccount.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/jwk/loadtest@esp-test-client.iam.gserviceaccount.com" }, "test_symmetric": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "https://test.esp.client", - "x-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_esp_client" + "x-google-issuer": "https://test.esp.client", + "x-google-jwks_uri": "http://169.254.169.254/computeMetadata/v1/project/attributes/auth-key-test_esp_client", + "x-google-audiences": "test.echo.audience, test.esp.audience" }, "test_x509": { "authorizationUrl": "", "flow": "implicit", "type": "oauth2", - "x-issuer": "23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com", - "x-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com" + "x-google-issuer": "23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com", + "x-google-jwks_uri": "https://www.googleapis.com/service_accounts/v1/metadata/x509/23028304136-fbju1j1cdfpc5q9q6s23gm56trn0c9ti@developer.gserviceaccount.com" } } } From 2589a637a60f3f70e0f6475c90323e1661ccea2a Mon Sep 17 00:00:00 2001 From: Sarvani Vakkalanka Date: Wed, 22 Feb 2017 10:30:11 -0800 Subject: [PATCH 3/7] Update swagger.yaml file also. --- doc/k8s/swagger.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/doc/k8s/swagger.yaml b/doc/k8s/swagger.yaml index c893987ab..ecf0b23b5 100644 --- a/doc/k8s/swagger.yaml +++ b/doc/k8s/swagger.yaml @@ -65,12 +65,8 @@ paths: description: "Authenication info." schema: $ref: "#/definitions/authInfoResponse" - x-security: - - google_jwt: - audiences: - # This must match the "aud" field in the JWT. You can add multiple - # audiences to accept JWTs from multiple clients. - - "echo.endpoints.sample.google.com" + security: + - google_jwt: [] "/auth/info/googleidtoken": get: description: "Returns the requests' authentication information." @@ -82,12 +78,8 @@ paths: description: "Authenication info." schema: $ref: "#/definitions/authInfoResponse" - x-security: - - google_id_token: - audiences: - # Your OAuth2 client's Client ID must be added here. You can add - # multiple client IDs to accept tokens from multiple clients. - - "YOUR-CLIENT-ID" + security: + - google_id_token: [] definitions: echoMessage: properties: @@ -116,9 +108,13 @@ securityDefinitions: flow: "implicit" type: "oauth2" # This must match the 'iss' field in the JWT. - x-issuer: "jwt-client.endpoints.sample.google.com" + x-google-issuer: "jwt-client.endpoints.sample.google.com" # Update this with your service account's email address. - x-jwks_uri: "https://www.googleapis.com/service_accounts/v1/jwk/YOUR-SERVICE-ACCOUNT-EMAIL" + x-google-jwks_uri: "https://www.googleapis.com/service_accounts/v1/jwk/YOUR-SERVICE-ACCOUNT-EMAIL" + x-google-audiences: + # This must match the "aud" field in the JWT. You can add multiple + # audiences to accept JWTs from multiple clients. + - "echo.endpoints.sample.google.com" # This section configures authentication using Google OAuth2 ID Tokens. # ID Tokens can be obtained using OAuth2 clients, and can be used to access # your API on behalf of a particular user. @@ -126,5 +122,9 @@ securityDefinitions: authorizationUrl: "" flow: "implicit" type: "oauth2" - x-issuer: "accounts.google.com" - x-jwks_uri: "https://www.googleapis.com/oauth2/v1/certs" + x-google-issuer: "accounts.google.com" + x-google-jwks_uri: "https://www.googleapis.com/oauth2/v1/certs" + x-google-audiences: + # Your OAuth2 client's Client ID must be added here. You can add + # multiple client IDs to accept tokens from multiple clients. + - "YOUR-CLIENT-ID" From 831ac333c753e9529c2ddec7247b359fbac7f1df Mon Sep 17 00:00:00 2001 From: Sarvani Vakkalanka Date: Wed, 22 Feb 2017 14:18:57 -0800 Subject: [PATCH 4/7] Fix api_key --- doc/k8s/swagger.yaml | 2 ++ test/bookstore/swagger.json | 25 ++++++++++++++---- test/bookstore/swagger_template.json | 25 ++++++++++++++---- test/echo/echo.json | 10 +++++-- test/echo/swagger.json | 10 +++++-- .../example/bookstore_swagger_template.json | 26 ++++++++++++++----- 6 files changed, 78 insertions(+), 20 deletions(-) diff --git a/doc/k8s/swagger.yaml b/doc/k8s/swagger.yaml index ecf0b23b5..a340671df 100644 --- a/doc/k8s/swagger.yaml +++ b/doc/k8s/swagger.yaml @@ -67,6 +67,7 @@ paths: $ref: "#/definitions/authInfoResponse" security: - google_jwt: [] + - api_key: [] "/auth/info/googleidtoken": get: description: "Returns the requests' authentication information." @@ -80,6 +81,7 @@ paths: $ref: "#/definitions/authInfoResponse" security: - google_id_token: [] + - api_key: [] definitions: echoMessage: properties: diff --git a/test/bookstore/swagger.json b/test/bookstore/swagger.json index 396943ca9..610eb2ba0 100644 --- a/test/bookstore/swagger.json +++ b/test/bookstore/swagger.json @@ -100,7 +100,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "post": { @@ -123,7 +126,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] } }, @@ -190,7 +196,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] } }, @@ -240,7 +249,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "delete": { @@ -378,7 +390,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "delete": { diff --git a/test/bookstore/swagger_template.json b/test/bookstore/swagger_template.json index 4b1d33e93..5c8803c7c 100644 --- a/test/bookstore/swagger_template.json +++ b/test/bookstore/swagger_template.json @@ -100,7 +100,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "post": { @@ -123,7 +126,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] } }, @@ -190,7 +196,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] } }, @@ -240,7 +249,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "delete": { @@ -378,7 +390,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "delete": { diff --git a/test/echo/echo.json b/test/echo/echo.json index 4c472f6dc..3b9898092 100644 --- a/test/echo/echo.json +++ b/test/echo/echo.json @@ -134,7 +134,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "post": { @@ -157,7 +160,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] } } diff --git a/test/echo/swagger.json b/test/echo/swagger.json index 7a189b237..fe81ed947 100644 --- a/test/echo/swagger.json +++ b/test/echo/swagger.json @@ -94,7 +94,10 @@ "security": [ { "test_jwk": [] - } + }, + { + "api_key": [] + } ] }, "post": { @@ -111,7 +114,10 @@ "security": [ { "test_jwk": [] - } + }, + { + "api_key": [] + } ] } }, diff --git a/tools/src/deploy/example/bookstore_swagger_template.json b/tools/src/deploy/example/bookstore_swagger_template.json index 57c7e4e2e..6ca81cd4e 100644 --- a/tools/src/deploy/example/bookstore_swagger_template.json +++ b/tools/src/deploy/example/bookstore_swagger_template.json @@ -100,7 +100,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "post": { @@ -123,7 +126,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] } }, @@ -190,7 +196,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] } }, @@ -219,7 +228,6 @@ } } }, - "security": [], "security": [ { "google_id_token": [] @@ -241,7 +249,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "delete": { @@ -379,7 +390,10 @@ }, { "test_symmetric": [] - } + }, + { + "api_key": [] + } ] }, "delete": { From 0de39f90d269e24b975ba5c8cb788eab37b40666 Mon Sep 17 00:00:00 2001 From: Sarvani Vakkalanka Date: Wed, 22 Feb 2017 16:15:30 -0800 Subject: [PATCH 5/7] Fix indentation --- test/bookstore/swagger.json | 30 +++++++++---------- test/bookstore/swagger_template.json | 30 +++++++++---------- test/echo/echo.json | 12 ++++---- test/echo/swagger.json | 12 ++++---- .../example/bookstore_swagger_template.json | 30 +++++++++---------- 5 files changed, 57 insertions(+), 57 deletions(-) diff --git a/test/bookstore/swagger.json b/test/bookstore/swagger.json index 610eb2ba0..d3562b2a0 100644 --- a/test/bookstore/swagger.json +++ b/test/bookstore/swagger.json @@ -101,9 +101,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "post": { @@ -127,9 +127,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] } }, @@ -197,9 +197,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] } }, @@ -250,9 +250,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "delete": { @@ -391,9 +391,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "delete": { diff --git a/test/bookstore/swagger_template.json b/test/bookstore/swagger_template.json index 5c8803c7c..1387b9e87 100644 --- a/test/bookstore/swagger_template.json +++ b/test/bookstore/swagger_template.json @@ -101,9 +101,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "post": { @@ -127,9 +127,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] } }, @@ -197,9 +197,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] } }, @@ -250,9 +250,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "delete": { @@ -391,9 +391,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "delete": { diff --git a/test/echo/echo.json b/test/echo/echo.json index 3b9898092..059243d79 100644 --- a/test/echo/echo.json +++ b/test/echo/echo.json @@ -135,9 +135,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "post": { @@ -161,9 +161,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] } } diff --git a/test/echo/swagger.json b/test/echo/swagger.json index fe81ed947..cc538cd38 100644 --- a/test/echo/swagger.json +++ b/test/echo/swagger.json @@ -95,9 +95,9 @@ { "test_jwk": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "post": { @@ -115,9 +115,9 @@ { "test_jwk": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] } }, diff --git a/tools/src/deploy/example/bookstore_swagger_template.json b/tools/src/deploy/example/bookstore_swagger_template.json index 6ca81cd4e..47a880007 100644 --- a/tools/src/deploy/example/bookstore_swagger_template.json +++ b/tools/src/deploy/example/bookstore_swagger_template.json @@ -101,9 +101,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "post": { @@ -127,9 +127,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] } }, @@ -197,9 +197,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] } }, @@ -250,9 +250,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "delete": { @@ -391,9 +391,9 @@ { "test_symmetric": [] }, - { - "api_key": [] - } + { + "api_key": [] + } ] }, "delete": { From 1b5eeef8c9f7238edacd3bf306904fe292fc7b8d Mon Sep 17 00:00:00 2001 From: Sarvani Vakkalanka Date: Mon, 27 Feb 2017 10:34:43 -0800 Subject: [PATCH 6/7] Update api keys correctly --- doc/k8s/swagger.yaml | 6 +- test/bookstore/swagger.json | 73 ++++++++++--------- test/bookstore/swagger_template.json | 67 +++++++++-------- test/echo/echo.json | 24 +++--- test/echo/swagger.json | 8 +- .../example/bookstore_swagger_template.json | 45 ++++++------ 6 files changed, 114 insertions(+), 109 deletions(-) diff --git a/doc/k8s/swagger.yaml b/doc/k8s/swagger.yaml index a340671df..082d9bc4d 100644 --- a/doc/k8s/swagger.yaml +++ b/doc/k8s/swagger.yaml @@ -66,8 +66,7 @@ paths: schema: $ref: "#/definitions/authInfoResponse" security: - - google_jwt: [] - - api_key: [] + - {google_jwt: [], api_key: []} "/auth/info/googleidtoken": get: description: "Returns the requests' authentication information." @@ -80,8 +79,7 @@ paths: schema: $ref: "#/definitions/authInfoResponse" security: - - google_id_token: [] - - api_key: [] + - {google_id_token: [], api_key: []} definitions: echoMessage: properties: diff --git a/test/bookstore/swagger.json b/test/bookstore/swagger.json index d3562b2a0..0fe4d3fb5 100644 --- a/test/bookstore/swagger.json +++ b/test/bookstore/swagger.json @@ -93,16 +93,16 @@ }, "security": [ { - "test_jwk": [] - }, - { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { - "api_key": [] + "test_symmetric": [], + "api_key": [] } ] }, @@ -119,17 +119,17 @@ }, "security": [ { - "test_jwk": [] - }, - { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { + "test_symmetric": [], "api_key": [] - } + } ] } }, @@ -177,28 +177,32 @@ }, "security": [ { - "google_id_token": [] - }, - { - "google_identity_toolkit": [] + "google_id_token": [], + "api_key": [] }, { - "auth0_symmetric": [] + "google_identity_toolkit": [], + "api_key": [] }, { - "auth0_jwk": [] + "auth0_symmetric": [], + "api_key": [] }, { - "test_jwk": [] + "auth0_jwk": [], + "api_key": [] }, { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { - "api_key": [] + "test_symmetric": [], + "api_key": [] } ] } @@ -249,9 +253,6 @@ }, { "test_symmetric": [] - }, - { - "api_key": [] } ] }, @@ -371,27 +372,31 @@ }, "security": [ { - "google_id_token": [] - }, - { - "google_identity_toolkit": [] + "google_id_token": [], + "api_key": [] }, { - "auth0_symmetric": [] + "google_identity_toolkit": [], + "api_key": [] }, { - "auth0_jwk": [] + "auth0_symmetric": [], + "api_key": [] }, { - "test_jwk": [] + "auth0_jwk": [], + "api_key": [] }, { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { + "test_symmetric": [], "api_key": [] } ] diff --git a/test/bookstore/swagger_template.json b/test/bookstore/swagger_template.json index 1387b9e87..2fc63b4e1 100644 --- a/test/bookstore/swagger_template.json +++ b/test/bookstore/swagger_template.json @@ -93,15 +93,15 @@ }, "security": [ { - "test_jwk": [] - }, - { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { + "test_symmetric": [], "api_key": [] } ] @@ -119,15 +119,15 @@ }, "security": [ { - "test_jwk": [] - }, - { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { + "test_symmetric": [], "api_key": [] } ] @@ -177,27 +177,31 @@ }, "security": [ { - "google_id_token": [] - }, - { - "google_identity_toolkit": [] + "google_id_token": [], + "api_key": [] }, { - "auth0_symmetric": [] + "google_identity_toolkit": [], + "api_key": [] }, { - "auth0_jwk": [] + "auth0_symmetric": [], + "api_key": [] }, { - "test_jwk": [] + "auth0_jwk": [], + "api_key": [] }, { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { + "test_symmetric": [], "api_key": [] } ] @@ -249,9 +253,6 @@ }, { "test_symmetric": [] - }, - { - "api_key": [] } ] }, @@ -371,27 +372,31 @@ }, "security": [ { - "google_id_token": [] - }, - { - "google_identity_toolkit": [] + "google_id_token": [], + "api_key": [] }, { - "auth0_symmetric": [] + "google_identity_toolkit": [], + "api_key": [] }, { - "auth0_jwk": [] + "auth0_symmetric": [], + "api_key": [] }, { - "test_jwk": [] + "auth0_jwk": [], + "api_key": [] }, { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { + "test_symmetric": [], "api_key": [] } ] diff --git a/test/echo/echo.json b/test/echo/echo.json index 059243d79..c9f056947 100644 --- a/test/echo/echo.json +++ b/test/echo/echo.json @@ -127,16 +127,16 @@ }, "security": [ { - "test_jwk": [] + "test_jwk": [], + "api_key": [] }, { - "test_x509": [] + "test_x509": [], + "api_key": [] }, { - "test_symmetric": [] - }, - { - "api_key": [] + "test_symmetric": [], + "api_key": [] } ] }, @@ -153,16 +153,16 @@ }, "security": [ { - "test_jwk": [] - }, - { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { - "api_key": [] + "test_symmetric": [], + "api_key": [] } ] } diff --git a/test/echo/swagger.json b/test/echo/swagger.json index cc538cd38..f66c42522 100644 --- a/test/echo/swagger.json +++ b/test/echo/swagger.json @@ -93,9 +93,7 @@ }, "security": [ { - "test_jwk": [] - }, - { + "test_jwk": [], "api_key": [] } ] @@ -113,9 +111,7 @@ }, "security": [ { - "test_jwk": [] - }, - { + "test_jwk": [], "api_key": [] } ] diff --git a/tools/src/deploy/example/bookstore_swagger_template.json b/tools/src/deploy/example/bookstore_swagger_template.json index 47a880007..a36453ead 100644 --- a/tools/src/deploy/example/bookstore_swagger_template.json +++ b/tools/src/deploy/example/bookstore_swagger_template.json @@ -93,15 +93,15 @@ }, "security": [ { - "test_jwk": [] - }, - { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { + "test_symmetric": [], "api_key": [] } ] @@ -119,15 +119,15 @@ }, "security": [ { - "test_jwk": [] - }, - { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { + "test_symmetric": [], "api_key": [] } ] @@ -177,27 +177,31 @@ }, "security": [ { - "google_id_token": [] - }, - { - "google_identity_toolkit": [] + "google_id_token": [], + "api_key": [] }, { - "auth0_symmetric": [] + "google_identity_toolkit": [], + "api_key": [] }, { - "auth0_jwk": [] + "auth0_symmetric": [], + "api_key": [] }, { - "test_jwk": [] + "auth0_jwk": [], + "api_key": [] }, { - "test_x509": [] + "test_jwk": [], + "api_key": [] }, { - "test_symmetric": [] + "test_x509": [], + "api_key": [] }, { + "test_symmetric": [], "api_key": [] } ] @@ -249,9 +253,6 @@ }, { "test_symmetric": [] - }, - { - "api_key": [] } ] }, From 64cb8a2bbdb8cfaef3982f69ccaf386172a01ab6 Mon Sep 17 00:00:00 2001 From: Sarvani Vakkalanka Date: Mon, 27 Feb 2017 10:43:30 -0800 Subject: [PATCH 7/7] Fix indentation --- test/bookstore/swagger.json | 2 +- test/echo/echo.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/bookstore/swagger.json b/test/bookstore/swagger.json index 0fe4d3fb5..8241b6ec0 100644 --- a/test/bookstore/swagger.json +++ b/test/bookstore/swagger.json @@ -102,7 +102,7 @@ }, { "test_symmetric": [], - "api_key": [] + "api_key": [] } ] }, diff --git a/test/echo/echo.json b/test/echo/echo.json index c9f056947..3cbe6ff73 100644 --- a/test/echo/echo.json +++ b/test/echo/echo.json @@ -128,15 +128,15 @@ "security": [ { "test_jwk": [], - "api_key": [] + "api_key": [] }, { "test_x509": [], - "api_key": [] + "api_key": [] }, { "test_symmetric": [], - "api_key": [] + "api_key": [] } ] }, @@ -154,15 +154,15 @@ "security": [ { "test_jwk": [], - "api_key": [] + "api_key": [] }, { "test_x509": [], - "api_key": [] + "api_key": [] }, { "test_symmetric": [], - "api_key": [] + "api_key": [] } ] }