Commit 8b5ca7a3 authored by Chris Hines's avatar Chris Hines
Browse files

missed the actual changes to use src/deployments instead of fileReplacement

parent 3089cdfc
Pipeline #17286 passed with stages
in 9 minutes and 9 seconds
// All of the Node.js APIs are available in the preload process.
// It has the same sandbox as a Chrome extension.
import { contextBridge, IpcRenderer } from 'electron';
const ipcRenderer: IpcRenderer = require('electron').ipcRenderer;
contextBridge.exposeInMainWorld(
'electronApi',
{
addCert: (data: any, fn: () => void): void => { addCert(data, fn) },
register_oauth2_redirect: (fn: (arg0: string) => void): void => {register_oauth2_redirect(fn)}
}
)
function addCert(data: any, fn: any): void {
ipcRenderer.once('addCertResponse', (event, ...args) => fn() )
ipcRenderer.send('addCert', (data));
}
function register_oauth2_redirect(fn: (arg0: string) => void ): void {
ipcRenderer.once('oauth2-redirect',(event, url) => fn(url));
}
[
{
"name": "Dev",
"tes": "https://strudel2-api-dev.cloud.cvl.org.au/tes",
"tws": "https://strudel2-api-dev.cloud.cvl.org.au"
},
{
"name": "Beta",
"tes": "https://beta-api.desktop.massive.org.au/tes",
"tws": "https://beta-api.desktop.massive.org.au"
},
{
"name": "Dev - Pawsey",
"tes": "https://strudel2-api-dev-pawsey.cloud.cvl.org.au/tes",
"tws": "https://strudel2-api-dev-pawsey.cloud.cvl.org.au"
},
{
"name": "localhost",
"tes": "http://localhost:8080",
"tws": "http://localhost:8090"
}
]
[
{
"url": "https://strudel2-api-dev.cloud.cvl.org.au/m3/",
"name": "M3",
"host": "m3.massive.org.au",
"dtn": "m3-dtn1.massive.org.au",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"appCatalog": [],
"appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps-dev",
"cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson",
"cacheturis": ["/assets/config/incidents.json"],
"contact": "<MASSIVE Support> help@massive.org.au"
},
{
"url": "https://strudel2-api-dev.cloud.cvl.org.au/m3/",
"name": "OzStar",
"host": "ozstar.swin.edu.au",
"dtn": "ozstar.swin.edu.au",
"cafingerprint": "RSA SHA256:gK5t29EO9zIbWartnIFIpzewWQcPWpj2D9nZ9HOS29Y",
"appCatalog": [],
"appCatalogCmd": "cat /dagg/strudel/dev/apps.json",
"cancelcmd": "/dagg/strudel/dev/bin/s2cancel {jobid}",
"statcmd": "/dagg/strudel/dev/bin/s2stat",
"userhealth": "/dagg/strudel/dev/bin/uijson",
"cacheturis": [],
"contact": "<OzStar Support> hpc-support@swin.edu.au"
}
]
[
{ "url": null,
"name": "Desktop",
"startscript": "#!/bin/bash\n/usr/local/sv2/desktop/desktop.slurm\n ",
"paramscmd": "/usr/local/sv2/desktop/params.py",
"client": {"cmd": null, "redir": "vnc.html?password={password}" },
"localbind": true,
"applist": null
},
{
"url": null,
"name": "Jupyter Lab",
"startscript": "#!/bin/bash\n/usr/local/sv2/jupyter/jupyter.slurm\n",
"paramscmd": "/usr/local/sv2/jupyter/jupyter_params.py",
"client": {"cmd": null, "redir": "?token={token}"},
"localbind": true,
"applist": null
},
{
"url": null,
"name": "R Studio Server",
"startscript": "#!/bin/bash\n/usr/local/sv2/rstudioserver/run.sh\n",
"paramscmd": "/usr/local/sv2/rstudioserver/params.py",
"client": {"cmd": null, "redir": ""},
"localbind": true,
"applist": null
},
{ "url": "transfer",
"name": "Transfer files",
"startscript": "#!/bin/bash\n echo '{appparams}' > ft.json",
"paramscmd": "/usr/local/sv2/copytool.py",
"client": {"cmd": null, "redir": null },
"localbind": true,
"applist": null
}
]
[
{ "name": "divider"},
{ "url": null,
"name": "Desktop",
"startscript": "#!/bin/bash\n/usr/local/sv2/dev/desktop/desktop.slurm\n ",
"appactions": [
],
"instactions": [
{
"name": "Connect",
"paramscmd": "/usr/local/sv2/dev/desktop/params.py {jobid}",
"client": {"cmd": null, "redir": "vnc.html?password={password}" },
"states": ["RUNNING"]
},
{
"name": "Connect (local viewer)",
"paramscmd": "/usr/local/sv2/dev/desktop/vncparams.py {jobid}",
"client": {"cmd": "vnclaunch.py {localport} {password}", "redir": null },
"states": ["RUNNING"],
"localapi": true
},
{
"name": "View log",
"paramscmd": "/usr/local/sv2/dev/desktop/logparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["RUNNING","Finished"]
},
{
"name": "View Usage",
"paramscmd": "/usr/local/sv2/dev/desktop/usageparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["Finished"]
},
{
"name": "Remove log",
"paramscmd": "/usr/local/sv2/dev/rmlog.py {jobid}",
"client": null,
"notunnel": true,
"states": ["Finished"]
}
],
"localbind": true,
"applist": null
},
{ "url": null,
"name": "Terminal",
"startscript": "#!/bin/bash\n/usr/local/sv2/dev/smux/smux.sbatch",
"appactions": [
{
"name": "Run on Login Node",
"paramscmd": "/usr/local/sv2/dev/smux/term_params.py 1",
"client": {"cmd": null, "redir": "tmux?token={token}"},
"states": null
}
],
"instactions": [
{
"name": "Connect",
"paramscmd": "/usr/local/sv2/dev/smux/params.py {jobid}",
"client": {"cmd": null, "redir": "tmux?token={token}"},
"states": ["RUNNING"]
},
{
"name": "Remove log",
"paramscmd": "/usr/local/sv2/dev/rmlog.py {jobid}",
"client": null,
"notunnel": true,
"states": ["Finished"]
}
],
"localbind": true,
"applist": null
},
{ "url": null,
"name": "VS Code",
"startscript": null,
"appactions": [
{
"name": "Run on Login Node",
"paramscmd": "/home/chines/startvscode",
"client": {"cmd": null, "redir": "login?to=%2F"},
"states": null,
"postData": {
"base": "/",
"password": "{password}"
}
}
],
"localbind": true,
"applist": null
},
{
"url": null,
"name": "Jupyter Lab",
"url": null,
"name": "Jupyter Lab",
"startscript": "#!/bin/bash\nmodule load singularity\nsingularity exec -B /projects:/projects -B /scratch:/scratch -B /usr/local:/usr/local /usr/local/sv2/jupyter/jupyter.sif /start",
"instactions": [
{
"name": "Connect",
"paramscmd": "module load singularity\nsingularity exec /usr/local/sv2/jupyter/jupyter.sif /params {jobid}",
"client": {"cmd": null, "redir": "?token={token}"},
"states": ["RUNNING"]
},
{
"name": "View log",
"paramscmd": "/usr/local/sv2/dev/desktop/logparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["RUNNING","Finished"]
},
{
"name": "View Usage",
"paramscmd": "/usr/local/sv2/dev/desktop/usageparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["Finished"]
},
{
"name": "Remove log",
"paramscmd": "/usr/local/sv2/dev/rmlog.py {jobid}",
"client": null,
"notunnel": true,
"states": ["Finished"]
}
],
"localbind": true,
"applist": null
},
{
"url": null,
"name": "Jupyter Lab - custom venv",
"startscript": "#!/bin/bash\n/usr/local/sv2/jupyter/jupyter_custom.sh\n",
"instactions": [
{
"name": "Connect",
"paramscmd": "/usr/local/sv2/dev/jupyter/jupyter_params.py {jobid}",
"client": {"cmd": null, "redir": "?token={token}"},
"states": ["RUNNING"]
},
{
"name": "View log",
"paramscmd": "/usr/local/sv2/dev/desktop/logparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["RUNNING","Finished"]
},
{
"name": "View Usage",
"paramscmd": "/usr/local/sv2/dev/desktop/usageparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["Finished"]
},
{
"name": "Remove log",
"paramscmd": "/usr/local/sv2/dev/rmlog.py {jobid}",
"client": null,
"states": ["Finished"],
"notunnel": true
}
],
"desc": "To run your own installation of jupyter you must first <ul> <li> Install Jupyter </li> <li> Create a file called <code>~/.jupytervenv</code> containg the path where you installed. For example if you have the program <code>/home/user/myenv/bin/jupyter</code>, you would put <code>/home/user/myenv</code> in that file.</li></ul>",
"localbind": true,
"applist": null
},
{
"url": null,
"name": "CryoSPARC",
"startscript": null,
"instactions": [ {
"name": "Connect",
"paramscmd": "/usr/local/sv2/dev/cryosparc/cryosparc_params.py",
"client": {"cmd": null, "redir": ""}
}],
"localbind": true,
"applist": null
},
{"name": "divider"},
{
"url": null,
"name": "History",
"startscript": "#!/bin/bash\n/usr/local/sv2/dev/desktop/desktop.slurm\n ",
"instactions": [
{
"name": "Connect",
"paramscmd": "/usr/local/sv2/dev/jupyter/jupyter_params.py {jobid}",
"client": {"cmd": null, "redir": "?token={token}"},
"states": ["RUNNING"]
},
{
"name": "View Usage",
"paramscmd": "/usr/local/sv2/dev/desktop/usageparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["Finished"]
},
{
"name": "Remove log",
"paramscmd": "/usr/local/sv2/dev/rmlog.py {jobid}",
"client": null,
"notunnel": true,
"states": ["Finished"]
}
],
"localbind": true,
"applist": null
},
{ "url": "transfer",
"name": "Transfer files",
"startscript": "#!/bin/bash\n echo '{appparams}' > ft.json",
"paramscmd": "/usr/local/sv2/copytool.py",
"client": {"cmd": null, "redir": null },
"localbind": true,
"applist": null
},
{ "url": null,
"name": "File Explorer",
"startscript": "#!/bin/bash\n/usr/local/sv2/cloudcmd/start.sh\n ",
"instactions": [
{
"name": "Connect",
"paramscmd": "/usr/local/sv2/dev/cloudcmd/params.py {jobid}",
"client": {"cmd": null, "redir": "", "usebasicauth": true },
"states": ["RUNNING"]
},
{
"name": "View log",
"paramscmd": "/usr/local/sv2/dev/desktop/logparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["RUNNING","Finished"]
},
{
"name": "View Usage",
"paramscmd": "/usr/local/sv2/dev/desktop/usageparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["Finished"]
},
{
"name": "Remove log",
"paramscmd": "/usr/local/sv2/dev/rmlog.py {jobid}",
"client": null,
"notunnel": true,
"states": ["Finished"]
}
],
"localbind": true,
"applist": null
}
]
[
{
"name": "Monash",
"tes": "https://beta-api.cloud.cvl.org.au/tes",
"tws": "https://beta-api.cloud.cvl.org.au"
}
]
[
{
"authorise": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/",
"client_id": "Q96kt2Vtw6S78dpORktM81DH",
"sign": "https://sshauthz.cloud.cvl.org.au/pysshauthz/sign/monash_hpcid/api/v1/sign_key",
"logout": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/logout",
"name": "CVL",
"icon": null,
"scope": "user:email",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"desc": "<div>The Characterisation Virtual Laboratory remote desktop services are available here. The service provides software, data and compute for researchers in the Characterisation research community. For CVL desktop researchers from MASSIVE see <a href=https://www.massive.org.au>https://www.massive.org.au</a> for more information. For CVL desktop users from other infrastructures see <a href=https://www.cvl.org.au>https://www.cvl.org.au</a></div>"
}
]
[
{
"url": "https://beta-api.cloud.cvl.org.au/m3/",
"name": "M3",
"host": "m3.massive.org.au",
"dtn": "m3-dtn1.massive.org.au",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"appCatalog": [],
"appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps",
"cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"cacheturis": ["/assets/config/incidents.json"],
"userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson"
}
]
[
{
"name": "Testing",
"tes": "https://strudel2-api-test.cloud.cvl.org.au/tes",
"tws": "https://strudel2-api-test.cloud.cvl.org.au"
}
]
[
{
"authorise": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/",
"client_id": "Q96kt2Vtw6S78dpORktM81DH",
"sign": "https://sshauthz.cloud.cvl.org.au/pysshauthz/sign/monash_hpcid/api/v1/sign_key",
"logout": "https://sshauthz.cloud.cvl.org.au/pysshauthz/oauth2/logout",
"name": "CVL",
"icon": null,
"scope": "user:email",
"cafp": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"desc": "<div>The Characterisation Virtual Laboratory remote desktop services are available here. The service provides software, data and compute for researchers in the Characterisation research community. For CVL desktop researchers from MASSIVE see <a href=https://www.massive.org.au>https://www.massive.org.au</a> for more information. For CVL desktop users from other infrastructures see <a href=https://www.cvl.org.au>https://www.cvl.org.au</a></div>"
},
{
"authorise": "https://cvlgw.hpc.swin.edu.au/pysshauthz/oauth2/oauth/authorize/choose",
"base": "https://cvlgw.hpc.swin.edu.au/pysshauthz/oauth2/",
"client_id": "Q96kt2Vtw6S78dpORktM81DH",
"sign": "https://cvlgw.hpc.swin.edu.au/pysshauthz/sign/ozstar/api/v1/sign_key",
"logout": "https://cvlgw.hpc.swin.edu.au/pysshauthz/oauth2/logout",
"name": "OzStar",
"icon": null,
"scope": "user:email",
"cafp": "RSA SHA256:gK5t29EO9zIbWartnIFIpzewWQcPWpj2D9nZ9HOS29Y",
"desc": "<div><div>Log into OzStar@Swinburne University</div></div>"
}
]
[
{
"url": "https://beta-api.cloud.cvl.org.au/m3/",
"name": "M3",
"host": "m3.massive.org.au",
"dtn": "m3-dtn1.massive.org.au",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"appCatalog": [],
"appCatalogCmd": "/usr/local/strudel2_cluster/latest/bin/getapps",
"cancelcmd": "/usr/local/strudel2_cluster/latest/bin/s2cancel {jobid}",
"statcmd": "/usr/local/strudel2_cluster/latest/bin/s2stat",
"cacheturis": ["/assets/config/incidents.json"],
"userhealth": "/usr/local/clusterinfo/0.0.6/bin/uijson"
},
{
"url": "https://beta-api.cloud.cvl.org.au/cvluwa/",
"name": "CVL@UWA",
"host": "146.118.65.246",
"dtn": "146.118.65.242",
"cafingerprint": "ECDSA SHA256:6wVXdokvvlTNcXPMc9KyvIXA8a8XNfLuhBfNOYeeMdg",
"appCatalog": [],
"appCatalogCmd": "/home/strudel2/bin/getapps",
"cancelcmd": "/home/strudel2/bin/s2cancel {jobid}",
"statcmd": "/home/strudel2/bin/s2stat",
"userhealth": "/home/strudel2/bin/uijson",
"cacheturis": [],
"contact": "<CVL@UWA Support> help@massive.org.au"
}
]
[
{ "url": null,
"name": "Desktop",
"startscript": "#!/bin/bash\n/usr/local/sv2/desktop/desktop.slurm\n ",
"paramscmd": "/usr/local/sv2/desktop/params.py",
"client": {"cmd": null, "redir": "vnc.html?password={password}" },
"localbind": true,
"applist": null
},
{
"url": null,
"name": "Jupyter Lab",
"startscript": "#!/bin/bash\n/usr/local/sv2/jupyter/jupyter.slurm\n",
"paramscmd": "/usr/local/sv2/jupyter/jupyter_params.py",
"client": {"cmd": null, "redir": "?token={token}"},
"localbind": true,
"applist": null
},
{
"url": null,
"name": "R Studio Server",
"startscript": "#!/bin/bash\n/usr/local/sv2/rstudioserver/run.sh\n",
"paramscmd": "/usr/local/sv2/rstudioserver/params.py",
"client": {"cmd": null, "redir": ""},
"localbind": true,
"applist": null
},
{ "url": "transfer",
"name": "Transfer files",
"startscript": "#!/bin/bash\n echo '{appparams}' > ft.json",
"paramscmd": "/usr/local/sv2/copytool.py",
"client": {"cmd": null, "redir": null },
"localbind": true,
"applist": null
}
]
[
{ "name": "divider"},
{ "url": null,
"name": "Desktop",
"startscript": "#!/bin/bash\n/usr/local/sv2/desktop/desktop.slurm\n ",
"appactions": [
],
"instactions": [ {
"name": "Connect",
"paramscmd": "/usr/local/sv2/desktop/params.py {jobid}",
"client": {"cmd": null, "redir": "vnc.html?password={password}" },
"states": ["RUNNING"]
},
{
"name": "View log",
"paramscmd": "/usr/local/sv2/dev/desktop/logparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["RUNNING","Finished"]
},
{
"name": "View Usage",
"paramscmd": "/usr/local/sv2/dev/desktop/usageparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["Finished"]
},
{
"name": "Remove log",
"paramscmd": "/usr/local/sv2/dev/rmlog.py {jobid}",
"client": null,
"notunnel": true,
"states": ["Finished"]
}
],
"localbind": true,
"applist": null
},
{
"url": null,
"name": "Jupyter Lab",
"startscript": "#!/bin/bash\nmodule load singularity\nsingularity exec /usr/local/sv2/juflocu.sif /start",
"instactions": [
{
"name": "Connect",
"paramscmd": "/usr/local/sv2/jupyter/jupyter_params.py {jobid}",
"client": {"cmd": null, "redir": "?token={token}"},
"states": ["RUNNING"]
},
{
"name": "View log",
"paramscmd": "/usr/local/sv2/dev/desktop/logparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["RUNNING","COMPLETED"]
},
{
"name": "View Usage",
"paramscmd": "/usr/local/sv2/dev/desktop/usageparams.py {jobid}",
"client": {"cmd": null, "redir": "index.html?token={token}" },
"states": ["Finished"]
},
{