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

draft: fix upload-charm #146

Closed
wants to merge 13 commits into from
Closed

draft: fix upload-charm #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c34a90b
wip
orfeas-k Jul 5, 2024
ac52aa0
wip
orfeas-k Jul 8, 2024
4f43e03
wip: structuredClone
orfeas-k Jul 8, 2024
38b5b3b
remove console.log
orfeas-k Jul 8, 2024
25fcf00
use getExecOutput
orfeas-k Jul 8, 2024
245356e
remove buildStaticFlags & fetchFileFlags
orfeas-k Jul 8, 2024
9cc7f25
refactor and handle errors
orfeas-k Jul 9, 2024
772413b
refactor
orfeas-k Jul 9, 2024
2f8656a
refactor
orfeas-k Jul 9, 2024
3106e76
refactor
orfeas-k Jul 9, 2024
73a47ea
fix
orfeas-k Jul 9, 2024
c0ff0c4
fix
orfeas-k Jul 9, 2024
cc23d11
fix tests
orfeas-k Jul 10, 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
29 changes: 21 additions & 8 deletions dist/channel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42758,13 +42758,24 @@ class Charmcraft {
.filter(([name]) => !overrides || !Object.keys(overrides).includes(name))
.map(([name, image]) => __awaiter(this, void 0, void 0, function* () {
if (this.uploadImage) {
yield this.uploadResource(image, charmName, name);
const { exitCode, stdout, stderr } = yield this.uploadResource(image, charmName, name);
if (exitCode !== 0) {
throw new Error(`Could not upload resource with error ${stderr}`);
}
const { revision } = JSON.parse(stdout);
const flag = `--resource=${name}:${revision}`;
const info = ` - ${name}: ${image}\n` +
` resource-revision: ${revision}\n`;
flags.push(flag);
resourceInfo += info;
}
else {
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
}
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
})));
return { flags, resourceInfo };
});
Expand Down Expand Up @@ -42806,13 +42817,15 @@ class Charmcraft {
const resourceDigest = yield (0, docker_1.getImageDigest)(resource_image);
const args = [
'upload-resource',
'--quiet',
'--format',
'json',
name,
resource_name,
'--image',
resourceDigest,
];
yield (0, exec_1.exec)('charmcraft', args, this.execOptions);
const execOutput = yield (0, exec_1.getExecOutput)('charmcraft', args, this.execOptions);
return execOutput;
});
}
buildResourceFlag(charmName, name, image) {
Expand Down
29 changes: 21 additions & 8 deletions dist/check-libraries/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42953,13 +42953,24 @@ class Charmcraft {
.filter(([name]) => !overrides || !Object.keys(overrides).includes(name))
.map(([name, image]) => __awaiter(this, void 0, void 0, function* () {
if (this.uploadImage) {
yield this.uploadResource(image, charmName, name);
const { exitCode, stdout, stderr } = yield this.uploadResource(image, charmName, name);
if (exitCode !== 0) {
throw new Error(`Could not upload resource with error ${stderr}`);
}
const { revision } = JSON.parse(stdout);
const flag = `--resource=${name}:${revision}`;
const info = ` - ${name}: ${image}\n` +
` resource-revision: ${revision}\n`;
flags.push(flag);
resourceInfo += info;
}
else {
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
}
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
})));
return { flags, resourceInfo };
});
Expand Down Expand Up @@ -43001,13 +43012,15 @@ class Charmcraft {
const resourceDigest = yield (0, docker_1.getImageDigest)(resource_image);
const args = [
'upload-resource',
'--quiet',
'--format',
'json',
name,
resource_name,
'--image',
resourceDigest,
];
yield (0, exec_1.exec)('charmcraft', args, this.execOptions);
const execOutput = yield (0, exec_1.getExecOutput)('charmcraft', args, this.execOptions);
return execOutput;
});
}
buildResourceFlag(charmName, name, image) {
Expand Down
29 changes: 21 additions & 8 deletions dist/promote-charm/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42837,13 +42837,24 @@ class Charmcraft {
.filter(([name]) => !overrides || !Object.keys(overrides).includes(name))
.map(([name, image]) => __awaiter(this, void 0, void 0, function* () {
if (this.uploadImage) {
yield this.uploadResource(image, charmName, name);
const { exitCode, stdout, stderr } = yield this.uploadResource(image, charmName, name);
if (exitCode !== 0) {
throw new Error(`Could not upload resource with error ${stderr}`);
}
const { revision } = JSON.parse(stdout);
const flag = `--resource=${name}:${revision}`;
const info = ` - ${name}: ${image}\n` +
` resource-revision: ${revision}\n`;
flags.push(flag);
resourceInfo += info;
}
else {
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
}
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
})));
return { flags, resourceInfo };
});
Expand Down Expand Up @@ -42885,13 +42896,15 @@ class Charmcraft {
const resourceDigest = yield (0, docker_1.getImageDigest)(resource_image);
const args = [
'upload-resource',
'--quiet',
'--format',
'json',
name,
resource_name,
'--image',
resourceDigest,
];
yield (0, exec_1.exec)('charmcraft', args, this.execOptions);
const execOutput = yield (0, exec_1.getExecOutput)('charmcraft', args, this.execOptions);
return execOutput;
});
}
buildResourceFlag(charmName, name, image) {
Expand Down
29 changes: 21 additions & 8 deletions dist/release-charm/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42849,13 +42849,24 @@ class Charmcraft {
.filter(([name]) => !overrides || !Object.keys(overrides).includes(name))
.map(([name, image]) => __awaiter(this, void 0, void 0, function* () {
if (this.uploadImage) {
yield this.uploadResource(image, charmName, name);
const { exitCode, stdout, stderr } = yield this.uploadResource(image, charmName, name);
if (exitCode !== 0) {
throw new Error(`Could not upload resource with error ${stderr}`);
}
const { revision } = JSON.parse(stdout);
const flag = `--resource=${name}:${revision}`;
const info = ` - ${name}: ${image}\n` +
` resource-revision: ${revision}\n`;
flags.push(flag);
resourceInfo += info;
}
else {
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
}
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
})));
return { flags, resourceInfo };
});
Expand Down Expand Up @@ -42897,13 +42908,15 @@ class Charmcraft {
const resourceDigest = yield (0, docker_1.getImageDigest)(resource_image);
const args = [
'upload-resource',
'--quiet',
'--format',
'json',
name,
resource_name,
'--image',
resourceDigest,
];
yield (0, exec_1.exec)('charmcraft', args, this.execOptions);
const execOutput = yield (0, exec_1.getExecOutput)('charmcraft', args, this.execOptions);
return execOutput;
});
}
buildResourceFlag(charmName, name, image) {
Expand Down
29 changes: 21 additions & 8 deletions dist/release-libraries/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42980,13 +42980,24 @@ class Charmcraft {
.filter(([name]) => !overrides || !Object.keys(overrides).includes(name))
.map(([name, image]) => __awaiter(this, void 0, void 0, function* () {
if (this.uploadImage) {
yield this.uploadResource(image, charmName, name);
const { exitCode, stdout, stderr } = yield this.uploadResource(image, charmName, name);
if (exitCode !== 0) {
throw new Error(`Could not upload resource with error ${stderr}`);
}
const { revision } = JSON.parse(stdout);
const flag = `--resource=${name}:${revision}`;
const info = ` - ${name}: ${image}\n` +
` resource-revision: ${revision}\n`;
flags.push(flag);
resourceInfo += info;
}
else {
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
}
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
})));
return { flags, resourceInfo };
});
Expand Down Expand Up @@ -43028,13 +43039,15 @@ class Charmcraft {
const resourceDigest = yield (0, docker_1.getImageDigest)(resource_image);
const args = [
'upload-resource',
'--quiet',
'--format',
'json',
name,
resource_name,
'--image',
resourceDigest,
];
yield (0, exec_1.exec)('charmcraft', args, this.execOptions);
const execOutput = yield (0, exec_1.getExecOutput)('charmcraft', args, this.execOptions);
return execOutput;
});
}
buildResourceFlag(charmName, name, image) {
Expand Down
29 changes: 21 additions & 8 deletions dist/upload-bundle/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42828,13 +42828,24 @@ class Charmcraft {
.filter(([name]) => !overrides || !Object.keys(overrides).includes(name))
.map(([name, image]) => __awaiter(this, void 0, void 0, function* () {
if (this.uploadImage) {
yield this.uploadResource(image, charmName, name);
const { exitCode, stdout, stderr } = yield this.uploadResource(image, charmName, name);
if (exitCode !== 0) {
throw new Error(`Could not upload resource with error ${stderr}`);
}
const { revision } = JSON.parse(stdout);
const flag = `--resource=${name}:${revision}`;
const info = ` - ${name}: ${image}\n` +
` resource-revision: ${revision}\n`;
flags.push(flag);
resourceInfo += info;
}
else {
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
}
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
})));
return { flags, resourceInfo };
});
Expand Down Expand Up @@ -42876,13 +42887,15 @@ class Charmcraft {
const resourceDigest = yield (0, docker_1.getImageDigest)(resource_image);
const args = [
'upload-resource',
'--quiet',
'--format',
'json',
name,
resource_name,
'--image',
resourceDigest,
];
yield (0, exec_1.exec)('charmcraft', args, this.execOptions);
const execOutput = yield (0, exec_1.getExecOutput)('charmcraft', args, this.execOptions);
return execOutput;
});
}
buildResourceFlag(charmName, name, image) {
Expand Down
37 changes: 29 additions & 8 deletions dist/upload-charm/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42547,16 +42547,24 @@ class UploadCharmAction {
const imageResults = yield this.charmcraft.uploadResources(overrides);
const fileResults = yield this.charmcraft.fetchFileFlags(overrides);
const staticResults = this.charmcraft.buildStaticFlags(overrides);
// console.log('fileResults:');
// console.log(fileResults);
// console.log('staticResults:');
// console.log(staticResults);
const resourceInfo = [
imageResults.resourceInfo,
fileResults.resourceInfo,
staticResults.resourceInfo,
].join('\n');
// console.log('resourceInfo:');
// console.log(resourceInfo);
const flags = [
...imageResults.flags,
...fileResults.flags,
...staticResults.flags,
];
// console.log('flags:');
// console.log(flags);
// If there are multiple charm files, we upload them one by one, so that the file
// released at last(which determines the version under 'platform' shown on Charmhub UI)
// is consistent for a charm.
Expand Down Expand Up @@ -42868,13 +42876,24 @@ class Charmcraft {
.filter(([name]) => !overrides || !Object.keys(overrides).includes(name))
.map(([name, image]) => __awaiter(this, void 0, void 0, function* () {
if (this.uploadImage) {
yield this.uploadResource(image, charmName, name);
const { exitCode, stdout, stderr } = yield this.uploadResource(image, charmName, name);
if (exitCode !== 0) {
throw new Error(`Could not upload resource with error ${stderr}`);
}
const { revision } = JSON.parse(stdout);
const flag = `--resource=${name}:${revision}`;
const info = ` - ${name}: ${image}\n` +
` resource-revision: ${revision}\n`;
flags.push(flag);
resourceInfo += info;
}
else {
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
}
const resourceFlag = yield this.buildResourceFlag(charmName, name, image);
if (!resourceFlag)
return;
flags.push(resourceFlag.flag);
resourceInfo += resourceFlag.info;
})));
return { flags, resourceInfo };
});
Expand Down Expand Up @@ -42916,13 +42935,15 @@ class Charmcraft {
const resourceDigest = yield (0, docker_1.getImageDigest)(resource_image);
const args = [
'upload-resource',
'--quiet',
'--format',
'json',
name,
resource_name,
'--image',
resourceDigest,
];
yield (0, exec_1.exec)('charmcraft', args, this.execOptions);
const execOutput = yield (0, exec_1.getExecOutput)('charmcraft', args, this.execOptions);
return execOutput;
});
}
buildResourceFlag(charmName, name, image) {
Expand Down
8 changes: 8 additions & 0 deletions src/actions/upload-charm/upload-charm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,26 @@ export class UploadCharmAction {
const imageResults = await this.charmcraft.uploadResources(overrides);
const fileResults = await this.charmcraft.fetchFileFlags(overrides);
const staticResults = this.charmcraft.buildStaticFlags(overrides);
// console.log('fileResults:');
// console.log(fileResults);
// console.log('staticResults:');
// console.log(staticResults);

const resourceInfo = [
imageResults.resourceInfo,
fileResults.resourceInfo,
staticResults.resourceInfo,
].join('\n');
// console.log('resourceInfo:');
// console.log(resourceInfo);

const flags = [
...imageResults.flags,
...fileResults.flags,
...staticResults.flags,
];
// console.log('flags:');
// console.log(flags);

// If there are multiple charm files, we upload them one by one, so that the file
// released at last(which determines the version under 'platform' shown on Charmhub UI)
Expand Down
Loading
Loading