Skip to content

Commit 6aa563f

Browse files
author
Marcin Przepiorowski
committed
Version 2.4.11
2 parents 5487f0a + e464a11 commit 6aa563f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+3971
-2402
lines changed

‎.github/workflows/build.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ jobs:
2727
echo SOURCE_TAG=$SOURCE_TAG >> $GITHUB_ENV
2828
echo FILENAME=$FILENAME >> $GITHUB_ENV
2929
30+
- name: add examples
31+
run: |
32+
gzip -d dxtoolkit.tar.gz
33+
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
34+
gzip dxtoolkit.tar
35+
3036
- name: compress toolkit
3137
run: |
3238
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
@@ -60,6 +66,12 @@ jobs:
6066
echo SOURCE_TAG=$SOURCE_TAG >> $GITHUB_ENV
6167
echo FILENAME=$FILENAME >> $GITHUB_ENV
6268
69+
- name: add examples
70+
run: |
71+
gzip -d dxtoolkit.tar.gz
72+
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
73+
gzip dxtoolkit.tar
74+
6375
- name: compress toolkit
6476
run: |
6577
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
@@ -92,6 +104,13 @@ jobs:
92104
echo SOURCE_TAG=$SOURCE_TAG >> $GITHUB_ENV
93105
echo FILENAME=$FILENAME >> $GITHUB_ENV
94106
107+
- name: add examples
108+
run: |
109+
gzip -d dxtoolkit.tar.gz
110+
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
111+
gzip dxtoolkit.tar
112+
113+
95114
- name: compress toolkit
96115
run: |
97116
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
@@ -144,6 +163,12 @@ jobs:
144163
run: build\windows_compile.cmd
145164
shell: cmd
146165

166+
- name: add examples
167+
run: |
168+
copy D:\a\dxtoolkit\dxtoolkit\bin\dxtools.conf.example d:\a\dxtoolkit\dxtoolkit\dxtoolkit2
169+
copy D:\a\dxtoolkit\dxtoolkit\bin\dxusers.csv.example d:\a\dxtoolkit\dxtoolkit\dxtoolkit2
170+
171+
147172
- name: compress toolkit
148173
run: |
149174
$NAME = "d:\a\dxtoolkit\dxtoolkit\${{ env.FILENAME }}"
@@ -246,6 +271,8 @@ jobs:
246271
echo ln -sf runner \$i >> install.sh
247272
echo done >> install.sh
248273
274+
cp ${CDIR}/dxtools.conf.example ${CDIR}/dxusers.csv.example ${CDIR}/dxtoolkit2
275+
249276
250277
cd ${CDIR}
251278
ls -l ./dxtoolkit2

‎.github/workflows/develop.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ jobs:
3333
echo SOURCE_TAG=$SOURCE_TAG >> $GITHUB_ENV
3434
echo FILENAME=$FILENAME >> $GITHUB_ENV
3535
36+
- name: add examples
37+
run: |
38+
gzip -d dxtoolkit.tar.gz
39+
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
40+
gzip dxtoolkit.tar
41+
3642
3743
- name: compress toolkit
3844
run: |
@@ -74,6 +80,12 @@ jobs:
7480
echo SOURCE_TAG=$SOURCE_TAG >> $GITHUB_ENV
7581
echo FILENAME=$FILENAME >> $GITHUB_ENV
7682
83+
- name: add examples
84+
run: |
85+
gzip -d dxtoolkit.tar.gz
86+
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
87+
gzip dxtoolkit.tar
88+
7789
- name: compress toolkit
7890
run: |
7991
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
@@ -112,6 +124,12 @@ jobs:
112124
echo SOURCE_TAG=$SOURCE_TAG >> $GITHUB_ENV
113125
echo FILENAME=$FILENAME >> $GITHUB_ENV
114126
127+
- name: add examples
128+
run: |
129+
gzip -d dxtoolkit.tar.gz
130+
tar -rvf dxtoolkit.tar bin/dxtools.conf.example bin/dxusers.csv.example
131+
gzip dxtoolkit.tar
132+
115133
- name: compress toolkit
116134
run: |
117135
mv dxtoolkit.tar.gz ${{ env.FILENAME }}
@@ -176,6 +194,11 @@ jobs:
176194
run: build\windows_compile.cmd
177195
shell: cmd
178196

197+
- name: add examples
198+
run: |
199+
copy D:\a\dxtoolkit\dxtoolkit\bin\dxtools.conf.example d:\a\dxtoolkit\dxtoolkit\dxtoolkit2
200+
copy D:\a\dxtoolkit\dxtoolkit\bin\dxusers.csv.example d:\a\dxtoolkit\dxtoolkit\dxtoolkit2
201+
179202
- name: compress toolkit
180203
run: |
181204
$NAME = "d:\a\dxtoolkit\dxtoolkit\${{ env.FILENAME }}"
@@ -280,6 +303,8 @@ jobs:
280303
echo ln -sf runner \$i >> install.sh
281304
echo done >> install.sh
282305
306+
cp ${CDIR}/dxtools.conf.example ${CDIR}/dxusers.csv.example ${CDIR}/dxtoolkit2
307+
283308
284309
cd ${CDIR}
285310
ls -l ./dxtoolkit2

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
## 2.4.11
2+
3+
### Added
4+
- Simplified connection support for Oracle in 6.0.7 engines - no need to add dbuser and password in dSource operations
5+
- Certified with 6.0.7
6+
7+
### Changed
8+
9+
10+
- [fix for #165](https://github.com/delphix/dxtoolkit/issues/165) MS SQL ingestion using AD account
11+
- [fix for #167](https://github.com/delphix/dxtoolkit/issues/167) Change password fixed for Windows
12+
- [fix for #170](https://github.com/delphix/dxtoolkit/issues/170) Documentation fix
13+
- [fix for #176](https://github.com/delphix/dxtoolkit/issues/176) Password verification fix
14+
- [fix for #177](https://github.com/delphix/dxtoolkit/issues/177) Snapshot for vFiles and dSource ingestion fix
15+
- [fix for #178](https://github.com/delphix/dxtoolkit/issues/178) Users command dx_get_users and dx_ctl_users to process only local users
16+
- [fix for #179](https://github.com/delphix/dxtoolkit/issues/179) Default PowerShell support for hooks
17+
18+
19+
120
## 2.4.10
221

322
### Added

‎bin/dx_ctl_db.pl

100644100755
Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,11 +351,12 @@
351351
=head1 SYNOPSIS
352352
353353
dx_ctl_db [ -engine|d <delphix identifier> | -all ] [ -configfile file ]
354-
[ -group group_name | -name db_name | -host host_name | -type dsource|vdb | -instancename instname | -olderthan date]
354+
[ -group group_name | -name db_name | -host host_name | -type dsource|vdb | -instancename instname | -olderthan date | -dsource dsource_name | -envname env_name]
355355
[-instance inst_no]
356356
<-action start|stop|enable|disable>
357357
[-restore filename]
358358
[-force false|onfailure|only]
359+
[-parallel n]
359360
[-help|? ]
360361
[-debug ]
361362
@@ -402,12 +403,17 @@ =head2 Filters
402403
=item B<-type>
403404
Type (dsource|vdb)
404405
406+
=item B<-instancename>
407+
Instance name - ( can be used only for Oracle RAC )
408+
409+
=item B<-dsource>
410+
dSource Name - Action will be taken against children of specified dSource.
411+
405412
=item B<-envname>
406413
Environment name
407414
408-
=item B<-instancename instname>
409-
Instance name ( can be used only for Oracle RAC )
410-
415+
=item B<-olderthan>
416+
Date - Filter based on objects older than given date
411417
412418
=back
413419

‎bin/dx_ctl_dsource.pl

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
use Pod::Usage;
2929
use FindBin;
3030
use Data::Dumper;
31+
use version;
3132

3233
my $abspath = $FindBin::Bin;
3334

@@ -39,7 +40,7 @@
3940
use Toolkit_helpers;
4041
use FileMap;
4142

42-
my $version = $Toolkit_helpers::version;
43+
my $dxversion = $Toolkit_helpers::version;
4344

4445
my $logsync = "no";
4546
my $compression = "no";
@@ -84,7 +85,7 @@
8485

8586

8687
pod2usage(-verbose => 2, -input=>\*DATA) && exit if $help;
87-
die "$version\n" if $print_version;
88+
die "$dxversion\n" if $print_version;
8889

8990

9091
my $engine_obj = new Engine ($dever, $debug);
@@ -138,17 +139,6 @@
138139

139140

140141

141-
if (( lc $type ne 'db2' ) && ( lc $type ne 'vfiles' ) && (! ( defined($dbuser) && defined($password) ) ) ) {
142-
if (( lc $type eq 'mssql' ) && ( lc $dbusertype eq 'environment' ) ) {
143-
$dbuser = $source_os_user;
144-
} else {
145-
print "Options -dbuser and -password are required for non vFiles dsources. \n";
146-
pod2usage(-verbose => 1, -input=>\*DATA);
147-
exit (1);
148-
}
149-
}
150-
151-
152142
if (( lc $type eq 'sybase' ) && ( ! ( defined($stage_os_user) && defined($stageinst) && defined($stageenv) && defined($backup_dir) && defined($sourceinst) && defined($sourceenv) ) ) ) {
153143
print "Options -stage_os_user, -stageinst, -stageenv, -sourceinst, -sourceenv and -backup_dir are required. \n";
154144
pod2usage(-verbose => 1, -input=>\*DATA);
@@ -189,6 +179,25 @@
189179
next;
190180
};
191181

182+
183+
if (((lc $action eq 'attach') || (lc $action eq 'create')) && (( lc $type ne 'db2' ) && ( lc $type ne 'vfiles' ) && (! ( defined($dbuser) && defined($password) ) ) ) ) {
184+
# no db user exceptions
185+
if (( lc $type eq 'mssql' ) && ( lc $dbusertype eq 'environment' ) ) {
186+
$dbuser = $source_os_user;
187+
} elsif (lc $type eq 'oracle') {
188+
if ( ! (version->parse($engine_obj->getApi()) >= version->parse(1.11.7) ) ) {
189+
print "Options -dbuser and -password are required for Oracle for version lower than 6.0.7 \n";
190+
pod2usage(-verbose => 1, -input=>\*DATA);
191+
exit (1)
192+
}
193+
} else {
194+
print "Options -dbuser and -password are required for non vFiles dsources. \n";
195+
pod2usage(-verbose => 1, -input=>\*DATA);
196+
exit (1);
197+
}
198+
}
199+
200+
192201
my $db;
193202
my $jobno;
194203

‎bin/dx_get_db_env.pl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@ =head1 SYNOPSIS
540540
[-masking]
541541
[-parentlast l|p]
542542
[-config]
543+
[-configtype s|d]
543544
[-backup path]
544545
[-hostenv h|e]
545546
[-format csv|json ]
@@ -620,6 +621,9 @@ =head1 OPTIONS
620621
=item B<-config>
621622
Display a config of databases (db type, version, instance / Oracle home) plus others
622623
624+
=item B<-configtype>
625+
Display a config of databases including a database name on server
626+
623627
=item B<-masking>
624628
Display a masking status of databases plus a masking job
625629

0 commit comments

Comments
 (0)