Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cromwell-sdk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liugaoling
cromwell-sdk
Commits
ea51d68e
Commit
ea51d68e
authored
Jun 15, 2022
by
liugaoling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
workspace use url
parent
d5ebc1a0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
CloudamClient.java
src/main/java/com/cloudam/cromwell/CloudamClient.java
+2
-3
CreateJobRequest.java
...main/java/com/cloudam/cromwell/core/CreateJobRequest.java
+1
-0
HttpUtil.java
src/main/java/com/cloudam/cromwell/http/HttpUtil.java
+2
-2
No files found.
src/main/java/com/cloudam/cromwell/CloudamClient.java
View file @
ea51d68e
...
@@ -25,7 +25,7 @@ public class CloudamClient {
...
@@ -25,7 +25,7 @@ public class CloudamClient {
public
CloudamClient
(
String
env
,
String
accessToken
)
{
public
CloudamClient
(
String
env
,
String
accessToken
)
{
this
.
workSpace
=
env
;
this
.
workSpace
=
env
;
this
.
accessToken
=
accessToken
;
this
.
accessToken
=
accessToken
;
auth
();
//
auth();
}
}
private
void
auth
()
{
private
void
auth
()
{
...
@@ -42,12 +42,11 @@ public class CloudamClient {
...
@@ -42,12 +42,11 @@ public class CloudamClient {
}
}
public
<
T
extends
CloudamResponse
>
T
doAction
(
CloudamRequest
<
T
>
cloudamRequest
)
{
public
<
T
extends
CloudamResponse
>
T
doAction
(
CloudamRequest
<
T
>
cloudamRequest
)
{
String
baseUrl
=
WorkSpaceFactory
.
getBaseUrl
(
this
.
workSpace
);
CloudamResponse
cloudamResponse
=
null
;
CloudamResponse
cloudamResponse
=
null
;
Response
response
=
null
;
Response
response
=
null
;
try
{
try
{
Request
.
Builder
request
=
cloudamRequest
.
getBuilder
(
HttpUtil
.
getBuilder
(
this
.
accessToken
),
baseUrl
,
cloudamRequest
);
Request
.
Builder
request
=
cloudamRequest
.
getBuilder
(
HttpUtil
.
getBuilder
(
this
.
accessToken
),
this
.
workSpace
,
cloudamRequest
);
response
=
HttpUtil
.
execNormalHttpRequest
(
request
,
3
);
response
=
HttpUtil
.
execNormalHttpRequest
(
request
,
3
);
if
(
response
!=
null
&&
response
.
code
()
==
200
&&
response
.
body
()
!=
null
)
{
if
(
response
!=
null
&&
response
.
code
()
==
200
&&
response
.
body
()
!=
null
)
{
Job
job
=
JSON
.
parseObject
(
response
.
body
().
bytes
(),
Job
.
class
);
Job
job
=
JSON
.
parseObject
(
response
.
body
().
bytes
(),
Job
.
class
);
...
...
src/main/java/com/cloudam/cromwell/core/CreateJobRequest.java
View file @
ea51d68e
...
@@ -76,6 +76,7 @@ public class CreateJobRequest extends CloudamRequest<CreateJobResponse> {
...
@@ -76,6 +76,7 @@ public class CreateJobRequest extends CloudamRequest<CreateJobResponse> {
};
};
stringValidAppend
.
accept
(
jobDescription
.
getName
(),
"-J"
);
stringValidAppend
.
accept
(
jobDescription
.
getName
(),
"-J"
);
stringValidAppend
.
accept
(
jobDescription
.
getAutoCluster
().
getPartition
(),
"-p"
);
stringValidAppend
.
accept
(
jobDescription
.
getAutoCluster
().
getPartition
(),
"-p"
);
stringValidAppend
.
accept
(
"workflowJobId="
+
jobDescription
.
getWorkflowJobId
(),
"--export"
);
intValidAppend
.
accept
(
jobDescription
.
getCpus
(),
"-c"
);
intValidAppend
.
accept
(
jobDescription
.
getCpus
(),
"-c"
);
intValidAppend
.
accept
(
jobDescription
.
getGpus
(),
"-g"
);
intValidAppend
.
accept
(
jobDescription
.
getGpus
(),
"-g"
);
...
...
src/main/java/com/cloudam/cromwell/http/HttpUtil.java
View file @
ea51d68e
...
@@ -17,8 +17,8 @@ public class HttpUtil {
...
@@ -17,8 +17,8 @@ public class HttpUtil {
public
static
Request
.
Builder
getBuilder
(
String
accessToken
)
{
public
static
Request
.
Builder
getBuilder
(
String
accessToken
)
{
return
new
Request
.
Builder
()
return
new
Request
.
Builder
()
.
addHeader
(
"Content-Type"
,
"application/json"
)
.
addHeader
(
"Content-Type"
,
"application/json"
)
;
.
addHeader
(
"authorization"
,
"Bearer "
+
accessToken
);
//
.addHeader("authorization", "Bearer " + accessToken);
}
}
public
static
Response
execNormalHttpRequest
(
Request
.
Builder
builder
,
int
MAX_RETRIES
)
{
public
static
Response
execNormalHttpRequest
(
Request
.
Builder
builder
,
int
MAX_RETRIES
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment