sasjs/core
1
0
Fork 0
mirror of https://github.com/sasjs/core.git synced 2025-12-11 14:34:35 +00:00
Code Issues Projects Releases Wiki Activity

feat: ignorevars option in mm_spkexport, and log update in mf_verifymacvars

Browse Source
This commit is contained in:
munja
2022-03-10 17:27:30 +00:00
parent 856ffc1b72
commit 312369b200
6 changed files with 127 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
all.sas
View File

@@ -1066,7 +1066,8 @@ or %index(&pgm,/tests/testteardown)
%else %if %symexist(&metavar) %then %do; %else %if %symexist(&metavar) %then %do;
%if %length(&&&metavar)=0 %then %let user=&sysuserid; %if %length(&&&metavar)=0 %then %let user=&sysuserid;
/* sometimes SAS will add @domain extension - remove for consistency */ /* sometimes SAS will add @domain extension - remove for consistency */
%else %let user=%scan(&&&metavar,1,@); /* but be sure to quote in case of usernames with commas */
%else %let user=%unquote(%scan(%quote(&&&metavar),1,@));
%end; %end;
%else %let user=&sysuserid; %else %let user=&sysuserid;
@@ -1889,7 +1890,7 @@ Usage:
%goto exit_success; %goto exit_success;
%exit_err: %exit_err:
%put %str(ERR)OR: &abortmsg; %put &abortmsg;
%mf_abort(iftrue=(&mabort ne SOFT), %mf_abort(iftrue=(&mabort ne SOFT),
mac=mf_verifymacvars, mac=mf_verifymacvars,
msg=%str(&abortmsg) msg=%str(&abortmsg)
@@ -8640,13 +8641,13 @@ select distinct lowcase(memname)
@li mp_abort.sas @li mp_abort.sas
@li mp_cntlout.sas @li mp_cntlout.sas
@li mp_lockanytable.sas @li mp_lockanytable.sas
@li mp_storediffs.sas
<h4> Related Macros </h4> <h4> Related Macros </h4>
@li mddl_dc_difftable.sas @li mddl_dc_difftable.sas
@li mddl_dc_locktable.sas @li mddl_dc_locktable.sas
@li mp_loadformat.test.sas @li mp_loadformat.test.sas
@li mp_lockanytable.sas @li mp_lockanytable.sas
@li mp_storediffs.sas
@li mp_stackdiffs.sas @li mp_stackdiffs.sas
@@ -8898,7 +8899,8 @@ options ibufsize=&ibufsize;
%put &sysmacroname exit vars:; %put &sysmacroname exit vars:;
%put _local_; %put _local_;
%end; %end;
%mend mp_loadformat;/** %mend mp_loadformat;
/**
@file @file
@brief Mechanism for locking tables to prevent parallel modifications @brief Mechanism for locking tables to prevent parallel modifications
@details Uses a control table to enable ANY table to be locked for updates @details Uses a control table to enable ANY table to be locked for updates
@@ -15089,7 +15091,8 @@ data _null_;
put ' %else %if %symexist(&metavar) %then %do; '; put ' %else %if %symexist(&metavar) %then %do; ';
put ' %if %length(&&&metavar)=0 %then %let user=&sysuserid; '; put ' %if %length(&&&metavar)=0 %then %let user=&sysuserid; ';
put ' /* sometimes SAS will add @domain extension - remove for consistency */ '; put ' /* sometimes SAS will add @domain extension - remove for consistency */ ';
put ' %else %let user=%scan(&&&metavar,1,@); '; put ' /* but be sure to quote in case of usernames with commas */ ';
put ' %else %let user=%unquote(%scan(%quote(&&&metavar),1,@)); ';
put ' %end; '; put ' %end; ';
put ' %else %let user=&sysuserid; '; put ' %else %let user=&sysuserid; ';
put ' '; put ' ';
@@ -17722,20 +17725,25 @@ filename __shake clear;
<h4> SAS Macros </h4> <h4> SAS Macros </h4>
@li mf_getuniquefileref.sas
@li mf_getuniquename.sas
@li mf_isblank.sas
@li mf_loc.sas @li mf_loc.sas
@li mm_tree.sas @li mm_tree.sas
@li mf_getuniquefileref.sas
@li mf_isblank.sas
@li mp_abort.sas @li mp_abort.sas
@param metaloc= the metadata folder to export
@param secureref= fileref containing the username / password (should point to @param [in] metaloc= the metadata folder to export
a file in a secure location). Leave blank to substitute $bash type vars. @param [in] secureref= fileref containing the username / password (should
@param outref= fileref to which to write the command point to a file in a secure location). Leave blank to substitute $bash vars.
@param cmdoutloc= the directory to which the command will write the SPK @param [in] excludevars= (0) A space seperated list of macro variable names,
(default=WORK) each of which contains a value that should be used to filter the output
@param cmdoutname= the name of the spk / log files to create (will be objects.
identical just with .spk or .log extension) @param [out] outref= fileref to which to write the command
@param [out] cmdoutloc= (%sysfunc(pathname(work))) The directory to which the
command will write the SPK
@param [out] cmdoutname= (mmxport) The name of the spk / log files to create
(will be identical just with .spk or .log extension)
@version 9.4 @version 9.4
@author Allan Bowe @author Allan Bowe
@@ -17744,6 +17752,7 @@ filename __shake clear;
%macro mm_spkexport(metaloc= %macro mm_spkexport(metaloc=
,secureref= ,secureref=
,excludevars=0
,outref= ,outref=
,cmdoutloc=%sysfunc(pathname(work)) ,cmdoutloc=%sysfunc(pathname(work))
,cmdoutname=mmxport ,cmdoutname=mmxport
@@ -17755,7 +17764,7 @@ filename __shake clear;
%end; %end;
/* set creds */ /* set creds */
%local mmxuser mmxpath; %local mmxuser mmxpath i var;
%let mmxuser=$1; %let mmxuser=$1;
%let mmxpass=$2; %let mmxpass=$2;
%if %mf_isblank(&secureref)=0 %then %do; %if %mf_isblank(&secureref)=0 %then %do;
@@ -17763,38 +17772,47 @@ filename __shake clear;
%end; %end;
/* setup metadata connection options */ /* setup metadata connection options */
%local host port platform_object_path connx_string; %local host port platform_object_path ds;
%let host=%sysfunc(getoption(metaserver)); %let host=%sysfunc(getoption(metaserver));
%let port=%sysfunc(getoption(metaport)); %let port=%sysfunc(getoption(metaport));
%let platform_object_path=%mf_loc(POF); %let platform_object_path=%mf_loc(POF);
%let ds=%mf_getuniquename(prefix=spkexportable);
%let connx_string=%str(-host &host -port &port -user &mmxuser %trim( %mm_tree(root=%str(&metaloc) ,types=EXPORTABLE ,outds=&ds)
)-password &mmxpass);
%mm_tree(root=%str(&metaloc) ,types=EXPORTABLE ,outds=exportable)
%if %mf_isblank(&outref)=1 %then %let outref=%mf_getuniquefileref(); %if %mf_isblank(&outref)=1 %then %let outref=%mf_getuniquefileref();
data _null_; data _null_;
set exportable end=last; set &ds end=last;
file &outref lrecl=32767; file &outref lrecl=32767;
length str $32767; length str $32767;
if _n_=1 then do; if _n_=1 then do;
put "cd ""&platform_object_path"" \"; put "cd ""&platform_object_path"" \";
put "; ./ExportPackage &connx_string -disableX11 \"; put "; ./ExportPackage -host &host -port &port -user &mmxuser \";
put " -package ""&cmdoutloc/&cmdoutname..spk"" \"; put " -disableX11 -password &mmxpass \"
put " -package ""&cmdoutloc/&cmdoutname..spk"" \";
end; end;
/* exclude particular patterns from the exported SPK */
%if "&excludevars" ne "0" %then %do;
/* ignore top level folder else all subcontent will be exported regardless */
if _n_>1;
%do i=1 %to %sysfunc(countw(&excludevars));
%let var=%scan(&excludevars,&i);
if index(path,symget("&var")) ne 0;
%end;
%end;
str=' -objects '!!cats('"',path,'/',name,"(",publictype,')" \'); str=' -objects '!!cats('"',path,'/',name,"(",publictype,')" \');
put str; put str;
if last then put " -log ""&cmdoutloc/&cmdoutname..log"" 2>&1 "; if last then put " -log ""&cmdoutloc/&cmdoutname..log"" 2>&1 ";
run; run;
%mp_abort(iftrue= (&syscc ne 0) %mp_abort(iftrue= (&syscc ne 0)
,mac=&sysmacroname ,mac=mm_spkexport
,msg=%str(syscc=&syscc) ,msg=%str(syscc=&syscc)
) )
%mend mm_spkexport;/** %mend mm_spkexport;
/**
@file mm_tree.sas @file mm_tree.sas
@brief Returns all folders / subfolder content for a particular root @brief Returns all folders / subfolder content for a particular root
@details Shows all members and SubTrees for a particular root. @details Shows all members and SubTrees for a particular root.
@@ -20539,7 +20557,8 @@ data _null_;
put ' %else %if %symexist(&metavar) %then %do; '; put ' %else %if %symexist(&metavar) %then %do; ';
put ' %if %length(&&&metavar)=0 %then %let user=&sysuserid; '; put ' %if %length(&&&metavar)=0 %then %let user=&sysuserid; ';
put ' /* sometimes SAS will add @domain extension - remove for consistency */ '; put ' /* sometimes SAS will add @domain extension - remove for consistency */ ';
put ' %else %let user=%scan(&&&metavar,1,@); '; put ' /* but be sure to quote in case of usernames with commas */ ';
put ' %else %let user=%unquote(%scan(%quote(&&&metavar),1,@)); ';
put ' %end; '; put ' %end; ';
put ' %else %let user=&sysuserid; '; put ' %else %let user=&sysuserid; ';
put ' '; put ' ';

2
base/mf_verifymacvars.sas
View File

@@ -59,7 +59,7 @@
%goto exit_success; %goto exit_success;
%exit_err: %exit_err:
%put %str(ERR)OR: &abortmsg; %put &abortmsg;
%mf_abort(iftrue=(&mabort ne SOFT), %mf_abort(iftrue=(&mabort ne SOFT),
mac=mf_verifymacvars, mac=mf_verifymacvars,
msg=%str(&abortmsg) msg=%str(&abortmsg)

3
meta/mm_createwebservice.sas
View File

@@ -453,7 +453,8 @@ data _null_;
put ' %else %if %symexist(&metavar) %then %do; '; put ' %else %if %symexist(&metavar) %then %do; ';
put ' %if %length(&&&metavar)=0 %then %let user=&sysuserid; '; put ' %if %length(&&&metavar)=0 %then %let user=&sysuserid; ';
put ' /* sometimes SAS will add @domain extension - remove for consistency */ '; put ' /* sometimes SAS will add @domain extension - remove for consistency */ ';
put ' %else %let user=%scan(&&&metavar,1,@); '; put ' /* but be sure to quote in case of usernames with commas */ ';
put ' %else %let user=%unquote(%scan(%quote(&&&metavar),1,@)); ';
put ' %end; '; put ' %end; ';
put ' %else %let user=&sysuserid; '; put ' %else %let user=&sysuserid; ';
put ' '; put ' ';

56
meta/mm_spkexport.sas
View File

@@ -49,20 +49,25 @@
<h4> SAS Macros </h4> <h4> SAS Macros </h4>
@li mf_getuniquefileref.sas
@li mf_getuniquename.sas
@li mf_isblank.sas
@li mf_loc.sas @li mf_loc.sas
@li mm_tree.sas @li mm_tree.sas
@li mf_getuniquefileref.sas
@li mf_isblank.sas
@li mp_abort.sas @li mp_abort.sas
@param metaloc= the metadata folder to export
@param secureref= fileref containing the username / password (should point to @param [in] metaloc= the metadata folder to export
a file in a secure location). Leave blank to substitute $bash type vars. @param [in] secureref= fileref containing the username / password (should
@param outref= fileref to which to write the command point to a file in a secure location). Leave blank to substitute $bash vars.
@param cmdoutloc= the directory to which the command will write the SPK @param [in] excludevars= (0) A space seperated list of macro variable names,
(default=WORK) each of which contains a value that should be used to filter the output
@param cmdoutname= the name of the spk / log files to create (will be objects.
identical just with .spk or .log extension) @param [out] outref= fileref to which to write the command
@param [out] cmdoutloc= (%sysfunc(pathname(work))) The directory to which the
command will write the SPK
@param [out] cmdoutname= (mmxport) The name of the spk / log files to create
(will be identical just with .spk or .log extension)
@version 9.4 @version 9.4
@author Allan Bowe @author Allan Bowe
@@ -71,6 +76,7 @@
%macro mm_spkexport(metaloc= %macro mm_spkexport(metaloc=
,secureref= ,secureref=
,excludevars=0
,outref= ,outref=
,cmdoutloc=%sysfunc(pathname(work)) ,cmdoutloc=%sysfunc(pathname(work))
,cmdoutname=mmxport ,cmdoutname=mmxport
@@ -82,7 +88,7 @@
%end; %end;
/* set creds */ /* set creds */
%local mmxuser mmxpath; %local mmxuser mmxpath i var;
%let mmxuser=$1; %let mmxuser=$1;
%let mmxpass=$2; %let mmxpass=$2;
%if %mf_isblank(&secureref)=0 %then %do; %if %mf_isblank(&secureref)=0 %then %do;
@@ -90,35 +96,43 @@
%end; %end;
/* setup metadata connection options */ /* setup metadata connection options */
%local host port platform_object_path connx_string; %local host port platform_object_path ds;
%let host=%sysfunc(getoption(metaserver)); %let host=%sysfunc(getoption(metaserver));
%let port=%sysfunc(getoption(metaport)); %let port=%sysfunc(getoption(metaport));
%let platform_object_path=%mf_loc(POF); %let platform_object_path=%mf_loc(POF);
%let ds=%mf_getuniquename(prefix=spkexportable);
%let connx_string=%str(-host &host -port &port -user &mmxuser %trim( %mm_tree(root=%str(&metaloc) ,types=EXPORTABLE ,outds=&ds)
)-password &mmxpass);
%mm_tree(root=%str(&metaloc) ,types=EXPORTABLE ,outds=exportable)
%if %mf_isblank(&outref)=1 %then %let outref=%mf_getuniquefileref(); %if %mf_isblank(&outref)=1 %then %let outref=%mf_getuniquefileref();
data _null_; data _null_;
set exportable end=last; set &ds end=last;
file &outref lrecl=32767; file &outref lrecl=32767;
length str $32767; length str $32767;
if _n_=1 then do; if _n_=1 then do;
put "cd ""&platform_object_path"" \"; put "cd ""&platform_object_path"" \";
put "; ./ExportPackage &connx_string -disableX11 \"; put "; ./ExportPackage -host &host -port &port -user &mmxuser \";
put " -package ""&cmdoutloc/&cmdoutname..spk"" \"; put " -disableX11 -password &mmxpass \"
put " -package ""&cmdoutloc/&cmdoutname..spk"" \";
end; end;
/* exclude particular patterns from the exported SPK */
%if "&excludevars" ne "0" %then %do;
/* ignore top level folder else all subcontent will be exported regardless */
if _n_>1;
%do i=1 %to %sysfunc(countw(&excludevars));
%let var=%scan(&excludevars,&i);
if index(path,symget("&var")) ne 0;
%end;
%end;
str=' -objects '!!cats('"',path,'/',name,"(",publictype,')" \'); str=' -objects '!!cats('"',path,'/',name,"(",publictype,')" \');
put str; put str;
if last then put " -log ""&cmdoutloc/&cmdoutname..log"" 2>&1 "; if last then put " -log ""&cmdoutloc/&cmdoutname..log"" 2>&1 ";
run; run;
%mp_abort(iftrue= (&syscc ne 0) %mp_abort(iftrue= (&syscc ne 0)
,mac=&sysmacroname ,mac=mm_spkexport
,msg=%str(syscc=&syscc) ,msg=%str(syscc=&syscc)
) )
%mend mm_spkexport; %mend mm_spkexport;

41
tests/sas9only/mm_spkexport.test.sas Normal file
View File

@@ -0,0 +1,41 @@
/**
@file
@brief Testing mm_webout macro
<h4> SAS Macros </h4>
@li mm_spkexport.sas
@li mp_assert.sas
@li mp_as
**/
%* create sample text file as input to the macro;
filename tmp temp;
data _null_;
file tmp;
put '%let mmxuser="sasdemo";';
put '%let mmxpass="Mars321";';
run;
filename myref "%sysfunc(pathname(work))/mmxexport.sh"
permission='A::u::rwx,A::g::r-x,A::o::---';
%mp_assertscope(SNAPSHOT)
%mm_spkexport(metaloc=%str(/Shared Data)
,outref=myref
,secureref=tmp
,cmdoutloc=%str(/tmp)
)
%mp_assertscope(COMPARE)
data _null_;
infile tmp;
input;
putlog _infile_;
call symputx('nobs',_n_);
run;
%mp_assert(
iftrue=(&nobs>2),
desc=Check if content was created
)

3
viya/mv_createwebservice.sas
View File

@@ -655,7 +655,8 @@ data _null_;
put ' %else %if %symexist(&metavar) %then %do; '; put ' %else %if %symexist(&metavar) %then %do; ';
put ' %if %length(&&&metavar)=0 %then %let user=&sysuserid; '; put ' %if %length(&&&metavar)=0 %then %let user=&sysuserid; ';
put ' /* sometimes SAS will add @domain extension - remove for consistency */ '; put ' /* sometimes SAS will add @domain extension - remove for consistency */ ';
put ' %else %let user=%scan(&&&metavar,1,@); '; put ' /* but be sure to quote in case of usernames with commas */ ';
put ' %else %let user=%unquote(%scan(%quote(&&&metavar),1,@)); ';
put ' %end; '; put ' %end; ';
put ' %else %let user=&sysuserid; '; put ' %else %let user=&sysuserid; ';
put ' '; put ' ';