Skip to content
This repository has been archived by the owner on Apr 10, 2024. It is now read-only.

Stable URLs, s3 link improvements #79

Merged
merged 112 commits into from
Jun 3, 2021
Merged
Changes from 1 commit
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
6b175b4
add uat base urls and buckets
bsatoriu Sep 1, 2020
576730d
config-based urls: maapsec
bsatoriu Sep 3, 2020
eba71a7
dps_magic readme typo
bsatoriu Sep 3, 2020
9e7a70c
config based urls: submit_jobs
bsatoriu Sep 3, 2020
0ccb33b
config based urls: dps_info
bsatoriu Sep 3, 2020
17650c7
config based urls: pull_projects
bsatoriu Sep 3, 2020
bc6ca56
revert timeout setting change
bsatoriu Sep 4, 2020
c919de0
config based urls: ssh_info
bsatoriu Sep 4, 2020
d646937
add default_host field for explicitness
bsatoriu Sep 4, 2020
a561ee3
remove hard coded url from dps_info client
bsatoriu Sep 4, 2020
88ea828
clean up hard coded url references
bsatoriu Sep 4, 2020
f89c0fc
remove unnecessary state param
bsatoriu Sep 4, 2020
ac59521
Merge pull request #69 from MAAP-Project/maap-uat-environment
bsatoriu Sep 4, 2020
f61ebbd
Update dps_magic to use maap_environments.json
bsatoriu Sep 4, 2020
363756a
send presigned s3 url req to maap api
bsatoriu Sep 5, 2020
2ec6707
fix ci build error
bsatoriu Sep 5, 2020
2d4cfc2
Update entrypoint.sh
bsatoriu Sep 5, 2020
dac03ca
Replace statedb environment with server lookup
bsatoriu Sep 6, 2020
732dfe7
replace env statedb with server lookup
bsatoriu Sep 6, 2020
4959737
set ade_server in client once during startup
bsatoriu Sep 6, 2020
66c39fe
Merge pull request #71 from MAAP-Project/maap-env-improvements-dev
bsatoriu Sep 6, 2020
646ba92
fix keycloak callback error
bsatoriu Sep 7, 2020
a9c0a6e
Merge pull request #72 from MAAP-Project/maap-env-improvements-dev
bsatoriu Sep 7, 2020
7f346a7
submit jobs convert to tabs to spaces
echyam Sep 8, 2020
e501551
fix submit jobs getMetrics result key
echyam Sep 10, 2020
bc1d4f7
fix dps_info ref to state
echyam Sep 10, 2020
1859425
Use maap-py for MAAP API (#73)
echyam Sep 15, 2020
dd3464b
move edsc url to configuration file
bsatoriu Sep 16, 2020
1c59a75
Merge branch 'develop' of https://github.com/MAAP-Project/maap-jupyte…
bsatoriu Sep 16, 2020
2b3c631
Registration updates (#74)
echyam Sep 18, 2020
4485f3e
make maap-users org folder read-only
echyam Sep 22, 2020
efaeefc
Fix IStateDB bug
bsatoriu Sep 28, 2020
a095383
Merge branch 'develop' of https://github.com/MAAP-Project/maap-jupyte…
bsatoriu Sep 28, 2020
ab42429
update hello-world url regex to allow git token in url
echyam Sep 29, 2020
816fa4c
fix org bucket mount line
echyam Sep 30, 2020
f09820b
update ops search port to 30052
mayadebellis Oct 1, 2020
a88ce27
Parse new api xml format (#76)
echyam Oct 14, 2020
329572f
comment out yaml overwrite for now
bsatoriu Oct 16, 2020
30e91b2
changing default env to ops for now
bsatoriu Oct 16, 2020
206805f
Fix terminal webapp setting
bsatoriu Oct 26, 2020
645b3c3
Update entrypoint.sh
bsatoriu Oct 27, 2020
d666176
s3link checks if path is folder or if file in valid directory (#77)
echyam Oct 27, 2020
87eccd1
user s3 folder is from under maap-users, debugging presigned s3 url
echyam Oct 27, 2020
65b292e
s3 url needed profile token, not proxy-ticket
echyam Oct 27, 2020
285f415
revert change having s3 folders point to same prefix
echyam Oct 27, 2020
9370868
remove tabs side panel wip
echyam Oct 29, 2020
add4141
s3 url handler using wrong token name to get orgs
echyam Nov 3, 2020
d728e4c
pass token to get s3url
echyam Nov 3, 2020
d53e600
getOrgs token different from API proxy-ticket
echyam Nov 3, 2020
a531cee
debugging
echyam Nov 3, 2020
eee0652
check s3 paths against mounted paths instead of orgs call
echyam Nov 9, 2020
f45a81c
decode output for string manipulation
echyam Nov 9, 2020
55ed6a8
typo
echyam Nov 10, 2020
98f64ba
parse df command for mounted folders only
echyam Nov 10, 2020
50957dc
remove unused variable
echyam Nov 10, 2020
b4d283e
add selector for s3 link expiration time
echyam Nov 10, 2020
92b985a
typo
echyam Nov 11, 2020
a2d74b1
Add text reminding s3link expiration
echyam Nov 11, 2020
6766b9c
add button to copy s3 link to clipboard
echyam Nov 11, 2020
59f77bf
fix copy s3link to clipboard
echyam Nov 12, 2020
c8e361c
rm unused code and only show copy s3 link button if there is a valid …
echyam Nov 13, 2020
5456ea4
Merge branch 'master' into develop
echyam Nov 13, 2020
4852468
remove duplicated code from merge
echyam Nov 17, 2020
780492c
add a few lines about 3d data (#81)
mayadebellis Jan 5, 2021
a339be2
Update maap code snippet to include default url
bsatoriu Jan 5, 2021
bdb3707
Merge branch 'master' into develop
mayadebellis Jan 19, 2021
8dc0d95
Update entrypoint.sh
bsatoriu Jan 24, 2021
db73683
Add comment to che machine name env selector
bsatoriu Jan 25, 2021
351516f
Add che7 test config
bsatoriu Feb 2, 2021
9a33df3
Don't use the default maap-py api host
bsatoriu Feb 3, 2021
dd4108d
Fix devche7 letter case
bsatoriu Feb 4, 2021
ebbc2c2
Update README.md
bsatoriu Feb 4, 2021
c9b8a9d
remove password file, replace with iam roles
mayadebellis Feb 18, 2021
6aa3459
change edsc sever port
mayadebellis Feb 18, 2021
2417127
remove references to che installers
mayadebellis Feb 18, 2021
09c4fc1
Update workspace bucket
bsatoriu Feb 18, 2021
7b9c025
Remove s3fs password file reference
bsatoriu Feb 18, 2021
a9a8f4e
repo.uat.maap-project.org
bsatoriu Feb 18, 2021
0f9923f
Update README.md
bsatoriu Feb 18, 2021
f0299fa
Update handlers.py
bsatoriu Feb 18, 2021
43fbd6b
Missed one
bsatoriu Feb 18, 2021
c9f739b
Merge branch 'develop' into update-s3fs
bsatoriu Feb 18, 2021
a1c3520
Merge pull request #83 from MAAP-Project/update-s3fs
bsatoriu Feb 18, 2021
e81bdc8
Update supported MAS domains
bsatoriu Feb 18, 2021
24b05c1
remove references to che installers (#84)
mayadebellis Feb 20, 2021
addc7d3
replace org mount with shared workspace mount
bsatoriu Feb 22, 2021
db76eae
start ssh in entrypoint, add username namespace
mayadebellis Feb 22, 2021
9537a27
Revert shared ws mount and remove read-only
bsatoriu Feb 22, 2021
786bede
fix merge conflict
mayadebellis Feb 22, 2021
b9822fb
Merge pull request #85 from MAAP-Project/update-ssh-info
mayadebellis Feb 22, 2021
c744647
Replace memory with queue
bsatoriu Feb 24, 2021
5f75847
switch from ip address of worker to host address of ade
mayadebellis Feb 24, 2021
105ff7e
update pull projects for che7
mayadebellis Feb 25, 2021
482242b
Dev update
bsatoriu Mar 3, 2021
7eb0448
Readme
bsatoriu Mar 3, 2021
c1fe2c3
Updated entrypoint.sh to make the fix to run Jupyter under Che in 'si…
gchang Mar 16, 2021
8d4a7cf
Update entrypoint.sh
gchang Mar 17, 2021
fa8d269
fix key error in pull projects when no proj exists
mayadebellis Mar 24, 2021
272a32a
Update maap_environments.json
bsatoriu Mar 31, 2021
79f77a6
Added the inline python code to generate the url prefix (#86)
gchang Apr 8, 2021
c7b5bdb
Fixed entrypoint.sh to work in the current UAT environment too
gchang Apr 8, 2021
9664628
remove s3fs and mounting refernces (#87)
mayadebellis Apr 8, 2021
8b1ef82
Reattempt PREVIEW_URL fetch on failure
bsatoriu May 4, 2021
5fea174
update ssh service to find nodeport (#88)
mayadebellis May 5, 2021
f3cb328
remove sucess message that actually fails
mayadebellis May 5, 2021
765251e
Merge branch 'develop' of https://github.com/MAAP-Project/maap-jupyte…
mayadebellis May 5, 2021
3628dc2
Add workspace argument to presigned s3 url paths
bsatoriu May 20, 2021
c1418a4
Fix environment pre-ops 'workspace_bucket' name
bsatoriu May 20, 2021
90a8c23
Remove timestamp from algo reg
bsatoriu May 27, 2021
fcb91db
Merge branch 'develop' of https://github.com/MAAP-Project/maap-jupyte…
bsatoriu May 27, 2021
e253de5
update readme
mayadebellis Jun 3, 2021
543de23
Merge branch 'master' into develop
mayadebellis Jun 3, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove unnecessary state param
  • Loading branch information
bsatoriu committed Sep 4, 2020

Verified

This commit was signed with the committer’s verified signature.
commit f89c0fcb35ca9f9e102d561f9b23e105176a1632
8 changes: 3 additions & 5 deletions submit_jobs/src/funcs.ts
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ export async function getUsernameToken(state: IStateDB, profileId:string, callba
let uname:string = 'anonymous';
let ticket:string = '';
const opts = await getRequestOptions(state);

if ("https://" + opts.headers['Maap_ade_server'] === document.location.origin) {
getUserInfo(function(profile: any) {
if (profile['cas:username'] === undefined) {
@@ -62,9 +62,7 @@ export async function getAlgorithms(state: IStateDB, ticket?:string) {
});
}

export async function getDefaultValues(state: IStateDB, code_path) {

const opts = await getRequestOptions(state);
export async function getDefaultValues(code_path) {

return new Promise<{[k:string]:string}>((resolve, reject) => {
var defaultValues:{[k:string]:string} = {}
@@ -73,7 +71,7 @@ export async function getDefaultValues(state: IStateDB, code_path) {
var valuesUrl = new URL(PageConfig.getBaseUrl() + 'hysds/defaultValues');
valuesUrl.searchParams.append('code_path', code_path);
console.log(valuesUrl.href);
request('get',valuesUrl.href, {}, {}, opts).then((res: RequestResult) => {
request('get',valuesUrl.href).then((res: RequestResult) => {
if (res.ok) {
var json_response:any = res.json();
var values = json_response['default_values'];
2 changes: 1 addition & 1 deletion submit_jobs/src/selector.ts
Original file line number Diff line number Diff line change
@@ -167,7 +167,7 @@ export class ProjectSelector extends Widget {
}

} else if (this.type == 'register') {
getDefaultValues(this._state, opt).then((defaultValues) => {
getDefaultValues(opt).then((defaultValues) => {
console.log(defaultValues);
console.log('create register');
let w = new RegisterWidget(this._fields,this._username,this._ticket,defaultValues);