From 4b558948d997f456ff25a12a58827fe0d2075493 Mon Sep 17 00:00:00 2001 From: allan Date: Wed, 4 Jun 2025 13:27:28 +0100 Subject: [PATCH] fix: updating pipeline to default to streaming on viya Also added error captures on makedata --- .gitea/workflows/release.yaml | 14 +++---- sas/package-lock.json | 16 +++----- sas/package.json | 2 +- sas/sasjs/sasjsconfig.json | 8 ++++ .../viya/services_viya/admin/makedata.sas | 39 ++++++++++++++++++- 5 files changed, 59 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 947d8cd..faa19b2 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -239,18 +239,18 @@ jobs: rm -rf sasjsbuild/tests sed -i -e 's/servertype="SASJS"/servertype="SASVIYA"/g' sasjsbuild/services/clickme.html sasjs b -t viya - cp sasjsbuild/viya.sas ./demostream_viya.sas + cp sasjsbuild/viya.sas ./viya.sas # compile Viya Full deploy (without web) rm -rf sasjsbuild/services/web rm sasjsbuild/services/clickme.html sasjs b -t viya - cp sasjsbuild/viya.sas ./viya.sas - cp sasjsbuild/viya.json ./viya.json + cp sasjsbuild/viya.sas ./viya_noweb.sas + cp sasjsbuild/viya.json ./viya_noweb.json - name: Zip Frontend (including viya.json for full viya deploy) run: | cd sas - cp sasjsbuild/viya.json ../client/dist + cp sasjsbuild/viya.json ../client/dist/viya.json cd .. zip -r frontend.zip ./client/dist @@ -277,8 +277,8 @@ jobs: URL="https://git.datacontroller.io/api/v1/repos/dc/dc/releases/$RELEASE_ID/assets?access_token=${{ secrets.RELEASE_TOKEN }}" curl -k $URL -F attachment=@frontend.zip curl -k $URL -F attachment=@sas/demostream_sas9.sas - curl -k $URL -F attachment=@sas/demostream_viya.sas + curl -k $URL -F attachment=@sas/viya.sas curl -k $URL -F attachment=@sas/sasjs_server.json.zip curl -k $URL -F attachment=@sas/sas9.sas - curl -k $URL -F attachment=@sas/viya.sas - curl -k $URL -F attachment=@sas/viya.json + curl -k $URL -F attachment=@sas/viya_noweb.sas + curl -k $URL -F attachment=@sas/viya_noweb.json diff --git a/sas/package-lock.json b/sas/package-lock.json index b62cde4..497b66b 100644 --- a/sas/package-lock.json +++ b/sas/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "dc-sas", "dependencies": { - "@sasjs/cli": "^4.12.5", + "@sasjs/cli": "^4.12.7", "@sasjs/core": "^4.58.1" } }, @@ -45,14 +45,14 @@ } }, "node_modules/@sasjs/cli": { - "version": "4.12.5", - "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.12.5.tgz", - "integrity": "sha512-y6JFATKlTyTl0gRPpDBPL1rwZsyeuyp5uEz7HMA7raSzQuNa6QZ1oO1Er91I7+cLUg0Ndh5aSNGKYOdBRStQ2g==", + "version": "4.12.7", + "resolved": "https://registry.npmjs.org/@sasjs/cli/-/cli-4.12.7.tgz", + "integrity": "sha512-KcXSR+3dRgINOLiN+7oJbzWsNQu7qm1YQ7eaVqiHTZI429BSgZez9+7p1bq09R4otHN8IzMAgLP9se/r9p9yJA==", "hasInstallScript": true, "license": "ISC", "dependencies": { "@sasjs/adapter": "4.11.3", - "@sasjs/core": "4.57.0", + "@sasjs/core": "4.58.1", "@sasjs/lint": "2.4.3", "@sasjs/utils": "3.5.2", "adm-zip": "0.5.10", @@ -76,12 +76,6 @@ "sasjs": "build/index.js" } }, - "node_modules/@sasjs/cli/node_modules/@sasjs/core": { - "version": "4.57.0", - "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.57.0.tgz", - "integrity": "sha512-iJiLnW4oY15InGerXXWtrjc1YpJ9UDz72+r7Odfr/yYR7RxIhtXGjYQIqyQu6US+cS/0b2pi12LZB6VnfMS/pA==", - "license": "MIT" - }, "node_modules/@sasjs/core": { "version": "4.58.1", "resolved": "https://registry.npmjs.org/@sasjs/core/-/core-4.58.1.tgz", diff --git a/sas/package.json b/sas/package.json index acedbba..fa046bc 100644 --- a/sas/package.json +++ b/sas/package.json @@ -28,7 +28,7 @@ }, "private": true, "dependencies": { - "@sasjs/cli": "^4.12.5", + "@sasjs/cli": "^4.12.7", "@sasjs/core": "^4.58.1" } } diff --git a/sas/sasjs/sasjsconfig.json b/sas/sasjs/sasjsconfig.json index 7498b43..1161b8f 100644 --- a/sas/sasjs/sasjsconfig.json +++ b/sas/sasjs/sasjsconfig.json @@ -127,6 +127,14 @@ "sasjs/utils/viyadeploy.sh" ] }, + "streamConfig": { + "streamWeb": true, + "streamWebFolder": "web", + "webSourcePath": "../client/dist", + "streamServiceName": "DC", + "streamLogo": "favicon.ico", + "assetPaths": [] + }, "contextName": "SAS Job Execution compute context" }, { diff --git a/sas/sasjs/targets/viya/services_viya/admin/makedata.sas b/sas/sasjs/targets/viya/services_viya/admin/makedata.sas index 440ca2b..fc9c4c3 100644 --- a/sas/sasjs/targets/viya/services_viya/admin/makedata.sas +++ b/sas/sasjs/targets/viya/services_viya/admin/makedata.sas @@ -7,6 +7,7 @@ @li mf_getapploc.sas @li mf_mkdir.sas @li mf_trimstr.sas + @li mp_abort.sas @li mpe_getvars.sas @li mpe_makedata.sas @li mpe_makedatamodel.sas @@ -50,9 +51,33 @@ options noquotelenmax; %put &=admin; %mf_mkdir(&dcpath) +%mp_abort(iftrue= (&syscc ne 0) + ,mac=&_program + ,msg=%str(Unable to create &dcpath using &sysuserid) +) %mf_mkdir(&dcpath/secret) %mf_mkdir(&dcpath/dc_staging) +/* check we have physical permissions to the DCLIB folder */ +data _null_; + putlog "dcpath=&dcpath/permTest.txt"; + putlog "sysuserid=&sysuserid"; +data _null_; + file "&dcpath/permTest.txt"; +run; +%mp_abort(iftrue= (&syscc ne 0) + ,mac=&_program + ,msg=%str(User &sysuserid does not have WRITE permissions to: &dcpath ) +) +filename delfile "&dcpath/permTest.txt"; +data _null_; + rc=fdelete('delfile'); +run; +%mp_abort(iftrue= (&syscc ne 0) + ,mac=&_program..sas + ,msg=%str(User &sysuserid could create (but not delete) &dcpath/permTest.txt ) +) + libname &dclib "&dcpath"; %global admin; @@ -60,11 +85,23 @@ libname &dclib "&dcpath"; %mpe_makedatamodel(lib=&dclib) %mpe_makedata(lib=&dclib,mpeadmins=&admin,path=%str(&dcpath)) +%mp_abort(iftrue=(&syscc ne 0) + ,mac=&sysmacroname + ,msg=%str(Err during &dclib build) +) + + /* sample data library */ %mf_mkdir(&dcpath/dc_demo) libname dcdemo "&dcpath/dc_demo"; %mpe_makesampledata(outlib=DCDEMO) +%mp_abort(iftrue=(&syscc ne 0) + ,mac=&sysmacroname + ,msg=%str(Err during demo data build) +) + + /* the DC precode is stored in the root of the project */ %let root=%mf_getapploc(&_program)/services; %put &=root; @@ -167,7 +204,7 @@ run; */ %mp_abort(iftrue=(&syscc ne 0) ,mac=&sysmacroname - ,msg=%str(Err during DB build) + ,msg=%str(Err during settings job creation) )