mirror of
https://github.com/sasjs/adapter.git
synced 2026-01-16 08:30:07 +00:00
feat(job-pid): added print PID of the executed job
This commit is contained in:
2
.env
Normal file
2
.env
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
SERVER_URL=https://sas.analytium.co.uk
|
||||||
|
DEFAULT_COMPUTE_CONTEXT=SAS Studio compute context
|
||||||
2
.env.example
Normal file
2
.env.example
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
SERVER_URL=https://server.com
|
||||||
|
DEFAULT_COMPUTE_CONTEXT=SAS Studio compute context
|
||||||
4610
package-lock.json
generated
4610
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -39,6 +39,7 @@
|
|||||||
"@types/isomorphic-fetch": "0.0.35",
|
"@types/isomorphic-fetch": "0.0.35",
|
||||||
"@types/jest": "^26.0.15",
|
"@types/jest": "^26.0.15",
|
||||||
"cp": "^0.2.0",
|
"cp": "^0.2.0",
|
||||||
|
"dotenv": "^8.2.0",
|
||||||
"jest": "^25.5.4",
|
"jest": "^25.5.4",
|
||||||
"path": "^0.12.7",
|
"path": "^0.12.7",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
@@ -57,6 +58,7 @@
|
|||||||
},
|
},
|
||||||
"main": "index.js",
|
"main": "index.js",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@sasjs/utils": "^1.5.0",
|
||||||
"es6-promise": "^4.2.8",
|
"es6-promise": "^4.2.8",
|
||||||
"form-data": "^3.0.0",
|
"form-data": "^3.0.0",
|
||||||
"isomorphic-fetch": "^2.2.1"
|
"isomorphic-fetch": "^2.2.1"
|
||||||
|
|||||||
@@ -16,12 +16,13 @@ import {
|
|||||||
Folder,
|
Folder,
|
||||||
CsrfToken,
|
CsrfToken,
|
||||||
EditContextInput,
|
EditContextInput,
|
||||||
ErrorResponse,
|
|
||||||
JobDefinition,
|
JobDefinition,
|
||||||
PollOptions
|
PollOptions
|
||||||
} from './types'
|
} from './types'
|
||||||
import { formatDataForRequest } from './utils/formatDataForRequest'
|
import { formatDataForRequest } from './utils/formatDataForRequest'
|
||||||
import { SessionManager } from './SessionManager'
|
import { SessionManager } from './SessionManager'
|
||||||
|
import { timestampToYYYYMMDDHHMMSS } from '@sasjs/utils/time'
|
||||||
|
import { Logger, LogLevel } from '@sasjs/utils/logger'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A client for interfacing with the SAS Viya REST API.
|
* A client for interfacing with the SAS Viya REST API.
|
||||||
@@ -460,6 +461,26 @@ export class SASViyaApiClient {
|
|||||||
|
|
||||||
executionSessionId = session!.id
|
executionSessionId = session!.id
|
||||||
|
|
||||||
|
const { result: jobIdVariable } = await this.sessionManager.getVariable(
|
||||||
|
executionSessionId,
|
||||||
|
'SYSJOBID',
|
||||||
|
accessToken
|
||||||
|
)
|
||||||
|
|
||||||
|
if (jobIdVariable && jobIdVariable.value) {
|
||||||
|
const relativeJobPath = this.rootFolderName
|
||||||
|
? jobPath.split(this.rootFolderName).join('').replace(/^\//, '')
|
||||||
|
: jobPath
|
||||||
|
|
||||||
|
const logger = new Logger(debug ? LogLevel.Debug : LogLevel.Info)
|
||||||
|
|
||||||
|
logger.info(
|
||||||
|
`Triggered '${relativeJobPath}' with PID ${
|
||||||
|
jobIdVariable.value
|
||||||
|
} at ${timestampToYYYYMMDDHHMMSS()}`
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
const jobArguments: { [key: string]: any } = {
|
const jobArguments: { [key: string]: any } = {
|
||||||
_contextName: contextName,
|
_contextName: contextName,
|
||||||
_OMITJSONLISTING: true,
|
_OMITJSONLISTING: true,
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { Session, Context, CsrfToken } from './types'
|
import { Session, Context, CsrfToken, SessionVariable } from './types'
|
||||||
import { asyncForEach, makeRequest, isUrl } from './utils'
|
import { asyncForEach, makeRequest, isUrl } from './utils'
|
||||||
|
import { prefixMessage } from '@sasjs/utils/error'
|
||||||
|
|
||||||
const MAX_SESSION_COUNT = 1
|
const MAX_SESSION_COUNT = 1
|
||||||
const RETRY_LIMIT: number = 3
|
const RETRY_LIMIT: number = 3
|
||||||
@@ -265,4 +266,21 @@ export class SessionManager {
|
|||||||
throw err
|
throw err
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async getVariable(sessionId: string, variable: string, accessToken?: string) {
|
||||||
|
const getSessionVariable = {
|
||||||
|
method: 'GET',
|
||||||
|
headers: this.getHeaders(accessToken)
|
||||||
|
}
|
||||||
|
|
||||||
|
return await this.request<SessionVariable>(
|
||||||
|
`${this.serverUrl}/compute/sessions/${sessionId}/variables/${variable}`,
|
||||||
|
getSessionVariable
|
||||||
|
).catch((err) => {
|
||||||
|
throw prefixMessage(
|
||||||
|
err,
|
||||||
|
`Error while fetching session variable '${variable}'.`
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
53
src/test/SessionManager.spec.ts
Normal file
53
src/test/SessionManager.spec.ts
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
import { SessionManager } from '../SessionManager'
|
||||||
|
import * as dotenv from 'dotenv'
|
||||||
|
|
||||||
|
describe('SessionManager', () => {
|
||||||
|
dotenv.config()
|
||||||
|
|
||||||
|
let originalFetch: any
|
||||||
|
|
||||||
|
const sessionManager = new SessionManager(
|
||||||
|
process.env.SERVER_URL as string,
|
||||||
|
process.env.DEFAULT_COMPUTE_CONTEXT as string,
|
||||||
|
() => {}
|
||||||
|
)
|
||||||
|
|
||||||
|
beforeAll(() => {
|
||||||
|
originalFetch = (global as any).fetch
|
||||||
|
})
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
;(global as any).fetch = originalFetch
|
||||||
|
})
|
||||||
|
|
||||||
|
describe('getVariable', () => {
|
||||||
|
it('should fetch session variable', async () => {
|
||||||
|
const sampleResponse = {
|
||||||
|
ok: true,
|
||||||
|
links: [],
|
||||||
|
name: 'SYSJOBID',
|
||||||
|
scope: 'GLOBAL',
|
||||||
|
value: '25218',
|
||||||
|
version: 1
|
||||||
|
}
|
||||||
|
|
||||||
|
;(global as any).fetch = jest.fn().mockImplementation(() =>
|
||||||
|
Promise.resolve({
|
||||||
|
ok: true,
|
||||||
|
headers: { get: () => '' },
|
||||||
|
json: () => Promise.resolve(sampleResponse)
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
const expectedResponse = { etag: '', result: sampleResponse }
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
sessionManager.getVariable(
|
||||||
|
'fakeSessionId',
|
||||||
|
'SYSJOBID',
|
||||||
|
'fakeAccessToken'
|
||||||
|
)
|
||||||
|
).resolves.toEqual(expectedResponse)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
@@ -9,3 +9,7 @@ export interface Session {
|
|||||||
}
|
}
|
||||||
creationTimeStamp: string
|
creationTimeStamp: string
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface SessionVariable {
|
||||||
|
value: string
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user