@opentermsarchive/engine 6.1.0 → 7.1.0

package/.eslintrc.yaml

@@ -113,6 +113,7 @@ rules:
     - properties: false
   require-await: 1
   no-only-tests/no-only-tests: error
+  no-await-in-loop: 0 # allows intentional sequential processing of async operations
 
 overrides:
   - files:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "6.1.0",
+  "version": "7.1.0",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://opentermsarchive.org",
   "bugs": {

package/scripts/history/migrate-services.js

@@ -140,7 +140,7 @@ async function rewriteSnapshots(repository, records, idsMapping, logger) {
   let i = 1;
 
   for (const record of records) {
-    const { id: recordId } = await repository.save(record); // eslint-disable-line no-await-in-loop
+    const { id: recordId } = await repository.save(record);
 
     idsMapping[record.id] = recordId; // Saves the mapping between the old ID and the new one.
 
@@ -166,7 +166,7 @@ async function rewriteVersions(repository, records, idsMapping, logger) {
 
     record.snapshotId = newSnapshotId;
 
-    const { id: recordId } = await repository.save(record); // eslint-disable-line no-await-in-loop
+    const { id: recordId } = await repository.save(record);
 
     if (recordId) {
       logger.info({ message: `Migrated version with new ID: ${recordId}`, serviceId: record.serviceId, type: record.termsType, id: record.id, current: i++, total: records.length });

package/scripts/import/loadCommits.js

@@ -42,7 +42,7 @@ let client;
   let counter = 1;
 
   for (const commit of filteredCommits.reverse()) { // reverse array to insert most recent commits first
-    await collection.updateOne({ hash: commit.hash }, { $set: { ...commit } }, { upsert: true }); // eslint-disable-line no-await-in-loop
+    await collection.updateOne({ hash: commit.hash }, { $set: { ...commit } }, { upsert: true });
 
     if (counter % 1000 == 0) {
       logger.info({ message: ' ', current: counter, total: totalCommitToLoad });

package/scripts/reporter/duplicate/index.js

@@ -48,14 +48,14 @@ async function removeDuplicateIssues() {
         continue;
       }
 
-      await octokit.request('PATCH /repos/{owner}/{repo}/issues/{issue_number}', { /* eslint-disable-line no-await-in-loop */
+      await octokit.request('PATCH /repos/{owner}/{repo}/issues/{issue_number}', {
         owner,
         repo,
         issue_number: issue.number,
         state: 'closed',
       });
 
-      await octokit.request('POST /repos/{owner}/{repo}/issues/{issue_number}/comments', { /* eslint-disable-line no-await-in-loop */
+      await octokit.request('POST /repos/{owner}/{repo}/issues/{issue_number}/comments', {
         owner,
         repo,
         issue_number: issue.number,

package/scripts/rewrite/rewrite-snapshots.js

@@ -64,7 +64,6 @@ let recorder;
   const filteredCommits = commits.filter(({ message }) =>
     message.match(/^(Start tracking|Update)/));
 
-  /* eslint-disable no-await-in-loop */
   /* eslint-disable no-continue */
   for (const commit of filteredCommits) {
     console.log(Date.now(), commit.hash, commit.date, commit.message);

package/scripts/rewrite/rewrite-versions.js

@@ -74,7 +74,6 @@ let recorder;
   const filteredCommits = commits.filter(({ message }) =>
     message.match(/^(Start tracking|Update)/));
 
-  /* eslint-disable no-await-in-loop */
   /* eslint-disable no-continue */
   for (const commit of filteredCommits) {
     console.log(Date.now(), commit.hash, commit.date, commit.message);

package/src/archivist/extract/index.js

@@ -59,15 +59,12 @@ export async function extractFromHTML(sourceDocument) {
 
   for (const filterFunction of serviceSpecificFilters) {
     try {
-      /* eslint-disable no-await-in-loop */
-      // We want this to be made in series
       await filterFunction(webPageDOM, {
         fetch: location,
         select: contentSelectors,
         remove: insignificantContentSelectors,
         filter: serviceSpecificFilters.map(filter => filter.name),
       });
-      /* eslint-enable no-await-in-loop */
     } catch (error) {
       throw new Error(`The filter function "${filterFunction.name}" failed: ${error}`);
     }

package/src/archivist/fetcher/index.js

@@ -27,7 +27,7 @@ export const FETCHER_TYPES = {
  * @throws {FetchDocumentError} When the fetch operation fails
  * @async
  */
-export default async function fetch({
+export default function fetch({
   url,
   executeClientScripts,
   cssSelectors,

package/src/archivist/index.js

@@ -187,7 +187,7 @@ export default class Archivist extends events.EventEmitter {
       const { location: url, executeClientScripts, cssSelectors } = sourceDocument;
 
       try {
-        const { mimeType, content, fetcher } = await this.fetch({ url, executeClientScripts, cssSelectors }); // eslint-disable-line no-await-in-loop
+        const { mimeType, content, fetcher } = await this.fetch({ url, executeClientScripts, cssSelectors });
 
         sourceDocument.content = content;
         sourceDocument.mimeType = mimeType;

package/src/archivist/recorder/repositories/git/index.test.js

@@ -1382,7 +1382,6 @@ describe('GitRepository', () => {
 
       await subject.initialize();
 
-      /* eslint-disable no-await-in-loop */
       for (const commit of Object.values(commits)) {
         const { path: relativeFilePath, date, content, message } = commit;
         const filePath = path.join(RECORDER_PATH, relativeFilePath);
@@ -1396,7 +1395,6 @@ describe('GitRepository', () => {
         expectedIds.push(sha);
         expectedDates.push(date);
       }
-      /* eslint-enable no-await-in-loop */
     });
 
     after(() => subject.removeAll());

package/src/archivist/recorder/repositories/mongo/index.js

@@ -96,13 +96,11 @@ export default class MongoRepository extends RepositoryInterface {
   async* iterate() {
     const cursor = this.collection.find().sort({ fetchDate: 1 });
 
-    /* eslint-disable no-await-in-loop */
     while (await cursor.hasNext()) {
       const mongoDocument = await cursor.next();
 
       yield this.#toDomain(mongoDocument);
     }
-    /* eslint-enable no-await-in-loop */
   }
 
   removeAll() {

package/src/archivist/recorder/version.js

@@ -5,7 +5,7 @@ import Record from './record.js';
 export default class Version extends Record {
   static REQUIRED_PARAMS = Object.freeze([ ...Record.REQUIRED_PARAMS, 'snapshotIds' ]);
 
-  static SOURCE_DOCUMENTS_SEPARATOR = '\n\n';
+  static SOURCE_DOCUMENTS_SEPARATOR = '\n\n- - -\n\n'; // Separator used to delimit source documents when concatenating them. The "- - -" produces a horizontal ruler in Markdown
 
   constructor(params) {
     super(params);

package/src/archivist/services/index.js

@@ -50,7 +50,7 @@ async function loadServiceFilters(serviceId, filterNames) {
   }
 
   const filterFilePath = `${serviceId}.filters.js`;
-  const serviceFilters = await import(pathToFileURL(path.join(declarationsPath, filterFilePath))); // eslint-disable-line no-await-in-loop
+  const serviceFilters = await import(pathToFileURL(path.join(declarationsPath, filterFilePath)));
 
   return filterNames.map(filterName => serviceFilters[filterName]);
 }
@@ -74,7 +74,7 @@ async function loadServiceDocument(service, termsType, termsTypeDeclaration) {
         remove: sourceDocumentInsignificantContentSelectors,
       } = sourceDocument;
 
-      const sourceDocumentFilters = await loadServiceFilters(service.id, sourceDocumentFilterNames); // eslint-disable-line no-await-in-loop
+      const sourceDocumentFilters = await loadServiceFilters(service.id, sourceDocumentFilterNames);
 
       sourceDocuments.push(new SourceDocument({
         location: sourceDocumentLocation || location,
@@ -101,7 +101,7 @@ export async function loadWithHistory(servicesIds = []) {
   const services = await load(servicesIds);
 
   for (const serviceId of Object.keys(services)) {
-    const { declarations, filters } = await loadServiceHistoryFiles(serviceId); // eslint-disable-line no-await-in-loop
+    const { declarations, filters } = await loadServiceHistoryFiles(serviceId);
 
     for (const termsType of Object.keys(declarations)) {
       const termsTypeDeclarationEntries = declarations[termsType];
@@ -145,7 +145,7 @@ export async function loadWithHistory(servicesIds = []) {
               remove: sourceDocumentInsignificantContentSelectors,
             } = sourceDocument;
 
-            const sourceDocumentFilters = await loadServiceFilters(serviceId, sourceDocumentFilterNames); // eslint-disable-line no-await-in-loop
+            const sourceDocumentFilters = await loadServiceFilters(serviceId, sourceDocumentFilterNames);
 
             sourceDocuments.push(new SourceDocument({
               location: sourceDocumentLocation || declarationForThisDate.fetch,

package/src/archivist/services/index.test.js

@@ -78,7 +78,7 @@ describe('Services', () => {
 
                 for (let indexFilter = 0; indexFilter < expectedFilters.length; indexFilter++) {
                   it(`has the proper "${expectedFilters[indexFilter].name}" filter function`, async () => {
-                    expect(await actualFilters[indexFilter]()).equal(await expectedFilters[indexFilter]()); // eslint-disable-line no-await-in-loop
+                    expect(await actualFilters[indexFilter]()).equal(await expectedFilters[indexFilter]());
                   });
                 }
               } else {
@@ -220,7 +220,7 @@ describe('Services', () => {
 
                       for (let indexFilter = 0; indexFilter < expectedFiltersForThisDate.length; indexFilter++) {
                         it(`has the proper "${expectedFiltersForThisDate[indexFilter].name}" filter function`, async () => {
-                          expect(await actualFiltersForThisDate[indexFilter]()).equal(await expectedFiltersForThisDate[indexFilter]()); // eslint-disable-line no-await-in-loop
+                          expect(await actualFiltersForThisDate[indexFilter]()).equal(await expectedFiltersForThisDate[indexFilter]());
                         });
                       }
                     } else {
@@ -246,7 +246,7 @@ describe('Services', () => {
                     indexFilter++
                   ) {
                     it(`has the proper "${expectedFilters[indexFilter].name}" filter function`, async () => {
-                      expect(await actualFilters[indexFilter]()).equal(await expectedFilters[indexFilter]()); // eslint-disable-line no-await-in-loop
+                      expect(await actualFilters[indexFilter]()).equal(await expectedFilters[indexFilter]());
                     });
                   }
                 } else {

package/src/reporter/github/index.js

@@ -51,26 +51,68 @@ export default class GitHub {
   async initialize() {
     this.MANAGED_LABELS = Object.values(LABELS);
     try {
-      const existingLabels = await this.getRepositoryLabels();
+      let existingLabels = await this.getRepositoryLabels();
       const labelsToRemove = existingLabels.filter(label => label.description && label.description.includes(DEPRECATED_MANAGED_BY_OTA_MARKER));
 
       if (labelsToRemove.length) {
         logger.info(`Removing labels with deprecated markers: ${labelsToRemove.map(label => `"${label.name}"`).join(', ')}`);
 
         for (const label of labelsToRemove) {
-          await this.deleteLabel(label.name); /* eslint-disable-line no-await-in-loop */
+          await this.deleteLabel(label.name);
         }
       }
 
-      const updatedExistingLabels = labelsToRemove.length ? await this.getRepositoryLabels() : existingLabels; // Refresh labels after deletion, only if needed
-      const existingLabelsNames = updatedExistingLabels.map(label => label.name);
+      if (labelsToRemove.length) {
+        existingLabels = await this.getRepositoryLabels();
+      }
+
+      const managedLabelsNames = this.MANAGED_LABELS.map(label => label.name);
+      const obsoleteManagedLabels = existingLabels.filter(label => label.description?.includes(MANAGED_BY_OTA_MARKER) && !managedLabelsNames.includes(label.name));
+
+      if (obsoleteManagedLabels.length) {
+        logger.info(`Removing obsolete managed labels: ${obsoleteManagedLabels.map(label => `"${label.name}"`).join(', ')}`);
+
+        for (const label of obsoleteManagedLabels) {
+          await this.deleteLabel(label.name);
+        }
+      }
+
+      if (obsoleteManagedLabels.length) {
+        existingLabels = await this.getRepositoryLabels();
+      }
+
+      const existingLabelsNames = existingLabels.map(label => label.name);
       const missingLabels = this.MANAGED_LABELS.filter(label => !existingLabelsNames.includes(label.name));
 
       if (missingLabels.length) {
         logger.info(`Following required labels are not present on the repository: ${missingLabels.map(label => `"${label.name}"`).join(', ')}. Creating them…`);
 
         for (const label of missingLabels) {
-          await this.createLabel({ /* eslint-disable-line no-await-in-loop */
+          await this.createLabel({
+            name: label.name,
+            color: label.color,
+            description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+          });
+        }
+      }
+
+      const labelsToUpdate = this.MANAGED_LABELS.filter(label => {
+        const existingLabel = existingLabels.find(existingLabel => existingLabel.name === label.name);
+
+        if (!existingLabel) {
+          return false;
+        }
+
+        const expectedDescription = `${label.description} ${MANAGED_BY_OTA_MARKER}`;
+
+        return existingLabel.description !== expectedDescription || existingLabel.color !== label.color;
+      });
+
+      if (labelsToUpdate.length) {
+        logger.info(`Updating labels with changed descriptions: ${labelsToUpdate.map(label => `"${label.name}"`).join(', ')}`);
+
+        for (const label of labelsToUpdate) {
+          await this.updateLabel({
             name: label.name,
             color: label.color,
             description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
@@ -134,6 +176,15 @@ export default class GitHub {
     });
   }
 
+  async updateLabel({ name, color, description }) {
+    await this.octokit.request('PATCH /repos/{owner}/{repo}/labels/{name}', {
+      ...this.commonParams,
+      name,
+      color,
+      description,
+    });
+  }
+
   async getIssue(title) {
     return (await this.issues).get(title);
   }

package/src/reporter/github/index.test.js

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import nock from 'nock';
 
-import { LABELS } from '../labels.js';
+import { LABELS, MANAGED_BY_OTA_MARKER } from '../labels.js';
 
 import GitHub from './index.js';
 
@@ -10,8 +10,8 @@ describe('GitHub', function () {
 
   let MANAGED_LABELS;
   let github;
-  const EXISTING_OPEN_ISSUE = { number: 1, title: 'Opened issue', description: 'Issue description', state: GitHub.ISSUE_STATE_OPEN, labels: [{ name: 'page access restriction' }, { name: 'server error' }] };
-  const EXISTING_CLOSED_ISSUE = { number: 2, title: 'Closed issue', description: 'Issue description', state: GitHub.ISSUE_STATE_CLOSED, labels: [{ name: 'empty content' }] };
+  const EXISTING_OPEN_ISSUE = { number: 1, title: 'Opened issue', description: 'Issue description', state: GitHub.ISSUE_STATE_OPEN, labels: [{ name: LABELS.HTTP_403.name }] };
+  const EXISTING_CLOSED_ISSUE = { number: 2, title: 'Closed issue', description: 'Issue description', state: GitHub.ISSUE_STATE_CLOSED, labels: [{ name: LABELS.EMPTY_CONTENT.name }] };
 
   before(async () => {
     MANAGED_LABELS = Object.values(LABELS);
@@ -24,31 +24,119 @@ describe('GitHub', function () {
   });
 
   describe('#initialize', () => {
-    const scopes = [];
+    context('when some labels are missing', () => {
+      const scopes = [];
 
-    before(async () => {
-      const existingLabels = MANAGED_LABELS.slice(0, -2);
+      before(async () => {
+        const existingLabels = MANAGED_LABELS.slice(0, -2).map(label => ({
+          ...label,
+          description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+        }));
 
-      nock('https://api.github.com')
-        .get('/repos/owner/repo/labels')
-        .query(true)
-        .reply(200, existingLabels);
+        nock('https://api.github.com')
+          .get('/repos/owner/repo/labels')
+          .query(true)
+          .reply(200, existingLabels);
+
+        const missingLabels = MANAGED_LABELS.slice(-2);
 
-      const missingLabels = MANAGED_LABELS.slice(-2);
+        for (const label of missingLabels) {
+          scopes.push(nock('https://api.github.com')
+            .post('/repos/owner/repo/labels', body => body.name === label.name)
+            .reply(200, label));
+        }
 
-      for (const label of missingLabels) {
-        scopes.push(nock('https://api.github.com')
-          .post('/repos/owner/repo/labels', body => body.name === label.name)
-          .reply(200, label));
-      }
+        await github.initialize();
+      });
+
+      after(nock.cleanAll);
 
-      await github.initialize();
+      it('should create missing labels', () => {
+        scopes.forEach(scope => expect(scope.isDone()).to.be.true);
+      });
     });
 
-    after(nock.cleanAll);
+    context('when some labels are obsolete', () => {
+      const deleteScopes = [];
+
+      before(async () => {
+        const existingLabels = [
+          ...MANAGED_LABELS.map(label => ({
+            ...label,
+            description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+          })),
+          // Add an obsolete label that should be removed
+          {
+            name: 'obsolete label',
+            color: 'FF0000',
+            description: `This label is no longer used ${MANAGED_BY_OTA_MARKER}`,
+          },
+        ];
+
+        nock('https://api.github.com')
+          .get('/repos/owner/repo/labels')
+          .query(true)
+          .reply(200, existingLabels);
+
+        // Mock the delete call for the obsolete label
+        deleteScopes.push(nock('https://api.github.com')
+          .delete('/repos/owner/repo/labels/obsolete%20label')
+          .reply(200));
+
+        // Mock the second getRepositoryLabels call after deletion
+        nock('https://api.github.com')
+          .get('/repos/owner/repo/labels')
+          .query(true)
+          .reply(200, MANAGED_LABELS.map(label => ({
+            ...label,
+            description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+          })));
+
+        await github.initialize();
+      });
+
+      after(nock.cleanAll);
+
+      it('should remove obsolete managed labels', () => {
+        deleteScopes.forEach(scope => expect(scope.isDone()).to.be.true);
+      });
+    });
+
+    context('when some labels have changed descriptions', () => {
+      const updateScopes = [];
 
-    it('should create missing labels', () => {
-      scopes.forEach(scope => expect(scope.isDone()).to.be.true);
+      before(async () => {
+        const originalTestLabels = MANAGED_LABELS.slice(-2);
+        const testLabels = originalTestLabels.map(label => ({
+          ...label,
+          description: `${label.description} - obsolete description`,
+        }));
+
+        nock('https://api.github.com')
+          .persist()
+          .get('/repos/owner/repo/labels')
+          .query(true)
+          .reply(200, [ ...MANAGED_LABELS.slice(0, -2), ...testLabels ].map(label => ({
+            ...label,
+            description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+          })));
+
+        for (const label of originalTestLabels) {
+          updateScopes.push(nock('https://api.github.com')
+            .patch(`/repos/owner/repo/labels/${encodeURIComponent(label.name)}`, body =>
+              body.description === `${label.description} ${MANAGED_BY_OTA_MARKER}`)
+            .reply(200, label));
+        }
+        await github.initialize();
+      });
+
+      after(() => {
+        nock.cleanAll();
+      });
+
+      it('should update labels with changed descriptions', () => {
+        updateScopes.forEach(scope => expect(scope.isDone()).to.be.true);
+      });
     });
   });
 
@@ -280,7 +368,7 @@ describe('GitHub', function () {
       const ISSUE_TO_CREATE = {
         title: 'New Issue',
         description: 'Description of the new issue',
-        labels: ['empty response'],
+        labels: [LABELS.EMPTY_RESPONSE.name],
       };
 
       before(async () => {
@@ -311,14 +399,14 @@ describe('GitHub', function () {
 
         before(async () => {
           updateIssueScope = nock('https://api.github.com')
-            .patch(`/repos/owner/repo/issues/${EXISTING_CLOSED_ISSUE.number}`, { state: GitHub.ISSUE_STATE_OPEN, labels: ['page access restriction'] })
+            .patch(`/repos/owner/repo/issues/${EXISTING_CLOSED_ISSUE.number}`, { state: GitHub.ISSUE_STATE_OPEN, labels: [LABELS.HTTP_403.name] })
             .reply(200);
 
           addCommentScope = nock('https://api.github.com')
             .post(`/repos/owner/repo/issues/${EXISTING_CLOSED_ISSUE.number}/comments`, { body: EXISTING_CLOSED_ISSUE.description })
             .reply(200);
 
-          await github.createOrUpdateIssue({ title: EXISTING_CLOSED_ISSUE.title, description: EXISTING_CLOSED_ISSUE.description, labels: ['page access restriction'] });
+          await github.createOrUpdateIssue({ title: EXISTING_CLOSED_ISSUE.title, description: EXISTING_CLOSED_ISSUE.description, labels: [LABELS.HTTP_403.name] });
         });
 
         after(() => {
@@ -342,14 +430,14 @@ describe('GitHub', function () {
 
           before(async () => {
             updateIssueScope = nock('https://api.github.com')
-              .patch(`/repos/owner/repo/issues/${EXISTING_OPEN_ISSUE.number}`, { state: GitHub.ISSUE_STATE_OPEN, labels: ['empty content'] })
+              .patch(`/repos/owner/repo/issues/${EXISTING_OPEN_ISSUE.number}`, { state: GitHub.ISSUE_STATE_OPEN, labels: [LABELS.EMPTY_CONTENT.name] })
               .reply(200);
 
             addCommentScope = nock('https://api.github.com')
               .post(`/repos/owner/repo/issues/${EXISTING_OPEN_ISSUE.number}/comments`, { body: EXISTING_OPEN_ISSUE.description })
               .reply(200);
 
-            await github.createOrUpdateIssue({ title: EXISTING_OPEN_ISSUE.title, description: EXISTING_OPEN_ISSUE.description, labels: ['empty content'] });
+            await github.createOrUpdateIssue({ title: EXISTING_OPEN_ISSUE.title, description: EXISTING_OPEN_ISSUE.description, labels: [LABELS.EMPTY_CONTENT.name] });
           });
 
           after(() => {
@@ -379,7 +467,7 @@ describe('GitHub', function () {
               .post(`/repos/owner/repo/issues/${EXISTING_OPEN_ISSUE.number}/comments`)
               .reply(200);
 
-            await github.createOrUpdateIssue({ title: EXISTING_OPEN_ISSUE.title, description: EXISTING_OPEN_ISSUE.description, labels: [ 'page access restriction', 'server error' ] });
+            await github.createOrUpdateIssue({ title: EXISTING_OPEN_ISSUE.title, description: EXISTING_OPEN_ISSUE.description, labels: [LABELS.HTTP_403.name] });
           });
 
           after(() => {
@@ -403,14 +491,14 @@ describe('GitHub', function () {
 
           before(async () => {
             updateIssueScope = nock('https://api.github.com')
-              .patch(`/repos/owner/repo/issues/${EXISTING_OPEN_ISSUE.number}`, { state: GitHub.ISSUE_STATE_OPEN, labels: [ 'page access restriction', 'empty content' ] })
+              .patch(`/repos/owner/repo/issues/${EXISTING_OPEN_ISSUE.number}`, { state: GitHub.ISSUE_STATE_OPEN, labels: [ LABELS.HTTP_403.name, LABELS.NEEDS_INTERVENTION.name ] })
               .reply(200);
 
             addCommentScope = nock('https://api.github.com')
               .post(`/repos/owner/repo/issues/${EXISTING_OPEN_ISSUE.number}/comments`, { body: EXISTING_OPEN_ISSUE.description })
               .reply(200);
 
-            await github.createOrUpdateIssue({ title: EXISTING_OPEN_ISSUE.title, description: EXISTING_OPEN_ISSUE.description, labels: [ 'page access restriction', 'empty content' ] });
+            await github.createOrUpdateIssue({ title: EXISTING_OPEN_ISSUE.title, description: EXISTING_OPEN_ISSUE.description, labels: [ LABELS.HTTP_403.name, LABELS.NEEDS_INTERVENTION.name ] });
           });
 
           after(() => {

package/src/reporter/gitlab/index.js

@@ -45,26 +45,69 @@ export default class GitLab {
 
     this.MANAGED_LABELS = Object.values(LABELS);
     try {
-      const existingLabels = await this.getRepositoryLabels();
+      let existingLabels = await this.getRepositoryLabels();
       const labelsToRemove = existingLabels.filter(label => label.description && label.description.includes(DEPRECATED_MANAGED_BY_OTA_MARKER));
 
       if (labelsToRemove.length) {
         logger.info(`Removing labels with deprecated markers: ${labelsToRemove.map(label => `"${label.name}"`).join(', ')}`);
 
         for (const label of labelsToRemove) {
-          await this.deleteLabel(label.name); /* eslint-disable-line no-await-in-loop */
+          await this.deleteLabel(label.name);
         }
       }
 
-      const updatedExistingLabels = labelsToRemove.length ? await this.getRepositoryLabels() : existingLabels; // Refresh labels after deletion, only if needed
-      const existingLabelsNames = updatedExistingLabels.map(label => label.name);
+      if (labelsToRemove.length) {
+        existingLabels = await this.getRepositoryLabels();
+      }
+
+      const managedLabelsNames = this.MANAGED_LABELS.map(label => label.name);
+      const obsoleteManagedLabels = existingLabels.filter(label => label.description?.includes(MANAGED_BY_OTA_MARKER) && !managedLabelsNames.includes(label.name));
+
+      if (obsoleteManagedLabels.length) {
+        logger.info(`Removing obsolete managed labels: ${obsoleteManagedLabels.map(label => `"${label.name}"`).join(', ')}`);
+
+        for (const label of obsoleteManagedLabels) {
+          await this.deleteLabel(label.name);
+        }
+      }
+
+      if (obsoleteManagedLabels.length) {
+        existingLabels = await this.getRepositoryLabels();
+      }
+
+      const existingLabelsNames = existingLabels.map(label => label.name);
       const missingLabels = this.MANAGED_LABELS.filter(label => !existingLabelsNames.includes(label.name));
 
       if (missingLabels.length) {
         logger.info(`Following required labels are not present on the repository: ${missingLabels.map(label => `"${label.name}"`).join(', ')}. Creating them…`);
 
         for (const label of missingLabels) {
-          await this.createLabel({ /* eslint-disable-line no-await-in-loop */
+          await this.createLabel({
+            name: label.name,
+            color: `#${label.color}`,
+            description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+          });
+        }
+      }
+
+      const labelsToUpdate = this.MANAGED_LABELS.filter(label => {
+        const existingLabel = existingLabels.find(existingLabel => existingLabel.name === label.name);
+
+        if (!existingLabel) {
+          return false;
+        }
+
+        const expectedDescription = `${label.description} ${MANAGED_BY_OTA_MARKER}`;
+        const expectedColor = `#${label.color}`;
+
+        return existingLabel.description !== expectedDescription || existingLabel.color !== expectedColor;
+      });
+
+      if (labelsToUpdate.length) {
+        logger.info(`Updating labels with changed descriptions: ${labelsToUpdate.map(label => `"${label.name}"`).join(', ')}`);
+
+        for (const label of labelsToUpdate) {
+          await this.updateLabel({
             name: label.name,
             color: `#${label.color}`,
             description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
@@ -155,6 +198,40 @@ export default class GitLab {
     }
   }
 
+  async updateLabel({ name, color, description }) {
+    try {
+      const label = {
+        name,
+        color,
+        description,
+      };
+
+      const options = GitLab.baseOptionsHttpReq();
+
+      options.method = 'PUT';
+      options.body = JSON.stringify(label);
+      options.headers = {
+        'Content-Type': 'application/json',
+        ...options.headers,
+      };
+
+      const response = await nodeFetch(
+        `${this.apiBaseURL}/projects/${this.projectId}/labels/${encodeURIComponent(name)}`,
+        options,
+      );
+
+      const res = await response.json();
+
+      if (response.ok) {
+        logger.info(`Label updated: ${res.name}, color: ${res.color}`);
+      } else {
+        logger.error(`updateLabel response: ${JSON.stringify(res)}`);
+      }
+    } catch (error) {
+      logger.error(`Failed to update label: ${error}`);
+    }
+  }
+
   async createIssue({ title, description, labels }) {
     try {
       const issue = {

package/src/reporter/gitlab/index.test.js

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import nock from 'nock';
 
-import { LABELS } from '../labels.js';
+import { LABELS, MANAGED_BY_OTA_MARKER } from '../labels.js';
 
 import GitLab from './index.js';
 
@@ -18,34 +18,134 @@ describe('GitLab', function () {
   });
 
   describe('#initialize', () => {
-    const scopes = [];
+    context('when some labels are missing', () => {
+      const scopes = [];
 
-    before(async () => {
-      const existingLabels = MANAGED_LABELS.slice(0, -2);
+      before(async () => {
+        const existingLabels = MANAGED_LABELS.slice(0, -2).map(label => ({
+          ...label,
+          description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+        }));
 
-      nock(gitlab.apiBaseURL)
-        .get(`/projects/${encodeURIComponent('owner/repo')}`)
-        .reply(200, { id: PROJECT_ID });
+        nock(gitlab.apiBaseURL)
+          .get(`/projects/${encodeURIComponent('owner/repo')}`)
+          .reply(200, { id: PROJECT_ID });
 
-      nock(gitlab.apiBaseURL)
-        .get(`/projects/${PROJECT_ID}/labels?with_counts=true`)
-        .reply(200, existingLabels);
+        nock(gitlab.apiBaseURL)
+          .get(`/projects/${PROJECT_ID}/labels?with_counts=true`)
+          .reply(200, existingLabels);
 
-      const missingLabels = MANAGED_LABELS.slice(-2);
+        const missingLabels = MANAGED_LABELS.slice(-2);
 
-      for (const label of missingLabels) {
-        scopes.push(nock(gitlab.apiBaseURL)
-          .post(`/projects/${PROJECT_ID}/labels`)
-          .reply(200, { name: label.name }));
-      }
+        for (const label of missingLabels) {
+          scopes.push(nock(gitlab.apiBaseURL)
+            .post(`/projects/${PROJECT_ID}/labels`)
+            .reply(200, { name: label.name }));
+        }
 
-      await gitlab.initialize();
+        await gitlab.initialize();
+      });
+
+      after(nock.cleanAll);
+
+      it('should create missing labels', () => {
+        scopes.forEach(scope => expect(scope.isDone()).to.be.true);
+      });
     });
 
-    after(nock.cleanAll);
+    context('when some labels are obsolete', () => {
+      const deleteScopes = [];
+
+      before(async () => {
+        const existingLabels = [
+          ...MANAGED_LABELS.map(label => ({
+            ...label,
+            description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+          })),
+          // Add an obsolete label that should be removed
+          {
+            name: 'obsolete label',
+            color: '#FF0000',
+            description: `This label is no longer used ${MANAGED_BY_OTA_MARKER}`,
+          },
+        ];
+
+        nock(gitlab.apiBaseURL)
+          .get(`/projects/${encodeURIComponent('owner/repo')}`)
+          .reply(200, { id: PROJECT_ID });
+
+        nock(gitlab.apiBaseURL)
+          .get(`/projects/${PROJECT_ID}/labels?with_counts=true`)
+          .reply(200, existingLabels);
 
-    it('should create missing labels', () => {
-      scopes.forEach(scope => expect(scope.isDone()).to.be.true);
+        // Mock the delete call for the obsolete label
+        deleteScopes.push(nock(gitlab.apiBaseURL)
+          .delete(`/projects/${PROJECT_ID}/labels/${encodeURIComponent('obsolete label')}`)
+          .reply(200));
+
+        // Mock the second getRepositoryLabels call after deletion
+        nock(gitlab.apiBaseURL)
+          .get(`/projects/${PROJECT_ID}/labels?with_counts=true`)
+          .reply(200, MANAGED_LABELS.map(label => ({
+            ...label,
+            description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+          })));
+
+        await gitlab.initialize();
+      });
+
+      after(nock.cleanAll);
+
+      it('should remove obsolete managed labels', () => {
+        deleteScopes.forEach(scope => expect(scope.isDone()).to.be.true);
+      });
+    });
+
+    context('when some labels have changed descriptions', () => {
+      const updateScopes = [];
+
+      before(async () => {
+        const originalTestLabels = MANAGED_LABELS.slice(-2);
+        const testLabels = originalTestLabels.map(label => ({
+          ...label,
+          description: `${label.description} - obsolete description`,
+        }));
+
+        nock(gitlab.apiBaseURL)
+          .get(`/projects/${encodeURIComponent('owner/repo')}`)
+          .reply(200, { id: PROJECT_ID });
+
+        nock(gitlab.apiBaseURL)
+          .persist()
+          .get(`/projects/${PROJECT_ID}/labels?with_counts=true`)
+          .reply(200, [
+            ...MANAGED_LABELS.slice(0, -2).map(label => ({
+              ...label,
+              description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+            })),
+            ...testLabels.map(label => ({
+              ...label,
+              description: `${label.description} ${MANAGED_BY_OTA_MARKER}`,
+            })),
+          ]);
+
+        for (const label of originalTestLabels) {
+          updateScopes.push(nock(gitlab.apiBaseURL)
+            .put(`/projects/${PROJECT_ID}/labels/${encodeURIComponent(label.name)}`, body =>
+              body.description === `${label.description} ${MANAGED_BY_OTA_MARKER}`)
+            .reply(200, { name: label.name, color: `#${label.color}` }));
+        }
+
+        await gitlab.initialize();
+      });
+
+      after(() => {
+        nock.cleanAll();
+      });
+
+      it('should update labels with changed descriptions', () => {
+        updateScopes.forEach(scope => expect(scope.isDone()).to.be.true);
+      });
     });
   });
 
@@ -405,7 +505,7 @@ describe('GitLab', function () {
       const ISSUE_TO_CREATE = {
         title: 'New Issue',
         description: 'Description of the new issue',
-        labels: ['empty response'],
+        labels: [LABELS.EMPTY_RESPONSE.name],
       };
 
       before(async () => {
@@ -436,7 +536,7 @@ describe('GitLab', function () {
       const ISSUE = {
         title: 'Existing Issue',
         description: 'New comment',
-        labels: ['page access restriction'],
+        labels: [LABELS.HTTP_403.name],
       };
 
       context('when issue is closed', () => {
@@ -448,7 +548,7 @@ describe('GitLab', function () {
           iid: 123,
           title: ISSUE.title,
           description: ISSUE.description,
-          labels: [{ name: 'empty content' }],
+          labels: [{ name: LABELS.EMPTY_CONTENT.name }],
           state: GitLab.ISSUE_STATE_CLOSED,
         };
 
@@ -456,7 +556,7 @@ describe('GitLab', function () {
         const responseIssuereopened = { iid: 123 };
         const responseSetLabels = {
           iid: 123,
-          labels: ['page access restriction'],
+          labels: [LABELS.HTTP_403.name],
         };
         const responseAddcomment = { iid: 123, id: 23, body: ISSUE.description };
         const { iid } = GITLAB_RESPONSE_FOR_EXISTING_ISSUE;
@@ -471,7 +571,7 @@ describe('GitLab', function () {
             .reply(200, responseIssuereopened);
 
           setIssueLabelsScope = nock(gitlab.apiBaseURL)
-            .put(`/projects/${PROJECT_ID}/issues/${iid}`, { labels: ['page access restriction'] })
+            .put(`/projects/${PROJECT_ID}/issues/${iid}`, { labels: [LABELS.HTTP_403.name] })
             .reply(200, responseSetLabels);
 
           addCommentScope = nock(gitlab.apiBaseURL)
@@ -504,7 +604,7 @@ describe('GitLab', function () {
             iid: 123,
             title: ISSUE.title,
             description: ISSUE.description,
-            labels: [{ name: 'empty content' }],
+            labels: [{ name: LABELS.EMPTY_CONTENT.name }],
             state: GitLab.ISSUE_STATE_OPEN,
           };
 
@@ -512,7 +612,7 @@ describe('GitLab', function () {
           const responseIssuereopened = { iid: 123 };
           const responseSetLabels = {
             iid: 123,
-            labels: ['page access restriction'],
+            labels: [LABELS.HTTP_403.name],
           };
           const responseAddcomment = { iid: 123, id: 23, body: ISSUE.description };
           const { iid } = GITLAB_RESPONSE_FOR_EXISTING_ISSUE;
@@ -527,7 +627,7 @@ describe('GitLab', function () {
               .reply(200, responseIssuereopened);
 
             setIssueLabelsScope = nock(gitlab.apiBaseURL)
-              .put(`/projects/${PROJECT_ID}/issues/${iid}`, { labels: ['page access restriction'] })
+              .put(`/projects/${PROJECT_ID}/issues/${iid}`, { labels: [LABELS.HTTP_403.name] })
               .reply(200, responseSetLabels);
 
             addCommentScope = nock(gitlab.apiBaseURL)
@@ -559,7 +659,7 @@ describe('GitLab', function () {
             iid: 123,
             title: ISSUE.title,
             description: ISSUE.description,
-            labels: [{ name: 'page access restriction' }, { name: 'server error' }],
+            labels: [{ name: LABELS.HTTP_403.name }],
             state: GitLab.ISSUE_STATE_OPEN,
           };
 
@@ -585,7 +685,7 @@ describe('GitLab', function () {
             await gitlab.createOrUpdateIssue({
               title: ISSUE.title,
               description: ISSUE.description,
-              labels: [ 'page access restriction', 'server error' ],
+              labels: [LABELS.HTTP_403.name],
             });
           });
 
@@ -615,7 +715,7 @@ describe('GitLab', function () {
             iid: 123,
             title: ISSUE.title,
             description: ISSUE.description,
-            labels: [{ name: 'page access restriction' }],
+            labels: [{ name: LABELS.HTTP_403.name }],
             state: GitLab.ISSUE_STATE_OPEN,
           };
 
@@ -623,7 +723,7 @@ describe('GitLab', function () {
           const responseIssuereopened = { iid: 123 };
           const responseSetLabels = {
             iid: 123,
-            labels: [ 'page access restriction', 'empty content' ],
+            labels: [ LABELS.HTTP_403.name, LABELS.EMPTY_CONTENT.name ],
           };
           const responseAddcomment = { iid: 123, id: 23, body: ISSUE.description };
           const { iid } = GITLAB_RESPONSE_FOR_EXISTING_ISSUE;
@@ -638,7 +738,7 @@ describe('GitLab', function () {
               .reply(200, responseIssuereopened);
 
             setIssueLabelsScope = nock(gitlab.apiBaseURL)
-              .put(`/projects/${PROJECT_ID}/issues/${iid}`, { labels: [ 'page access restriction', 'empty content' ] })
+              .put(`/projects/${PROJECT_ID}/issues/${iid}`, { labels: [ LABELS.HTTP_403.name, LABELS.EMPTY_CONTENT.name ] })
               .reply(200, responseSetLabels);
 
             addCommentScope = nock(gitlab.apiBaseURL)
@@ -648,7 +748,7 @@ describe('GitLab', function () {
             await gitlab.createOrUpdateIssue({
               title: ISSUE.title,
               description: ISSUE.description,
-              labels: [ 'page access restriction', 'empty content' ],
+              labels: [ LABELS.HTTP_403.name, LABELS.EMPTY_CONTENT.name ],
             });
           });
 

package/src/reporter/index.js

@@ -10,21 +10,21 @@ const CONTRIBUTION_TOOL_URL = 'https://contribute.opentermsarchive.org/en/servic
 const DOC_URL = 'https://docs.opentermsarchive.org';
 
 const ERROR_MESSAGE_TO_ISSUE_LABELS_MAP = {
-  'has no match': [ LABELS.PAGE_STRUCTURE_CHANGE.name, LABELS.NEEDS_INTERVENTION.name ],
-  'HTTP code 404': [ LABELS.PAGE_NOT_FOUND.name, LABELS.NEEDS_INTERVENTION.name ],
+  'has no match': [ LABELS.DOCUMENT_STRUCTURE_CHANGE.name, LABELS.NEEDS_INTERVENTION.name ],
+  'HTTP code 404': [ LABELS.DOCUMENT_NOT_FOUND.name, LABELS.NEEDS_INTERVENTION.name ],
   'HTTP code 403': [LABELS.HTTP_403.name],
   'HTTP code 429': [LABELS.HTTP_429.name],
   'HTTP code 500': [LABELS.HTTP_500.name],
   'HTTP code 502': [LABELS.HTTP_502.name],
   'HTTP code 503': [LABELS.HTTP_503.name],
-  'Timed out after': [LABELS.PAGE_LOAD_TIMEOUT.name],
+  'Timed out after': [LABELS.DOCUMENT_LOAD_TIMEOUT.name],
   EAI_AGAIN: [LABELS.DNS_LOOKUP_FAILURE.name],
   ENOTFOUND: [LABELS.DNS_RESOLUTION_FAILURE.name],
   'Response is empty': [LABELS.EMPTY_RESPONSE.name],
   'unable to verify the first certificate': [LABELS.SSL_INVALID.name],
   'certificate has expired': [LABELS.SSL_EXPIRED.name],
   'maximum redirect reached': [LABELS.TOO_MANY_REDIRECTS.name],
-  'not a valid selector': [LABELS.INVALID_SELECTOR.name],
+  'not a valid selector': [ LABELS.INVALID_SELECTOR.name, LABELS.NEEDS_INTERVENTION.name ],
   'empty content': [LABELS.EMPTY_CONTENT.name],
 };
 

package/src/reporter/labels.js

@@ -3,90 +3,90 @@ export const DEPRECATED_MANAGED_BY_OTA_MARKER = '[managed by OTA]';
 export const MANAGED_BY_OTA_MARKER = '- Auto-managed by OTA engine';
 
 export const LABELS = {
-  HTTP_403: {
-    name: 'page access restriction',
+  DNS_LOOKUP_FAILURE: {
+    name: 'domain lookup failed',
     color: 'FFFFFF',
-    description: 'Fetching failed with a 403 (forbidden) HTTP code',
+    description: 'Fetching failed because the request to DNS servers timed out',
   },
-  HTTP_429: {
-    name: 'request limit exceeded',
+  DNS_RESOLUTION_FAILURE: {
+    name: 'domain resolution failed',
     color: 'FFFFFF',
-    description: 'Fetching failed with a 429 (too many requests) HTTP code',
+    description: 'Fetching failed because the domain name failed to resolve',
   },
-  HTTP_500: {
-    name: 'server error',
+  DOCUMENT_LOAD_TIMEOUT: {
+    name: 'document load timed out',
     color: 'FFFFFF',
-    description: 'Fetching failed with a 500 (internal server error) HTTP code',
+    description: 'Fetching failed with a timeout error',
   },
-  HTTP_502: {
-    name: 'server response failure',
+  DOCUMENT_NOT_FOUND: {
+    name: 'document not found',
     color: 'FFFFFF',
-    description: 'Fetching failed with a 502 (bad gateway) HTTP code',
+    description: 'Fetch location is outdated',
   },
-  HTTP_503: {
-    name: 'server unavailability',
+  DOCUMENT_STRUCTURE_CHANGE: {
+    name: 'document structure changed',
     color: 'FFFFFF',
-    description: 'Fetching failed with a 503 (service unavailable) HTTP code',
+    description: 'Selectors do not match any content in the document',
   },
-  SSL_EXPIRED: {
-    name: 'SSL certificate expiration',
+  EMPTY_CONTENT: {
+    name: 'document was empty',
     color: 'FFFFFF',
-    description: 'Fetching failed because the domain SSL certificate has expired',
+    description: 'Fetching failed because the server returns an empty content',
   },
-  DNS_LOOKUP_FAILURE: {
-    name: 'DNS lookup failure',
+  EMPTY_RESPONSE: {
+    name: 'received empty response',
     color: 'FFFFFF',
-    description: 'Fetching failed because the domain temporarily failed to resolve on DNS',
+    description: 'Fetching failed because server returned an empty response body',
   },
-  DNS_RESOLUTION_FAILURE: {
-    name: 'DNS resolution failure',
+  HTTP_403: {
+    name: 'document access forbidden',
     color: 'FFFFFF',
-    description: 'Fetching failed because the domain fails to resolve on DNS',
+    description: 'Fetching failed with a 403 (forbidden) HTTP code',
   },
-  EMPTY_RESPONSE: {
-    name: 'empty response',
+  HTTP_429: {
+    name: 'access limit exceeded',
     color: 'FFFFFF',
-    description: 'Fetching failed because server returned an empty response body',
+    description: 'Fetching failed with a 429 (too many requests) HTTP code',
   },
-  SSL_INVALID: {
-    name: 'SSL certificate invalidity',
+  HTTP_500: {
+    name: 'server errored',
     color: 'FFFFFF',
-    description: 'Fetching failed because SSL certificate verification failed',
+    description: 'Fetching failed with a 500 (internal server error) HTTP code',
   },
-  TOO_MANY_REDIRECTS: {
-    name: 'too many redirects',
+  HTTP_502: {
+    name: 'upstream server errored',
     color: 'FFFFFF',
-    description: 'Fetching failed because too many redirects detected',
+    description: 'Fetching failed with a 502 (bad gateway) HTTP code',
   },
-  PAGE_LOAD_TIMEOUT: {
-    name: 'page load timeout',
+  HTTP_503: {
+    name: 'server was unavailable',
     color: 'FFFFFF',
-    description: 'Fetching failed with a timeout error',
+    description: 'Fetching failed with a 503 (service unavailable) HTTP code',
   },
-  EMPTY_CONTENT: {
-    name: 'empty content',
+  INVALID_SELECTOR: {
+    name: 'invalid selector',
     color: 'FFFFFF',
-    description: 'Fetching failed because the server returns an empty content',
+    description: 'Some selectors cannot be understood by the engine',
   },
-  UNKNOWN_FAILURE: {
-    name: 'unknown failure reason',
+  SSL_EXPIRED: {
+    name: 'certificate expired',
     color: 'FFFFFF',
-    description: 'Fetching failed for an undetermined reason that needs investigation',
+    description: 'Fetching failed because the domain SSL certificate has expired',
   },
-  PAGE_STRUCTURE_CHANGE: {
-    name: 'page structure change',
+  SSL_INVALID: {
+    name: 'certificate was invalid',
     color: 'FFFFFF',
-    description: 'Extraction selectors are outdated',
+    description: 'Fetching failed because the domain SSL certificate failed to verify',
   },
-  PAGE_NOT_FOUND: {
-    name: 'page not found',
+  TOO_MANY_REDIRECTS: {
+    name: 'redirected too many times',
     color: 'FFFFFF',
-    description: 'Fetch location is outdated',
+    description: 'Fetching failed because of too many redirects',
   },
-  INVALID_SELECTOR: {
-    name: 'invalid selector',
+  UNKNOWN_FAILURE: {
+    name: 'failed for an unknown reason',
     color: 'FFFFFF',
-    description: 'Some selectors cannot be understood by the engine',
+    description: 'Fetching failed for an undetermined reason that needs investigation',
   },
   NEEDS_INTERVENTION: {
     name: '⚠ needs intervention',