cloudron 5.11.7 → 5.11.9

package/bin/cloudron-appstore

@@ -32,11 +32,12 @@ program.command('info')
 program.command('approve')
     .description('Approve a submitted app version')
     .option('--appstore-id <appid@version>', 'Appstore id and version')
+    .option('--no-git-push', 'Do not attempt to push to git repo')
     .action(appstoreActions.approve);
 
-program.command('tag <version>')
-    .description('Tag the repo')
-    .action(appstoreActions.tag);
+program.command('notify')
+    .description('Notify forum about successful app submission')
+    .action(appstoreActions.notify);
 
 program.command('revoke')
     .description('Revoke a published app version')

package/bin/cloudron-build

@@ -45,6 +45,7 @@ program.command('push')
     .option('--id <buildid>', 'Build ID')
     .option('--repository [repository url]', 'Set repository to push to. e.g registry/username/projectname')
     .option('--tag <docker image tag>', 'Docker image tag. Note that this does not include the repository name')
+    .option('--image <docker image>', 'Docker image of the form registry/repo:tag')
     .action(buildActions.push);
 
 program.command('status')

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "cloudron",
-  "version": "5.11.7",
+  "version": "5.11.9",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
-  "homepage": "https://git.cloudron.io/cloudron/cloudron-cli",
+  "homepage": "https://git.cloudron.io/platform/cloudron-cli",
   "repository": {
     "type": "git",
-    "url": "https://git.cloudron.io/cloudron/cloudron-cli.git"
+    "url": "https://git.cloudron.io/platform/cloudron-cli.git"
   },
   "scripts": {
     "test": "mocha test/test.js"
@@ -18,7 +18,7 @@
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
     "async": "^3.2.5",
-    "cloudron-manifestformat": "^5.24.0",
+    "cloudron-manifestformat": "^5.26.2",
     "commander": "^12.1.0",
     "debug": "^4.3.5",
     "easy-table": "^1.2.0",

package/src/appstore-actions.js

@@ -25,7 +25,7 @@ exports = module.exports = {
     revoke,
     approve,
 
-    tag
+    notify
 };
 
 const NO_MANIFEST_FOUND_ERROR_STRING = 'No CloudronManifest.json found';
@@ -280,8 +280,19 @@ async function upload(localOptions, cmd) {
     const appConfig = config.getAppConfig(sourceDir);
 
     // image can be passed in options for buildbot
-    const dockerImage = options.image ? options.image : appConfig.dockerImage;
-    manifest.dockerImage = dockerImage;
+    if (options.image) {
+        manifest.dockerImage = options.image;
+    } else {
+        const gitCommit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim();
+        if (appConfig.gitCommit !== gitCommit) {
+            console.log(`This build ${appConfig.dockerImage} was made from git hash ${appConfig.gitCommit} but you are now at ${gitCommit}`);
+            if (!appConfig.gitCommit) return exit('The build is stale');
+            const output = execSync(`git diff ${appConfig.gitCommit}..HEAD --name-only`, { encoding: 'utf8'});
+            const changedFiles = output.trim().split('\n').filter(filepath => !filepath.match(/(^CHANGELOG|README|CloudronManifest|test\|.git|screenshots|renovate|LICENSE|POSTINSTALL|.docker|logo)/));
+            if (changedFiles.length) return exit(`The build is stale. Changed files: ${changedFiles.join(',')}`);
+        }
+        manifest.dockerImage = appConfig.dockerImage;
+    }
 
     if (!manifest.dockerImage) exit('No docker image found, run `cloudron build` first');
 
@@ -291,6 +302,10 @@ async function upload(localOptions, cmd) {
     const error = manifestFormat.checkAppstoreRequirements(manifest);
     if (error) return exit(error);
 
+    const [repo, tag] = manifest.dockerImage.split(':');
+    const [tagError, tagResponse] = await safe(superagent.get(`https://hub.docker.com/v2/repositories/${repo}/tags/${tag}`).ok(() => true));
+    if (tagError || tagResponse.statusCode !== 200) return exit(`Failed to find docker image in dockerhub. check https://hub.docker.com/r/${repo}/tags : ${tagError || requestError(tagResponse)}`);
+
     // ensure the app is known on the appstore side
     const baseDir = path.dirname(manifestFilePath);
 
@@ -350,9 +365,32 @@ async function approve(localOptions, cmd) {
 
     console.log(`Approving ${appstoreId}@${version}`);
 
+    let defaultBranch, latestTag;
+    if (options.gitPush) {
+        // Git repo pre-flight checks: checking if latest tag matches latest commit
+        defaultBranch = safe.child_process.execSync(`git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'`, { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get default branch: ${safe.error.message}`);
+
+        const defaultBranchSha = safe.child_process.execSync(`git rev-parse ${defaultBranch}`, { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get head of ${defaultBranch}: ${safe.error.message}`);
+
+        latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get latest tag: ${safe.error.message}`);
+
+        const latestTagSha = safe.child_process.execSync(`git rev-list -n 1 ${latestTag}`, { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get head of ${defaultBranch}: ${safe.error.message}`);
+
+        if (defaultBranchSha !== latestTagSha) return exit(`Latest tag ${latestTag} does not match HEAD of ${defaultBranch}`);
+    }
+
     const response = await createRequest('POST', `/api/v1/developers/apps/${appstoreId}/versions/${version}/approve`, options);
     if (response.statusCode !== 200) return exit(`Failed to approve version: ${requestError(response)}`);
 
+    if (options.gitPush) {
+        safe.child_process.execSync(`git push --atomic origin ${defaultBranch} ${latestTag}`, { encoding: 'utf8' });
+        if (safe.error) return exit(`Failed to get last release tag: ${safe.error.message}`);
+    }
+
     console.log('Approved.');
     console.log('');
 
@@ -366,14 +404,11 @@ async function approve(localOptions, cmd) {
     console.log('');
 }
 
-async function tag(version) {
-    const basename = `${path.basename(process.cwd())}`;
-    if (!basename.endsWith('-app')) return exit('Does not look like a app repo. Has to end with -app');
-
-    if (!semver.valid(version)) return exit(`${version} is not a valid semver`);
-
-    const latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
-    if (safe.error) return exit(`Failed to get last release tag: ${safe.error.message}`);
+// https://docs.nodebb.org/api/read/
+// https://docs.nodebb.org/api/write/
+async function notify() {
+    if (!process.env.NODEBB_API_TOKEN) return exit('NODEBB_API_TOKEN env var has to be set');
+    const apiToken = process.env.NODEBB_API_TOKEN;
 
     const manifestFilePath = locateManifest();
     if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
@@ -382,48 +417,47 @@ async function tag(version) {
     if (result.error) return exit(new Error(`Invalid CloudronManifest.json: ${result.error.message}`));
     const { manifest } = result;
 
-    const latestVersion = latestTag.match(/v(.*)/)[1];
+    let postContent = null;
+    if (manifest.changelog.slice(0, 7) === 'file://') {
+        const baseDir = path.dirname(manifestFilePath);
+        let changelogPath = manifest.changelog.slice(7);
+        changelogPath = path.isAbsolute(changelogPath) ? changelogPath : path.join(baseDir, changelogPath);
+        const changelog = parseChangelog(changelogPath, manifest.version);
+        if (!changelog) return exit('Bad changelog format or missing changelog for this version');
+        postContent = `[${manifest.version}]\n${changelog}\n`;
+    } else {
+        postContent = `[${manifest.version}]\n${manifest.changelog}\n`;
+    }
 
-    if (semver.lte(version, latestVersion)) return exit(`${version} is less than or equal to last repo tag ${latestVersion}`);
-    if (semver.inc(latestVersion, 'major') !== version
-        && semver.inc(latestVersion, 'minor') !== version
-        && semver.inc(latestVersion, 'patch') !== version) {
-            return exit(`${version} is not the next major/minor/patch of last published version ${latestVersion}`);
+    if (!manifest.forumUrl) return exit(new Error('CloudronManifest.json does not have a forumUrl'));
+    const categoryMatch = manifest.forumUrl.match(/category\/(.*)\//);
+    if (!categoryMatch) return exit('Unable to detect category id');
+    const categoryId = categoryMatch[1];
+
+    const categoryResponse = await superagent.get(`https://forum.cloudron.io/api/v3/categories/${categoryId}/topics`).set('Authorization', `Bearer ${apiToken}`).ok(() => true);
+    if (categoryResponse.statusCode !== 200) return exit(`Unable to get topics of category: ${requestError(categoryResponse)}`);
+    const topic = categoryResponse.body.response.topics.find(t => t.title.includes('Package Updates'));
+    if (!topic) return exit('Could not find the Package Update topic');
+    const topicId = topic.tid;
+
+    const pageCountResponse = await superagent.get(`https://forum.cloudron.io/api/topic/pagination/${topicId}`).set('Authorization', `Bearer ${apiToken}`).ok(() => true);
+    if (pageCountResponse.statusCode !== 200) return exit(`Unable to get page count of topic: ${requestError(pageCountResponse)}`);
+    const pageCount = pageCountResponse.body.pagination.pageCount;
+
+    for (let page = 1; page <= pageCount; page++) {
+        const pageResponse = await superagent.get(`https://forum.cloudron.io/api/topic/${topicId}?page=${page}`).set('Authorization', `Bearer ${apiToken}`).ok(() => true);
+        if (pageResponse.statusCode !== 200) return exit(`Unable to get topics of category: ${requestError(pageResponse)}`);
+        for (const post of pageResponse.body.posts) { // post.content is html!
+            if (post.content.includes(`[${manifest.version}]`)) return exit(`Version ${manifest.version} is already on the forum.\n${post.content}`);
+        }
     }
 
-    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
-    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
-
-    const [ , , commitMessage ] = latestRenovateCommit.split(',');
-    const repoDir = path.dirname(manifestFilePath);
-    const upstreamVersion = commitMessage.match(/update dependency .* to (.*)/)[1];
-
-    console.log(`Enter the changelog for ${upstreamVersion}: (press ctrl+D to finish)`);
-    const rawChangelog = fs.readFileSync(0, 'utf-8');
-    const mdChangelog = rawChangelog.split('\n').map(line => {
-        line = line.trim();
-        line = line.replace(/[\u{0080}-\u{FFFF}]/gu, ''); // only ascii
-        line = line.replace(/^\* /, ''); // replace any "* " in the front
-        return line ? `* ${line}` : '';
-    }).join('\n');
-    const newChangelog = `\n[${version}]\n* Update ${manifest.title} to ${upstreamVersion}\n${mdChangelog}\n`;
-    const changelogFile = `${repoDir}/${manifest.changelog.replace('file://', '')}`; // sometimes CHANGELOG, sometimes CHANGELOG.md
-    fs.appendFileSync(changelogFile, newChangelog);
-
-    manifest.version = version;
-    manifest.upstreamVersion = upstreamVersion;
-    fs.writeFileSync('CloudronManifest.json', JSON.stringify(manifest, null, 2));
-
-    // git branch --show-current does not work in CI :/
-    const mainOrMaster = safe.child_process.execSync('git branch -r --list origin/master origin/main', { encoding: 'utf8' });
-    if (safe.error) return exit('Could not determine branch name');
-    const branch = mainOrMaster.includes('master') ? 'master' : 'main';
-
-    execSync(`git commit -a -m 'Version ${version}'`, { encoding: 'utf8' });
-    execSync(`git tag v${version} -a -m 'Version ${version}'`, { encoding: 'utf8' });
-    console.log(`git push --atomic origin ${branch} v${version}`);
-    execSync(`git push --atomic origin HEAD:${branch} v${version}`, { encoding: 'utf8' }); // push this tag only. in CI, we might have a git cache
-    if (safe.error) return exit(`Failed to push tag v${version} and branch ${branch}: ${safe.error.message}`, { encoding: 'utf8' });
-
-    console.log(`Created tag v${version} and pushed branch ${branch}`);
+    // https://docs.nodebb.org/api/write/#tag/topics/paths/~1topics~1%7Btid%7D/post
+    const postData = {
+        content: postContent,
+        toPid: 0 // which post is this post a reply to
+    };
+    const postResponse = await superagent.post(`https://forum.cloudron.io/api/v3/topics/${topicId}`).set('Authorization', `Bearer ${apiToken}`).send(postData).ok(() => true);
+    if (postResponse.statusCode !== 200) return exit(`Unable to create changelog post: ${requestError(postResponse)}`);
+    console.log('Posted to forum');
 }

package/src/build-actions.js

@@ -331,6 +331,7 @@ async function build(localOptions, cmd) {
         config.setAppConfig(sourceDir, appConfig);
     }
 
+    appConfig.gitCommit = execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim(); // when the build gets saved, save the gitCommit also
     if (buildServiceConfig.type === 'local') {
         await buildLocal(manifest, sourceDir, appConfig, options);
     } else if (buildServiceConfig.type === 'remote' && buildServiceConfig.url) {
@@ -363,14 +364,21 @@ async function push(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
 
     if (!options.id) return exit('buildId is required');
-    if (!options.repository) return exit('repository is required');
-    if (!options.tag) return exit('tag is required');
+    let repository, tag;
+    if (options.image) {
+        [repository, tag] = options.image.split(':');
+    } else {
+        if (!options.repository) return exit('repository is required');
+        if (!options.tag) return exit('tag is required');
+        repository = options.repository;
+        tag = options.tag;
+    }
 
     const buildServiceConfig = getBuildServiceConfig(options);
 
     const response = await superagent.post(`${buildServiceConfig.url}/api/v1/builds/${options.id}/push`)
         .query({ accessToken: buildServiceConfig.token })
-        .send({ dockerImageRepo: options.repository, dockerImageTag: options.tag })
+        .send({ dockerImageRepo: repository, dockerImageTag: tag })
         .ok(() => true);
     if (response.statusCode !== 201) return exit(`Failed to push: ${requestError(response)}`);