Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(cli): enhance file copy function of k8 class based on status code #758

Merged
merged 2 commits into from
Feb 14, 2024
Merged

fix(cli): enhance file copy function of k8 class based on status code #758

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
744ac10
fix: enhance hasDir and copyTo functionalities of k8s
leninmehedy Feb 13, 2024
ac38388
Merge branch 'main' into code-cleanup-2
leninmehedy Feb 14, 2024
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
110 changes: 54 additions & 56 deletions solo/src/core/k8.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,16 +371,11 @@ export class K8 {
* @return {Promise<boolean>}
*/
async hasDir (podName, containerName, destPath) {
const parentDir = path.dirname(destPath)
const dirName = path.basename(destPath)
const entries = await this.listDir(podName, containerName, parentDir)
for (const item of entries) {
if (item.name === dirName && item.directory) {
return true
}
}

return false
return await this.execContainer(
podName,
containerName,
['bash', '-c', '[[ -d "' + destPath + '" ]] && echo -n "true" || echo -n "false"']
) === 'true'
}

/**
Expand Down Expand Up @@ -420,23 +415,16 @@ export class K8 {
const command = ['tar', 'xf', '-', '-C', destDir]
const readStream = fs.createReadStream(tmpFile)
const errStream = new sb.WritableStreamBuffer()
const fileStat = fs.statSync(srcPath)
let statusError = null

execInstance.exec(namespace, podName, containerName, command, null, errStream, readStream, false, async ({ status }) => {
if (status === 'Failure' || errStream.size()) {
statusError = new Error(`Error from copyToPod - details: \n ${errStream.getContentsAsString()}`)
}
}).then(conn => {
conn.on('close', async () => {
self._deleteTempFile(tmpFile)

if (statusError) {
return reject(new FullstackTestingError(`failed to copy because of error: ${statusError.message}`, statusError))
execInstance.exec(namespace, podName, containerName, command, null, errStream, readStream, false,
async ({ status }) => {
if (status === 'Failure' || errStream.size()) {
self._deleteTempFile(tmpFile)
}

if (!await self.hasFile(podName, containerName, destPath, { size: fileStat.size })) {
return reject(new FullstackTestingError(`failed to find file after copy: ${destPath}`))
}).then(conn => {
conn.on('close', async (code, reason) => {
if (code !== 1000) { // code 1000 is the success code
return reject(new FullstackTestingError(`failed to copy because of error (${code}): ${reason}`))
}

return resolve(true)
Expand Down Expand Up @@ -494,44 +482,54 @@ export class K8 {
const command = ['tar', 'zcf', '-', '-C', srcDir, srcFile]
const writerStream = fs.createWriteStream(tmpFile)
const errStream = new sb.WritableStreamBuffer()
let statusError = null

execInstance.exec(namespace, podName, containerName, command, writerStream, errStream, null, false, async ({ status }) => {
writerStream.close()
if (status === 'Failure' || errStream.size()) {
statusError = new Error(`Error from copyFromPod - details: \n ${errStream.getContentsAsString()}`)
self._deleteTempFile(tmpFile)
}
}).then(conn => {
conn.on('close', async () => {
if (statusError) {
return reject(new FullstackTestingError(`failed to copy because of error: ${statusError.message}`, statusError))
}

// extract the downloaded file
await tar.x({
file: tmpFile,
cwd: destDir
})

self._deleteTempFile(tmpFile)

const stat = fs.statSync(destPath)
if (stat && stat.size === srcFileSize) {
return resolve(true)
execInstance.exec(
namespace,
podName,
containerName,
command,
writerStream,
errStream,
null,
false,
async ({ status }) => {
writerStream.close()
if (status === 'Failure' || errStream.size()) {
self._deleteTempFile(tmpFile)
}

return reject(new FullstackTestingError(`failed to download file completely: ${destPath}`))
})
.then(conn => {
conn.on('close', async (code, reason) => {
if (code !== 1000) { // code 1000 is the success code
return reject(new FullstackTestingError(`failed to copy because of error (${code}): ${reason}`))
}

// extract the downloaded file
await tar.x({
file: tmpFile,
cwd: destDir
})

self._deleteTempFile(tmpFile)

const stat = fs.statSync(destPath)
if (stat && stat.size === srcFileSize) {
return resolve(true)
}

return reject(new FullstackTestingError(`failed to download file completely: ${destPath}`))
})

conn.on('error', (e) => {
self._deleteTempFile(tmpFile)
return reject(new FullstackTestingError(`failed to copy file ${destPath} because of connection error: ${e.message}`, e))
conn.on('error', (e) => {
self._deleteTempFile(tmpFile)
return reject(new FullstackTestingError(
`failed to copy file ${destPath} because of connection error: ${e.message}`, e))
})
})
})
})
} catch (e) {
throw new FullstackTestingError(`failed to download file from ${podName}:${containerName} [${srcPath} -> ${destDir}]: ${e.message}`, e)
throw new FullstackTestingError(
`failed to download file from ${podName}:${containerName} [${srcPath} -> ${destDir}]: ${e.message}`, e)
}
}

Expand Down
Loading