Skip to content

Commit 61ce1bb

Browse files
jgebaljgebal
committed
Removed test users env variables
Those variables are not needed and bring no real benefit asu the usernames actually cannot be configured and even if they were, there would be no real benefit to it.
1 parent 85fd36d commit 61ce1bb

File tree

6 files changed

+33
-46
lines changed

6 files changed

+33
-46
lines changed

‎.github/scripts/create_test_users.sh‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ PROMPT Adding back create-trigger privilege to $UT3_DEVELOP_SCHEMA for testing
1313
grant administer database trigger to $UT3_DEVELOP_SCHEMA;
1414
1515
--------------------------------------------------------------------------------
16-
PROMPT Creating $UT3_TESTER - Power-user for testing internal framework code
16+
PROMPT Creating UT3_TESTER - Power-user for testing internal framework code
1717
18-
create user $UT3_TESTER identified by "$UT3_TESTER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
19-
grant create session, create procedure, create type, create table to $UT3_TESTER;
18+
create user UT3_TESTER identified by "ut3" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
19+
grant create session, create procedure, create type, create table to UT3_TESTER;
2020
21-
grant execute on dbms_lock to $UT3_TESTER;
21+
grant execute on dbms_lock to UT3_TESTER;
2222
23-
PROMPT Granting $UT3_DEVELOP_SCHEMA code to $UT3_TESTER
23+
PROMPT Granting $UT3_DEVELOP_SCHEMA code to UT3_TESTER
2424
2525
begin
2626
for i in (
@@ -30,31 +30,31 @@ begin
3030
and generated = 'N'
3131
and object_name not like 'SYS%')
3232
loop
33-
execute immediate 'grant execute on $UT3_DEVELOP_SCHEMA."'||i.object_name||'" to $UT3_TESTER';
33+
execute immediate 'grant execute on $UT3_DEVELOP_SCHEMA."'||i.object_name||'" to UT3_TESTER';
3434
end loop;
3535
end;
3636
/
3737
38-
PROMPT Granting $UT3_DEVELOP_SCHEMA tables to $UT3_TESTER
38+
PROMPT Granting $UT3_DEVELOP_SCHEMA tables to UT3_TESTER
3939
4040
begin
4141
for i in ( select table_name from all_tables t where owner = '$UT3_DEVELOP_SCHEMA' and nested = 'NO' and iot_name is null)
4242
loop
43-
execute immediate 'grant select on $UT3_DEVELOP_SCHEMA.'||i.table_name||' to $UT3_TESTER';
43+
execute immediate 'grant select on $UT3_DEVELOP_SCHEMA.'||i.table_name||' to UT3_TESTER';
4444
end loop;
4545
end;
4646
/
4747
4848
4949
--------------------------------------------------------------------------------
50-
PROMPT Creating $UT3_USER - minimal privileges user for API testing
50+
PROMPT Creating UT3_USER - minimal privileges user for API testing
5151
52-
create user $UT3_USER identified by "$UT3_USER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
53-
grant create session, create procedure, create type, create table to $UT3_USER;
52+
create user UT3_USER identified by "ut3" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
53+
grant create session, create procedure, create type, create table to UT3_USER;
5454
55-
PROMPT Grants for starting a debugging session from $UT3_USER
56-
grant debug connect session to $UT3_USER;
57-
grant debug any procedure to $UT3_USER;
55+
PROMPT Grants for starting a debugging session from UT3_USER
56+
grant debug connect session to UT3_USER;
57+
grant debug any procedure to UT3_USER;
5858
begin
5959
\$if dbms_db_version.version <= 11 \$then
6060
null; -- no addition action necessary
@@ -64,7 +64,7 @@ begin
6464
host =>'*',
6565
ace => sys.xs\$ace_type(
6666
privilege_list => sys.xs\$name_list('JDWP') ,
67-
principal_name => '$UT3_USER',
67+
principal_name => 'UT3_USER',
6868
principal_type => sys.xs_acl.ptype_db
6969
)
7070
);
@@ -73,29 +73,29 @@ end;
7373
/
7474
7575
--------------------------------------------------------------------------------
76-
PROMPT Creating $UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests.
76+
PROMPT Creating UT3_TESTER_HELPER - provides functions to allow min grant test user setup tests.
7777
78-
create user $UT3_TESTER_HELPER identified by "$UT3_TESTER_HELPER_PASSWORD" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
79-
grant create session, create procedure, create type, create table to $UT3_TESTER_HELPER;
78+
create user UT3_TESTER_HELPER identified by "ut3" default tablespace $UT3_TABLESPACE quota unlimited on $UT3_TABLESPACE;
79+
grant create session, create procedure, create type, create table to UT3_TESTER_HELPER;
8080
8181
PROMPT Grants for testing distributed transactions
82-
grant create public database link to $UT3_TESTER_HELPER;
83-
grant drop public database link to $UT3_TESTER_HELPER;
82+
grant create public database link to UT3_TESTER_HELPER;
83+
grant drop public database link to UT3_TESTER_HELPER;
8484
8585
PROMPT Grants for testing coverage outside of main $UT3_DEVELOP_SCHEMA schema.
8686
grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type,
8787
select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table,
8888
select any dictionary, create any synonym, drop any synonym,
8989
grant any object privilege, grant any privilege, create public synonym, drop public synonym, create any trigger
90-
to $UT3_TESTER_HELPER;
90+
to UT3_TESTER_HELPER;
9191
92-
grant create job to $UT3_TESTER_HELPER;
92+
grant create job to UT3_TESTER_HELPER;
9393
9494
PROMPT Additional grants for disabling DDL trigger and testing parser without trigger enabled/present
9595
96-
grant alter any trigger to $UT3_TESTER_HELPER;
97-
grant administer database trigger to $UT3_TESTER_HELPER;
98-
grant execute on dbms_lock to $UT3_TESTER_HELPER;
96+
grant alter any trigger to UT3_TESTER_HELPER;
97+
grant administer database trigger to UT3_TESTER_HELPER;
98+
grant execute on dbms_lock to UT3_TESTER_HELPER;
9999
100100
create user ut3_cache_test_owner identified by ut3;
101101
grant create session, create procedure to ut3_cache_test_owner;

‎.github/variables/.env‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ UT3_DEVELOP_SCHEMA=UT3_DEVELOP
33
UT3_DEVELOP_SCHEMA_PASSWORD=ut3
44
UT3_RELEASE_VERSION_SCHEMA=UT3
55
UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3
6-
UT3_USER='UT3_USER'
7-
UT3_USER_PASSWORD=ut3
8-
UT3_TESTER=UT3_TESTER
9-
UT3_TESTER_PASSWORD=ut3
10-
UT3_TESTER_HELPER=UT3_TESTER_HELPER
11-
UT3_TESTER_HELPER_PASSWORD=ut3
126
UT3_TABLESPACE=users
137

148
# Database Env
@@ -30,4 +24,4 @@ GIT_COMMITTER_NAME="github-actions[bot]"
3024
GIT_COMMITTER_EMAIL="github-actions[bot]@users.noreply.github.com"
3125

3226
#Docker environment for running utPLSQL install commands
33-
DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR"
27+
DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR"

‎development/cleanup.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ end;
2020
2121
drop user ${UT3_DEVELOP_SCHEMA} cascade;
2222
drop user ${UT3_RELEASE_VERSION_SCHEMA} cascade;
23-
drop user ${UT3_TESTER} cascade;
24-
drop user ${UT3_TESTER_HELPER} cascade;
25-
drop user ${UT3_USER} cascade;
23+
drop user ut3_tester cascade;
24+
drop user ut3_tester_helper cascade;
25+
drop user ut3_user cascade;
2626
drop user ut3_cache_test_owner cascade;
2727
drop user ut3_no_extra_priv_user cascade;
2828
drop user ut3_select_catalog_user cascade;

‎development/template.env.sh‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,4 @@ export UT3_DEVELOP_SCHEMA=UT3_DEVELOP
1212
export UT3_DEVELOP_SCHEMA_PASSWORD=ut3
1313
export UT3_RELEASE_VERSION_SCHEMA=UT3
1414
export UT3_RELEASE_VERSION_SCHEMA_PASSWORD=ut3
15-
export UT3_TESTER=UT3_TESTER
16-
export UT3_TESTER_PASSWORD=ut3
17-
export UT3_TESTER_HELPER=UT3_TESTER_HELPER
18-
export UT3_TESTER_HELPER_PASSWORD=ut3
1915
export UT3_TABLESPACE=users
20-
export UT3_USER="UT3\$USER#"
21-
export UT3_USER_PASSWORD=ut3
22-
export DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_DEVELOP_SCHEMA -e UT3_DEVELOP_SCHEMA_PASSWORD -e UT3_RELEASE_VERSION_SCHEMA -e UT3_RELEASE_VERSION_SCHEMA_PASSWORD -e UT3_USER -e UT3_USER_PASSWORD -e UT3_TESTER -e UT3_TESTER_PASSWORD -e UT3_TESTER_HELPER -e UT3_TESTER_HELPER_PASSWORD -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR"

‎test/install_tests.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
55
cd ${SCRIPT_DIR}
66

77

8-
"$SQLCLI" ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_helper.sql
8+
"$SQLCLI" UT3_TESTER_HELPER/ut3@//${CONNECTION_STR} @install_ut3_tester_helper.sql
99

10-
"$SQLCLI" ${UT3_USER}/${UT3_USER_PASSWORD}@//${CONNECTION_STR} @install_ut3_user_tests.sql
10+
"$SQLCLI" UT3_USER/ut3@//${CONNECTION_STR} @install_ut3_user_tests.sql
1111

12-
"$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_ut3_tester_tests.sql
12+
"$SQLCLI" UT3_TESTER/ut3@//${CONNECTION_STR} @install_ut3_tester_tests.sql
1313

‎test/run_tests.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -ev
44
#goto git root directory
55
git rev-parse && cd "$(git rev-parse --show-cdup)"
66

7-
time utPLSQL-cli/bin/utplsql run ${UT3_TESTER_HELPER}/${UT3_TESTER_HELPER_PASSWORD}@${CONNECTION_STR} \
7+
time utPLSQL-cli/bin/utplsql run UT3_TESTER_HELPER/ut3@${CONNECTION_STR} \
88
-source_path=source -owner=ut3_develop \
99
-p='ut3_tester,ut3_user' \
1010
-test_path=test -c \

0 commit comments

Comments
 (0)