Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch idp for regression test to login-gov #504

Merged
merged 4 commits into from
Aug 19, 2024
Merged

switch idp for regression test to login-gov #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62ceb9f
switch idp for regression test to login-gov
TylerGuerrero-va Aug 15, 2024
d69c60a
removed debug statements and refactored the env vars
TylerGuerrero-va Aug 16, 2024
b5a5af5
fixed missing slash when attempting regression testing
TylerGuerrero-va Aug 16, 2024
94e0380
updated Makefile and entrypoint_test to align with the idp switch for…
TylerGuerrero-va Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,11 @@ regression:
--client-id=$(CLIENT_ID) \
--idp=$(IDP) \
--authorization-url=$(AUTHORIZATION_URL) \
--user-password=$(USER_PASSWORD) \
--valid-user=$(VALID_USER_EMAIL) \
--icn-error-user=$(ICN_ERROR_USER_EMAIL)
--valid-login-gov-user-email=$(VALID_LOGIN_GOV_USER_EMAIL) \
--valid-login-gov-user-seed=$(VALID_LOGIN_GOV_USER_SEED) \
--login-gov-user-password=$(LOGIN_GOV_USER_PASSWORD) \
--icn-error-login-gov-user-email=$(ICN_ERROR_LOGIN_GOV_USER_EMAIL) \
--icn-error-login-gov-user-seed=$(ICN_ERROR_LOGIN_GOV_USER_SEED)
--regression-test-timeout=$(REGRESSION_TEST_TIMEOUT)

## pull: Pull an image to ECR
Expand Down
16 changes: 10 additions & 6 deletions cicd/buildspec-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ env:
DEV_IDP: "/dvp/common/ecs-saml-proxy/codebuild/dev_idp"
SANDBOX_IDP: "/dvp/common/ecs-saml-proxy/codebuild/sandbox_idp"
AUTHORIZATION_URL: "/dvp/common/ecs-saml-proxy/codebuild/authorization_url"
USER_PASSWORD: "/dvp/common/ecs-saml-proxy/codebuild/user_password"
VALID_USER_EMAIL: "/dvp/common/ecs-saml-proxy/codebuild/valid_user_email"
ICN_ERROR_USER_EMAIL: "/dvp/common/ecs-saml-proxy/codebuild/icn_error_user_email"
VALID_LOGIN_GOV_USER_EMAIL: "/dvp/common/ecs-saml-proxy/codebuild/valid_login_gov_user_email"
VALID_LOGIN_GOV_USER_SEED: "/dvp/common/ecs-saml-proxy/codebuild/valid_login_gov_user_seed"
LOGIN_GOV_USER_PASSWORD: "/dvp/common/ecs-saml-proxy/codebuild/login_gov_user_password"
ICN_ERROR_LOGIN_GOV_USER_EMAIL: "/dvp/common/ecs-saml-proxy/codebuild/icn_error_login_gov_user_email"
ICN_ERROR_LOGIN_GOV_USER_SEED: "/dvp/common/ecs-saml-proxy/codebuild/icn_error_login_gov_user_seed"
REGRESSION_TEST_TIMEOUT: "/dvp/common/ecs-saml-proxy/codebuild/regression_test_timeout"
phases:
install:
Expand Down Expand Up @@ -119,9 +121,11 @@ phases:
CLIENT_ID=${CLIENT_ID} \
IDP=${IDP} \
AUTHORIZATION_URL=${AUTHORIZATION_URL} \
USER_PASSWORD=${USER_PASSWORD} \
VALID_USER_EMAIL=${VALID_USER_EMAIL} \
ICN_ERROR_USER_EMAIL=${ICN_ERROR_USER_EMAIL}
VALID_LOGIN_GOV_USER_EMAIL=${VALID_LOGIN_GOV_USER_EMAIL} \
VALID_LOGIN_GOV_USER_SEED=${VALID_LOGIN_GOV_USER_SEED} \
LOGIN_GOV_USER_PASSWORD=${LOGIN_GOV_USER_PASSWORD} \
ICN_ERROR_LOGIN_GOV_USER_EMAIL=${ICN_ERROR_LOGIN_GOV_USER_EMAIL} \
ICN_ERROR_LOGIN_GOV_USER_SEED=${ICN_ERROR_LOGIN_GOV_USER_SEED} \
REGRESSION_TEST_TIMEOUT=${REGRESSION_TEST_TIMEOUT}
if [[ $? -gt 0 ]]; then
slackpost.sh -t warning "Some regression tests failed."
Expand Down
24 changes: 15 additions & 9 deletions test/regression_tests/entrypoint_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ docker run \
--client-id=$CLIENT_ID \
--idp=$IDP \
--authorization-url=$AUTHORIZATION_URL \
--user-password=$USER_PASSWORD \
--valid-user=$VALID_USER_EMAIL \
--icn-error-user=$ICN_ERROR_USER_EMAIL
--valid-login-gov-user-email=$VALID_LOGIN_GOV_USER_EMAIL \
--valid-login-gov-user-seed=$VALID_LOGIN_GOV_USER_SEED \
--login-gov-user-password=$LOGIN_GOV_USER_PASSWORD \
--icn-error-login-gov-user-email=$ICN_ERROR_LOGIN_GOV_USER_EMAIL \
--icn-error-login-gov-user-seed=$ICN_ERROR_LOGIN_GOV_USER_SEED

EOF
}
Expand All @@ -38,12 +40,16 @@ case $i in
export IDP="${i#*=}"; shift ;;
--authorization-url=*)
export AUTHORIZATION_URL="${i#*=}"; shift ;;
--user-password=*)
export USER_PASSWORD="${i#*=}"; shift ;;
--valid-user=*)
export VALID_USER_EMAIL="${i#*=}"; shift ;;
--icn-error-user=*)
export ICN_ERROR_USER_EMAIL="${i#*=}"; shift ;;
--valid-login-gov-user-email=*)
export VALID_LOGIN_GOV_USER_EMAIL="${i#*=}"; shift ;;
--valid-login-gov-user-seed=*)
export VALID_LOGIN_GOV_USER_SEED="${i#*=}"; shift ;;
--login-gov-user-password=*)
export LOGIN_GOV_USER_PASSWORD="${i#*=}"; shift ;;
--icn-error-login-gov-user-email=*)
export ICN_ERROR_LOGIN_GOV_USER_EMAIL="${i#*=}"; shift ;;
--icn-error-login-gov-user-seed=*)
export ICN_ERROR_LOGIN_GOV_USER_SEED="${i#*=}"; shift ;;
esac
done

Expand Down
Loading