From b04d0f226a4337e1fee840e6dfb7f451d450390e Mon Sep 17 00:00:00 2001 From: MichalKinas <113341662+MichalKinas@users.noreply.github.com> Date: Tue, 16 May 2023 18:06:22 +0200 Subject: [PATCH] [ACS-5188] Remove old ACA upstream (#3193) --- .github/workflows/aca-upstream.yml | 47 ------- package-lock.json | 1 - package.json | 1 - scripts/gh/update/aca-same-commit-verify.js | 69 ---------- scripts/gh/update/pr-creator.js | 137 -------------------- scripts/gh/update/update-project.sh | 133 ------------------- 6 files changed, 388 deletions(-) delete mode 100644 .github/workflows/aca-upstream.yml delete mode 100644 scripts/gh/update/aca-same-commit-verify.js delete mode 100644 scripts/gh/update/pr-creator.js delete mode 100755 scripts/gh/update/update-project.sh diff --git a/.github/workflows/aca-upstream.yml b/.github/workflows/aca-upstream.yml deleted file mode 100644 index 8a59871028..0000000000 --- a/.github/workflows/aca-upstream.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: "ACA upstream" - -on: - schedule: - - cron: "0 12 * * *" - workflow_dispatch: - inputs: - repo_to_update: - description: Repository to update - type: choice - required: true - options: - - alfresco-applications - - alfresco-apps - default: alfresco-applications -env: - GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }} - GH_COMMIT: ${{ github.sha }} - GH_BUILD_NUMBER: ${{ github.run_id }} - NODE_OPTIONS: "--max-old-space-size=5120" - -jobs: - trigger_aca_upstream: - name: Trigger ACA Upstream - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v3 - - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version-file: '.nvmrc' - cache: 'npm' - - - name: Configure Git Author - uses: Alfresco/alfresco-build-tools/.github/actions/configure-git-author@v1.35.0 - with: - username: ${{ vars.BOT_GITHUB_USERNAME }} - email: ${{ vars.BOT_GITHUB_EMAIL }} - global: true - - - name: Trigger Upstream - shell: bash - run: | - npm install github-api - ./scripts/gh/update/update-project.sh -p $GH_BUILD_NUMBER -t $GH_TOKEN -v alpha -c $GH_COMMIT -r ${{ inputs.repo_to_update || 'alfresco-applications' }} diff --git a/package-lock.json b/package-lock.json index ae81e4ea6a..6af0f8b478 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,7 +70,6 @@ "@typescript-eslint/eslint-plugin": "^5.59.0", "@typescript-eslint/parser": "^5.48.2", "ajv-cli": "^4.2.0", - "commander": "^6.1.0", "cypress": "^12.10.0", "dotenv": "8.2.0", "dotenv-expand": "^5.1.0", diff --git a/package.json b/package.json index d776e7ebbb..6289c5eecb 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,6 @@ "@typescript-eslint/eslint-plugin": "^5.59.0", "@typescript-eslint/parser": "^5.48.2", "ajv-cli": "^4.2.0", - "commander": "^6.1.0", "cypress": "^12.10.0", "dotenv": "8.2.0", "dotenv-expand": "^5.1.0", diff --git a/scripts/gh/update/aca-same-commit-verify.js b/scripts/gh/update/aca-same-commit-verify.js deleted file mode 100644 index 4855917226..0000000000 --- a/scripts/gh/update/aca-same-commit-verify.js +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env node - -const GitHub = require('github-api'); -let program = require('commander'); - -const ORGANISATION = 'Alfresco'; -const ORIGIN_REPO = 'alfresco-content-app'; - -class PrCreator { - constructor(githubUser, githubRepo, token, commit) { - this.github = new GitHub({token}); - this.repoOrigin = this.github.getRepo(githubUser, ORIGIN_REPO); - this.repoDestination = this.github.getRepo(githubUser, githubRepo); - this.commit = commit; - } - - async getShaClosedPr(head, base) { - return this.getShaPr(head, base, 'closed'); - } - - async getShaOpenPr(head, base) { - return this.getShaPr(head, base, 'open'); - } - - async getShaPr(head, base, status) { - const { data: closedUpstreamPRs } = await this.repoDestination.listPullRequests({ state: status, head: `${ORGANISATION}:${head}`, base }); - if (closedUpstreamPRs.length > 0) { - const latestClosedUpstream = closedUpstreamPRs[0]; - return latestClosedUpstream.body.split(':')[1].trim(); - } - return ''; - } - -} - -async function main() { - - program - .version('0.1.0') - .option('-t, --token [type]', 'token') - .option('-h, --head [type]', 'head') - .option('-r, --repo [type]', 'repo') - .option('-c, --commit [type]', 'commit') - .parse(process.argv); - - const { token, head, repo, commit } = program; - const prCreator = new PrCreator(ORGANISATION, repo, token, commit); - - const baseBranchName = 'develop'; - - const shaOpen = await prCreator.getShaOpenPr(head, baseBranchName); - const shaClosed = await prCreator.getShaClosedPr(head, baseBranchName); - if (shaOpen === commit || shaClosed === commit) { - console.log('ACA sha already exist'); - return 'true'; - } - return 'false'; -} - -main() - .then(result => { - process.stdout.write(result); - process.exit(0); - }) - .catch(error => { - console.error(error.response.status); - console.error(error.response.statusText); - process.exit(1); - }); diff --git a/scripts/gh/update/pr-creator.js b/scripts/gh/update/pr-creator.js deleted file mode 100644 index 58df4b306e..0000000000 --- a/scripts/gh/update/pr-creator.js +++ /dev/null @@ -1,137 +0,0 @@ -const GitHub = require('github-api'); -let program = require('commander'); - -const ORGANISATION = 'Alfresco'; -const ORIGIN_REPO = 'alfresco-content-app'; -const ATTEMPT_MSG = [ - `Could you check it please? 🤖`, - `Emm did you forget? 🤡`, - `Where are you? 🤷`, - `We are going to die!! 👻`, - `I guess the Apocalypse happened and I am alone 👽` -]; - -GIVE_UP_MSG = `I gave up, it will be fixed eventually 🔴`; - -class PrCreator { - constructor(githubUser, githubRepo, token, commit) { - this.github = new GitHub({token}); - this.repoOrigin = this.github.getRepo(githubUser, ORIGIN_REPO); - this.repoDestination = this.github.getRepo(githubUser, githubRepo); - this.issue = this.github.getIssues(githubUser, githubRepo); - this.commit = commit; - } - - async createOrUpdate(title, head, base, commit) { - const { data: prs } = await this.repoDestination.listPullRequests({ state: 'open', head: `${ORGANISATION}:${head}`, base }); - - if (prs.length < 1) { - const { data: pr } = await this.repoDestination.createPullRequest({ title, head, base, body: `sha:${commit}` }); - return pr.number; - } else { - const upstreamPrOpen = prs[0]; - // override the title to contains the latest aca dep number - await this.repoDestination.updatePullRequest(upstreamPrOpen.number, { title, body: `sha:${commit}` }); - return upstreamPrOpen.number; - } - - } - - async fetchContributors(shaFrom, shaTo) { - const mapAuthors = new Map(); - let upstreamShaFound = shaTo !== null; - const listCommits = await this.repoOrigin.listCommits(({sha: shaFrom})); - let index = 0; - while(upstreamShaFound) { - if (listCommits.data[index].sha === shaTo ) { - upstreamShaFound = false; - } else { - mapAuthors.set(listCommits.data[index].author.login, listCommits.data[index].commit.author.name); - } - index++; - } - return mapAuthors; - } - - async createComment(issueOrPrNumber, head, base, shaOriginHead ) { - const shaTo = await this.getShaTo(head, base); - const contributors = await this.fetchContributors(shaOriginHead, shaTo); - const attemptCount = await this.getCommentAmount(issueOrPrNumber); - const commentMsg = this.createCommentBody(contributors, attemptCount); - await this.issue.createIssueComment(issueOrPrNumber, commentMsg); - } - - createCommentBody(contributors, attemptCount) { - const flattenedContributors = this.flattenContributors(contributors); - const attemptMsg = attemptCount <= 5 ? ATTEMPT_MSG[attemptCount] : GIVE_UP_MSG - const tmpl = ` Attempt: ${attemptCount+1} - you are part of the contributors: - ${flattenedContributors} - ${attemptMsg} - `; - return tmpl; - } - - flattenContributors(contributors) { - let names = []; - for (let key of contributors.keys()) { - names.push(`@${key}`) - } - return names.join(', '); - } - - async getShaTo(head, base) { - const { data: closedUpstreamPRs } = await this.repoDestination.listPullRequests({ state: 'closed', head: `${ORGANISATION}:${head}`, base }); - if (closedUpstreamPRs && closedUpstreamPRs.length > 0) { - const latestClosedUpstream = closedUpstreamPRs[0]; - const shaTo = latestClosedUpstream.body.split(':')[1].trim(); - return shaTo; - } - return null; - } - - async getCommentAmount(issueOrPrNumber) { - const { data: listComments } = await this.issue.listIssueComments(issueOrPrNumber); - return listComments.length; - } -} - -async function main() { - - program - .version('0.1.0') - .option('-t, --token [type]', 'token') - .option('-h, --head [type]', 'head') - .option('-r, --repo [type]', 'repo') - .option('-c, --commit [type]', 'commit') - .option('-title, --title [type]', 'title') - .parse(process.argv); - - const { token, title, head, repo, commit } = program, - prCreator = new PrCreator(ORGANISATION, repo, token, commit); - - if (!token || !head || !title) { - throw new Error('Each of the parameters have to be provided. --token, --title, --head'); - } - const baseBranchName = 'develop'; - - const prNumber = await prCreator.createOrUpdate(title, head, baseBranchName, commit); - await prCreator.createComment(prNumber, head, baseBranchName, commit); - - return prNumber; -} - -main() - .then(prNumber => { - console.log("======= PR Created ========="); - - console.log(prNumber) - process.exit(0); - }) - .catch(error => { - - console.error("======= Impossible create PR ========="); - console.error(error.response.status); - console.error(error.response.statusText); - process.exit(1); - }); diff --git a/scripts/gh/update/update-project.sh b/scripts/gh/update/update-project.sh deleted file mode 100755 index e3158e5ffd..0000000000 --- a/scripts/gh/update/update-project.sh +++ /dev/null @@ -1,133 +0,0 @@ -#!/usr/bin/env bash - -BUILD_PIPELINE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -REPO_DIR="$BUILD_PIPELINE_DIR/../.." - -TEMP_GENERATOR_DIR=".tmp-generator"; -BRANCH_TO_CREATE="update-alfresco-aca-dependencies" -TOKEN="" -PR_NUMBER="" -DRY_RUN="false" - -show_help() { - echo "Usage: update-project.sh" - echo "" - echo "-t or --token: Github ouath token" - echo "-p or --pr: Originating ACA PR number" - echo "-v or --version: version to update" - echo "-c or --commit: commit" - echo "-d or --dry-run: The script won't execute critical operation, just simulate them" - echo "-r or --repo: Repository to update" -} - -set_token() { - TOKEN=$1 -} - -set_pr() { - PR_NUMBER=$1 -} - -version() { - VERSION=$1 -} - -set_commit() { - COMMIT=$1 -} - -set_dryrun() { - DRY_RUN="true" -} - -set_repo() { - REPO=$1 -} - - -update_dependency() { - PKG=$1 - PKG_VERSION=$(npm view $PKG@$VERSION version) - echo "Update $PKG to $PKG_VERSION in $REPO" - - for i in $(find . ! -path "*/node_modules/*" -name "package-lock.json" | xargs grep -l $PKG); do - directory=$(dirname $i) - echo "Update $PKG in $directory" - ( cd $directory ; npm i --ignore-scripts $PKG@$PKG_VERSION --save-exact) - done - - git add . - git commit -n -m "[ci:force][auto-commit] Update $PKG to $PKG_VERSION for branch: $BRANCH_TO_CREATE originated from $PKG PR: $PR_NUMBER" -} - -update() { - PKG_VERSION=$(npm view $PKG@$VERSION version) - echo "Update dependencies $REPO" - - git clone https://$TOKEN@github.com/Alfresco/$REPO.git $TEMP_GENERATOR_DIR - cd $TEMP_GENERATOR_DIR - - git fetch - - # Checkout branch if exist, otherwise create it - BRANCH_CREATED=false - if git checkout $BRANCH_TO_CREATE 2>/dev/null ; then - git reset --hard origin/develop - else - BRANCH_CREATED=true - git checkout -b $BRANCH_TO_CREATE origin/develop - fi - - update_dependency "@alfresco/aca-shared" - update_dependency "@alfresco/aca-content" - update_dependency "@alfresco/aca-preview" - update_dependency "@alfresco/aca-viewer" - update_dependency "@alfresco/aca-folder-rules" - - if [ "$BRANCH_CREATED" = true ]; then - git push origin $BRANCH_TO_CREATE - else - git push --force origin $BRANCH_TO_CREATE - fi - - node $BUILD_PIPELINE_DIR/pr-creator.js --token=$TOKEN --title="Update branch for ACA ${PKG_VERSION} [ci:force]" --head=$BRANCH_TO_CREATE --repo=$REPO --commit=$COMMIT - - cd .. - rm -rf $TEMP_GENERATOR_DIR -} - -while [[ $1 == -* ]]; do - case "$1" in - -h|--help|-\?) show_help; exit 0;; - -t|--token) set_token $2; shift; shift;; - -p|--pr) set_pr $2; shift; shift;; - -v|--version) version $2; shift 2;; - -c|--commit) set_commit $2; shift 2;; - -d|--dry-run) set_dryrun $2; shift; shift;; - -r|--repo) set_repo $2; shift; shift;; - -*) echo "invalid option: $1" 1>&2; show_help; exit 1;; - esac -done - -cd "$REPO_DIR" - -if [[ (-z "$TOKEN") || (-z "$VERSION") ]] - then - echo "Each of 'branch name' (-b) token (-t) pr number (-p) and repo (-r) have to be set. See -help." - exit 1; -fi - -rm -rf $TEMP_GENERATOR_DIR - -isSameACASha=$(node $BUILD_PIPELINE_DIR/aca-same-commit-verify.js --token=$TOKEN --head=$BRANCH_TO_CREATE --repo=$REPO --commit=$COMMIT ) -if [ "$isSameACASha" = 'true' ]; then - echo 'ACA sha is the same. No need to create another pr' - else - if [ "$DRY_RUN" = "false" ]; then - update $REPO - else - echo "[dry-run] it would have update $REPO repo" - fi -fi - -exit $?