Merge branch 'segmentio:main' into main

Author: Vanessa-SSY

.eslintrc.js

@@ -45,7 +45,9 @@ module.exports = {
     '@typescript-eslint/require-await': 'off',
     '@typescript-eslint/restrict-plus-operands': 'off',
     '@typescript-eslint/restrict-template-expressions': 'off',
-    '@typescript-eslint/unbound-method': 'off'
+    '@typescript-eslint/unbound-method': 'off',
+    '@typescript-eslint/no-unsafe-argument': 'warn',
+    '@typescript-eslint/no-misused-promises': 'warn'
   },
   overrides: [
     {

.github/workflows/ci.yml

@@ -9,11 +9,11 @@ on:
 jobs:
   test:
     name: Unit tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 30
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
       # See nx recipe: https://nx.dev/recipes/ci/monorepo-ci-github-actions
@@ -54,11 +54,11 @@ jobs:
 
   lint:
     name: Lint
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
       - uses: actions/checkout@v4
@@ -88,11 +88,11 @@ jobs:
 
   validate:
     name: Validate
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
       - uses: actions/checkout@v4
@@ -135,11 +135,11 @@ jobs:
     # env: # Disable saucelabs - we blew through our quota.
     #   SAUCE_USERNAME: ${{secrets.SAUCE_USERNAME}}
     #   SAUCE_ACCESS_KEY: ${{secrets.SAUCE_ACCESS_KEY}}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
       - uses: actions/checkout@v4
@@ -171,13 +171,13 @@ jobs:
 
   browser-tests-core:
     name: 'Browser tests: actions-core'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     timeout-minutes: 10
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -192,7 +192,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -214,13 +214,13 @@ jobs:
 
   snyk:
     name: Snyk
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     timeout-minutes: 5
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -237,7 +237,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.github/workflows/ext.yml

@@ -11,13 +11,13 @@ jobs:
     env:
       HUSKY: 0
       NX_DISABLE_DB: true
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     timeout-minutes: 20
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/label-prs.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   pr-labeler:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       contents: read
       pull-requests: write
@@ -60,3 +60,46 @@ jobs:
               });
               await Promise.all(requests);
             }
+
+      - name: Comment for mapping-kit changes
+        uses: actions/github-script@v7
+        env:
+          labelsToAdd: '${{ steps.compute-labels.outputs.add }}'
+          labelsToRemove: '${{ steps.compute-labels.outputs.remove }}'
+        with:
+          script: |
+            const { labelsToAdd, labelsToRemove, DRY_RUN } = process.env
+            const shouldAddComment = labelsToAdd.length > 0 && labelsToAdd.split(",").some(x=>x.includes("mappingkit"))
+            const shouldRemoveComment = labelsToRemove.length > 0 && labelsToRemove.split(",").some(x=>x.includes("mappingkit"))
+            // Get the list of comments on the PR
+            const response = await github.rest.issues.listComments({
+                issue_number: context.issue.number,
+                owner: context.repo.owner,
+                repo: context.repo.repo
+            })
+            const mappingKitComment = response.data.find(comment => comment.body.includes('mapping-kit go'))
+            if(shouldAddComment){
+                if (mappingKitComment) {
+                  console.log('Already commented on this PR')
+                  return
+                }
+                // Add comment to the PR
+                await github.rest.issues.createComment({
+                    issue_number: context.issue.number,
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    body: `This PR makes changes to mapping-kit. Please ensure that the changes are reflected in the [mapping-kit go](https://github.com/segmentio/mapping-kit) library as well and link the PR in description.`
+                  })
+            }
+            if(shouldRemoveComment) {
+              if (!mappingKitComment) {
+                console.log('No mapping-kit comment to remove')
+                return
+              }
+              // Remove comment from the PR
+              await github.rest.issues.deleteComment({
+                  comment_id: mappingKitComment.id,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo
+                })
+            }

.github/workflows/publish-canary.yml

@@ -11,13 +11,13 @@ jobs:
       HUSKY: 0
       NX_DISABLE_DB: true
     if: startsWith(github.event.head_commit.message, 'Publish') == true
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     timeout-minutes: 15
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/publish.yml

@@ -15,16 +15,19 @@ jobs:
       HUSKY: 0
       NX_DISABLE_DB: true
     if: startsWith(github.event.head_commit.message, 'Publish') == true
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     timeout-minutes: 15
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
@@ -33,6 +36,11 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
           cache: yarn
 
+      - name: Setup git credentials
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
       - name: Install Dependencies
         run: yarn install --frozen-lockfile
 
@@ -52,22 +60,6 @@ jobs:
         run: |
           yarn lerna publish from-package --yes --loglevel=verbose --dist-tag latest
 
-  release:
-    needs: build-and-publish # comment when testing locally with https://github.com/nektos/act
-
-    runs-on: ubuntu-20.04
-    timeout-minutes: 15
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0 # Shallow clones should be disabled to ensure the commit history for the repository is available to the action
-          fetch-tags: true
-
-      - name: Setup git credentials
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
       - name: Generate Tags
         id: get-release-tag
         run: ./scripts/generate-release-tags.sh
@@ -79,24 +71,7 @@ jobs:
           RELEASE_TAG: ${{ steps.get-release-tag.outputs.release-tag }}
         with:
           script: |
+            const cloudManifest = require('./packages/destination-actions/dist/destinations/index.js').manifest
+            const browserManifest = require('./packages/destinations-manifest/dist/index.js').manifest
             const script = require('./scripts/github-action/create-github-release.js')
-            await script({github, context, core, exec})
-
-  # When hotfix is merged back to main, we tag all the packages that were changed in the hotfix commit.
-  tag-hotfix:
-    if: startsWith(github.event.head_commit.message, 'Hotfix:') == true && github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Configure git
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-
-      - name: Generate Package Specific Tags
-        id: get-release-tag
-        run: ./scripts/generate-package-tags.sh
+            await script({github, context, core, exec, cloudManifest, browserManifest})

.github/workflows/required-field-check.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   required-field-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     timeout-minutes: 5
 
@@ -46,14 +46,23 @@ jobs:
         id: required-fields-curr-branch
         if: steps.get_files.outputs.no_files_changed != 'true'
         run: |
+          set -e
           REQUIRED_FIELDS_CURR_BRANCH=$(./bin/run list-required-fields -p ${{ steps.get_files.outputs.files }} | jq -c .)
           echo "REQUIRED_FIELDS_CURR_BRANCH=$REQUIRED_FIELDS_CURR_BRANCH" >> $GITHUB_ENV
 
       - name: Check for required fields on main branch
         id: required-fields-main-branch
         if: steps.get_files.outputs.no_files_changed != 'true'
         run: |
+          set -e
           git checkout main
+          # Run install again on main branch to ensure all dependencies are installed
+          # and the lockfile is up to date
+          # This is important because the main branch may have different dependencies
+          # than the current branch, and we want to ensure that the required fields are
+          # checked against the correct version of the dependencies
+          yarn install --frozen-lockfile --silent
+          # Run the list-required-fields command on the main branch to get the required fields
           REQUIRED_FIELDS_MAIN_BRANCH=$(./bin/run list-required-fields -p ${{ steps.get_files.outputs.files }} | jq -c .)
           echo "REQUIRED_FIELDS_MAIN_BRANCH=$REQUIRED_FIELDS_MAIN_BRANCH" >> $GITHUB_ENV
 
@@ -88,7 +97,7 @@ jobs:
                     }
                   }
                 } else {
-                  
+
                   // If key is not present in requiredFieldsOnMain, then all fields are added recently
                   const getActionKeys = Object.keys(requiredFieldsOnBranch[key])
                   for(const actionKey of getActionKeys) {
@@ -109,7 +118,7 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo
             })
-            const diffComment = comments.data.find(comment => comment.body.includes('<!--REQUIRED_FIELD_DIFF-->')) 
+            const diffComment = comments.data.find(comment => comment.body.includes('<!--REQUIRED_FIELD_DIFF-->'))
 
             const comment = fs.readFileSync("./.github/REQUIRED_FIELD_WARNING_TEMPLATE.md", "utf8")
             const commentBody = comment.replace('{{FIELDS_ADDED}}', fieldsAdded.join('\n'))

.github/workflows/version-packages.yml

@@ -20,7 +20,7 @@ jobs:
   build-and-version-packages:
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [22.x]
     env:
       HUSKY: 0
       NX_DISABLE_DB: true

.nvmrc

@@ -1 +1 @@
-18.12.1
+22.13.1