Merge branch 'segmentio:main' into main

Author: satyamMIPL

packages/destination-actions/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@segment/action-destinations",
   "description": "Destination Actions engine and definitions.",
-  "version": "3.489.0",
+  "version": "3.490.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/segmentio/action-destinations",

packages/destination-actions/src/destinations/amplitude-cohorts/__tests__/index.test.ts

@@ -8,7 +8,7 @@ const settings = {
   api_key: 'test_api_key',
   secret_key: 'test_secret_key',
   app_id: 'test_app_id',
-  owner_email: '[email protected]',
+  default_owner_email: '[email protected]',
   endpoint: 'north_america'
 }
 
@@ -17,7 +17,7 @@ describe('Amplitude Cohorts', () => {
     it('should validate authentication inputs', async () => {
       nock('https://amplitude.com')
         .get('/api/2/usersearch')
-        .query({ user: settings.owner_email })
+        .query({ user: settings.default_owner_email })
         .reply(200, {})
 
       await expect(testDestination.testAuthentication(settings)).resolves.not.toThrowError()
@@ -86,11 +86,9 @@ describe('Amplitude Cohorts', () => {
     it('should successfully retrieve an existing audience', async () => {
       const externalId = 'cohort_789'
 
-      nock('https://amplitude.com')
-        .get(`/api/5/cohorts/request/${externalId}`)
-        .reply(200, {
-          cohortId: externalId
-        })
+      nock('https://amplitude.com').get(`/api/5/cohorts/request/${externalId}`).reply(200, {
+        cohortId: externalId
+      })
 
       const result = await testDestination.getAudience({
         settings,
@@ -103,11 +101,9 @@ describe('Amplitude Cohorts', () => {
     it('should throw error if cohort not found', async () => {
       const externalId = 'nonexistent_cohort'
 
-      nock('https://amplitude.com')
-        .get(`/api/5/cohorts/request/${externalId}`)
-        .reply(200, {
-          cohortId: 'different_id'
-        })
+      nock('https://amplitude.com').get(`/api/5/cohorts/request/${externalId}`).reply(200, {
+        cohortId: 'different_id'
+      })
 
       await expect(
         testDestination.getAudience({

packages/destination-actions/src/destinations/amplitude-cohorts/functions.ts

@@ -8,23 +8,25 @@ export function getEndpointByRegion(endpoint: keyof typeof endpoints, region?: s
   return endpoints[endpoint][region as Region] ?? endpoints[endpoint]['north_america']
 }
 
-export async function createAudience(request: RequestClient, settings: Settings, name: string, id_type: IDType, owner_email?: string): Promise<string> {
-  const { 
-    endpoint,
-    app_id,
-    owner_email: default_owner_email
-  } = settings
+export async function createAudience(
+  request: RequestClient,
+  settings: Settings,
+  name: string,
+  id_type: IDType,
+  owner_email?: string
+): Promise<string> {
+  const { endpoint, app_id, default_owner_email } = settings
 
   if (!name) {
     throw new IntegrationError('Missing audience name value', 'MISSING_REQUIRED_FIELD', 400)
   }
-  
-  if(!id_type){
+
+  if (!id_type) {
     throw new IntegrationError('Missing id_type value', 'MISSING_REQUIRED_FIELD', 400)
   }
 
   const url = getEndpointByRegion('cohorts_upload', endpoint)
-  
+
   const json: CreateAudienceJSON = {
     name,
     app_id,
@@ -42,25 +44,31 @@ export async function createAudience(request: RequestClient, settings: Settings,
   const id = response?.data?.cohortId
 
   if (!id) {
-    throw new IntegrationError('Invalid response from Amplitude Cohorts API when attempting to create new Cohort: Missing cohortId', 'INVALID_RESPONSE', 500)
+    throw new IntegrationError(
+      'Invalid response from Amplitude Cohorts API when attempting to create new Cohort: Missing cohortId',
+      'INVALID_RESPONSE',
+      500
+    )
   }
   return id
 }
 
 export async function getAudience(request: RequestClient, settings: Settings, externalId: string): Promise<void> {
-  const { 
-    endpoint
-  } = settings
+  const { endpoint } = settings
 
   const url = `${getEndpointByRegion('cohorts_get_one', endpoint)}/${externalId}`
   const response = await request<CreateAudienceResponse>(url)
   const id = response?.data?.cohortId
-  
-  if(!id) {
-    throw new IntegrationError('Invalid response from Amplitude Cohorts API when attempting to get Cohort: Missing cohortId', 'INVALID_RESPONSE', 500)
+
+  if (!id) {
+    throw new IntegrationError(
+      'Invalid response from Amplitude Cohorts API when attempting to get Cohort: Missing cohortId',
+      'INVALID_RESPONSE',
+      500
+    )
   }
 
-  if(id !== externalId) {
+  if (id !== externalId) {
     throw new IntegrationError(`Cohort with id ${externalId} not found`, 'COHORT_NOT_FOUND', 404)
   }
-}
+}

packages/destination-actions/src/destinations/amplitude-cohorts/generated-types.ts

@@ -21,19 +21,22 @@ const destination: AudienceDestinationDefinition<Settings, AudienceSettings> = {
       },
       secret_key: {
         label: 'Secret Key',
-        description: 'Amplitude project secret key. You can find this key in the "General" tab of your Amplitude project.',
+        description:
+          'Amplitude project secret key. You can find this key in the "General" tab of your Amplitude project.',
         type: 'password',
         required: true
       },
       app_id: {
         label: 'Amplitude App ID',
-        description: 'The Amplitude App ID for the cohort you want to sync to. You can find this in the "General" tab of your Amplitude project.',
+        description:
+          'The Amplitude App ID for the cohort you want to sync to. You can find this in the "General" tab of your Amplitude project.',
         type: 'string',
         required: true
       },
-      owner_email: {
+      default_owner_email: {
         label: 'Cohort Owner Email',
-        description: 'The email of the user who will own the cohorts in Amplitude. This can be overriden per Audience, but if left blank, all cohorts will be owned by this user.',
+        description:
+          'The email of the user who will own the cohorts in Amplitude. This can be overriden per Audience, but if left blank, all cohorts will be owned by this user.',
         type: 'string',
         required: true
       },
@@ -57,27 +60,25 @@ const destination: AudienceDestinationDefinition<Settings, AudienceSettings> = {
       }
     },
     testAuthentication: (request, { settings }) => {
-      const { 
-        endpoint,
-        owner_email
-      } = settings
+      const { endpoint, default_owner_email } = settings
       const baseUrl = getEndpointByRegion('usersearch', endpoint)
-      return request(`${baseUrl}?user=${owner_email}`)
+      return request(`${baseUrl}?user=${default_owner_email}`)
     }
   },
   extendRequest({ settings }) {
     const { api_key, secret_key } = settings
     return {
-      headers: { 
+      headers: {
         'Content-Type': 'application/json',
-        Authorization: `Basic ${Buffer.from(`${api_key}:${secret_key}`).toString('base64')}` 
+        Authorization: `Basic ${Buffer.from(`${api_key}:${secret_key}`).toString('base64')}`
       }
     }
   },
   audienceFields: {
     owner_email: {
       label: 'Cohort Owner Email',
-      description: 'The email of the user who will own the cohort in Amplitude. Overrides the default Cohort Owner Email value from Settings.',
+      description:
+        'The email of the user who will own the cohort in Amplitude. Overrides the default Cohort Owner Email value from Settings.',
       type: 'string',
       format: 'email',
       required: false
@@ -94,14 +95,15 @@ const destination: AudienceDestinationDefinition<Settings, AudienceSettings> = {
         },
         {
           label: 'Amplitude ID',
-          value: ID_TYPES.BY_AMP_ID 
+          value: ID_TYPES.BY_AMP_ID
         }
       ],
       default: ID_TYPES.BY_USER_ID
     },
     audience_name: {
       label: 'Cohort Name',
-      description: 'The name of the cohort in Amplitude. This will override the default cohort name which is the snake_case version of the Segment Audience name.',
+      description:
+        'The name of the cohort in Amplitude. This will override the default cohort name which is the snake_case version of the Segment Audience name.',
       type: 'string',
       required: false
     }
@@ -112,14 +114,10 @@ const destination: AudienceDestinationDefinition<Settings, AudienceSettings> = {
       full_audience_sync: false
     },
     async createAudience(request, createAudienceInput) {
-      const { 
-        audienceName, 
-        settings, 
-        audienceSettings: { 
-          owner_email,
-          audience_name, 
-          id_type
-        } = {}
+      const {
+        audienceName,
+        settings,
+        audienceSettings: { owner_email, audience_name, id_type } = {}
       } = createAudienceInput
 
       const name = typeof audience_name === 'string' && audience_name.length > 0 ? audience_name : audienceName
@@ -128,13 +126,10 @@ const destination: AudienceDestinationDefinition<Settings, AudienceSettings> = {
       return { externalId }
     },
     async getAudience(request, createAudienceInput) {
-      const { 
-        externalId,
-        settings
-      } = createAudienceInput
+      const { externalId, settings } = createAudienceInput
 
       await getAudience(request, settings, externalId)
-      
+
       return { externalId }
     }
   },

packages/destination-actions/src/destinations/amplitude-cohorts/index.ts

@@ -1,4 +1,4 @@
-import { resolveIdentifiers, isIsoDate } from '../utils'
+import { convertValidTimestamp, resolveIdentifiers, isIsoDate } from '../utils'
 
 describe('isIsoDate', () => {
   it('should return true for valid ISO date with fractional seconds from 1-9 digits', () => {
@@ -79,3 +79,9 @@ describe('resolveIdentifiers', () => {
     expect(resolveIdentifiers({})).toBeUndefined()
   })
 })
+
+describe('convertValidTimestamp', () => {
+  it('should leave decimal unix timestamps unchanged', () => {
+    expect(convertValidTimestamp('1712345678.123')).toBe('1712345678.123')
+  })
+})

packages/destination-actions/src/destinations/customerio/__tests__/utils.test.ts

@@ -39,10 +39,11 @@ export enum AccountRegion {
 
 export const convertValidTimestamp = <Value = unknown>(value: Value): Value | number => {
   // Timestamps may be on a `string` field, so check if the string is only
-  // numbers. If it is, ignore it since it's probably already a unix timestamp.
+  // digits (optionally with a fractional part). If it is, ignore it since
+  // it's probably already a unix timestamp (integer or decimal).
   // DayJS doesn't parse unix timestamps correctly outside of the `.unix()`
   // initializer.
-  if (typeof value !== 'string' || /^\d+$/.test(value)) {
+  if (typeof value !== 'string' || /^\d+(\.\d+)?$/.test(value)) {
     return value
   }