From 8c18c6463962cffd5eec869f7fa2aff6a6fdbec6 Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Thu, 8 Mar 2018 14:11:15 -0800 Subject: Adding url configuration for endpoint tests URL is now a command line parameter for endpoint tests Issue-ID: AAF-161 Change-Id: I6f740ad5cbbd3c73ee7e9a4556acef360a1aefa5 Signed-off-by: Kiran Kamineni --- sms-service/src/sms/Gopkg.lock | 29 +++++++++++++++++++++++++---- sms-service/src/sms/Gopkg.toml | 6 +++++- sms-service/src/sms/test/loop_test.sh | 27 ++++++++++++++------------- 3 files changed, 44 insertions(+), 18 deletions(-) (limited to 'sms-service/src') diff --git a/sms-service/src/sms/Gopkg.lock b/sms-service/src/sms/Gopkg.lock index b69eb59..02e2de6 100644 --- a/sms-service/src/sms/Gopkg.lock +++ b/sms-service/src/sms/Gopkg.lock @@ -77,10 +77,11 @@ "api", "helper/compressutil", "helper/jsonutil", - "helper/parseutil" + "helper/parseutil", + "helper/strutil" ] - revision = "5acd6a21d5a69ab49d0f7c0bf540123a9b2c696d" - version = "v0.9.3" + revision = "36edb4d42380d89a897e7f633046423240b710d9" + version = "v0.9.5" [[projects]] branch = "master" @@ -94,12 +95,32 @@ packages = ["."] revision = "b4575eea38cca1123ec2dc90c26529b5c5acfcff" +[[projects]] + name = "github.com/ryanuber/go-glob" + packages = ["."] + revision = "572520ed46dbddaed19ea3d9541bdd0494163693" + version = "v0.1" + [[projects]] branch = "master" name = "github.com/sethgrid/pester" packages = ["."] revision = "760f8913c0483b776294e1bee43f1d687527127b" +[[projects]] + branch = "master" + name = "golang.org/x/crypto" + packages = [ + "cast5", + "openpgp", + "openpgp/armor", + "openpgp/elgamal", + "openpgp/errors", + "openpgp/packet", + "openpgp/s2k" + ] + revision = "85f98707c97e11569271e4d9b3d397e079c4f4d0" + [[projects]] branch = "master" name = "golang.org/x/net" @@ -135,6 +156,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "c49b267ee83a36c520ae964867f725fc7d934296f38240152e6eec2842846ac0" + inputs-digest = "7308c3e7f4b4c4536cbae1a89e132c8512650127871bb669a679d81f4563ed92" solver-name = "gps-cdcl" solver-version = 1 diff --git a/sms-service/src/sms/Gopkg.toml b/sms-service/src/sms/Gopkg.toml index 6e40849..f811086 100644 --- a/sms-service/src/sms/Gopkg.toml +++ b/sms-service/src/sms/Gopkg.toml @@ -26,8 +26,12 @@ [[constraint]] name = "github.com/hashicorp/vault" - version = "0.9.3" + version = "0.9.4" [[constraint]] branch = "master" name = "github.com/hashicorp/go-uuid" + +[[constraint]] + branch = "master" + name = "golang.org/x/crypto" diff --git a/sms-service/src/sms/test/loop_test.sh b/sms-service/src/sms/test/loop_test.sh index 449d625..40fbfc5 100644 --- a/sms-service/src/sms/test/loop_test.sh +++ b/sms-service/src/sms/test/loop_test.sh @@ -1,57 +1,58 @@ #!/bin/bash RED='\033[0;31m' NC='\033[0m' +URL=$1 for i in `seq 1 2`; do echo -e "${RED}----------------BEGIN GET STATUS----------------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X GET \ - https://localhost:10443/v1/sms/status + https://${URL}:10443/v1/sms/status echo -e "${RED}----------------BEGIN CREATE SECRET DOMAIN------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X POST \ - -d @test/test_create_domain.json https://localhost:10443/v1/sms/domain + -d @test/test_create_domain.json https://${URL}:10443/v1/sms/domain echo -e "${RED}----------------BEGIN CREATE SECRET 1-----------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X POST \ - -d @test/test_create_secret1.json https://localhost:10443/v1/sms/domain/curltestdomain/secret + -d @test/test_create_secret1.json https://${URL}:10443/v1/sms/domain/curltestdomain/secret echo -e "${RED}----------------BEGIN CREATE SECRET 2-----------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X POST \ - -d @test/test_create_secret2.json https://localhost:10443/v1/sms/domain/curltestdomain/secret + -d @test/test_create_secret2.json https://${URL}:10443/v1/sms/domain/curltestdomain/secret echo -e "${RED}----------------BEGIN CREATE SECRET 3-----------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X POST \ - -d @test/test_create_secret3.json https://localhost:10443/v1/sms/domain/curltestdomain/secret + -d @test/test_create_secret3.json https://${URL}:10443/v1/sms/domain/curltestdomain/secret echo -e "${RED}----------------BEGIN LIST SECRET---------------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X GET \ - https://localhost:10443/v1/sms/domain/curltestdomain/secret + https://${URL}:10443/v1/sms/domain/curltestdomain/secret echo -e "${RED}----------------BEGIN GET SECRET 1--------------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X GET \ - https://localhost:10443/v1/sms/domain/curltestdomain/secret/curltestsecret1 + https://${URL}:10443/v1/sms/domain/curltestdomain/secret/curltestsecret1 echo -e "${RED}----------------BEGIN GET SECRET 2--------------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X GET \ - https://localhost:10443/v1/sms/domain/curltestdomain/secret/curltestsecret2 + https://${URL}:10443/v1/sms/domain/curltestdomain/secret/curltestsecret2 echo -e "${RED}----------------BEGIN GET SECRET 3--------------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X GET \ - https://localhost:10443/v1/sms/domain/curltestdomain/secret/curltestsecret3 + https://${URL}:10443/v1/sms/domain/curltestdomain/secret/curltestsecret3 echo -e "${RED}----------------BEGIN DELETE SECRET 1-----------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X DELETE \ - https://localhost:10443/v1/sms/domain/curltestdomain/secret/curltestsecret1 + https://${URL}:10443/v1/sms/domain/curltestdomain/secret/curltestsecret1 echo -e "${RED}----------------BEGIN DELETE SECRET 2-----------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X DELETE \ - https://localhost:10443/v1/sms/domain/curltestdomain/secret/curltestsecret2 + https://${URL}:10443/v1/sms/domain/curltestdomain/secret/curltestsecret2 echo -e "${RED}----------------BEGIN DELETE SECRET 3-----------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X DELETE \ - https://localhost:10443/v1/sms/domain/curltestdomain/secret/curltestsecret3 + https://${URL}:10443/v1/sms/domain/curltestdomain/secret/curltestsecret3 echo -e "${RED}----------------BEGIN DELETE SECRET DOMAIN------${NC}" curl -i -w "\n" -H "Accept: application/json" --cacert auth/selfsignedca.pem --cert auth/client.cert --key auth/client.key -X DELETE \ - https://localhost:10443/v1/sms/domain/curltestdomain + https://${URL}:10443/v1/sms/domain/curltestdomain done -- cgit 1.2.3-korg