Fix test spy and add implementation for creating attachment item

Author: timfish

packages/core/src/baseclient.ts

@@ -16,8 +16,8 @@ import {
   Transport,
 } from '@sentry/types';
 import {
-  attachmentItemFromAttachment,
   checkOrSetAlreadyCaught,
+  createAttachmentEnvelopeItem,
   dateTimestampInSeconds,
   isPlainObject,
   isPrimitive,
@@ -659,7 +659,7 @@ export abstract class BaseClient<O extends ClientOptions> implements Client<O> {
 
   /** */
   protected _getAttachments(scope: Scope | undefined): AttachmentItem[] {
-    return (scope?.getAttachments() || []).map(a => attachmentItemFromAttachment(a));
+    return (scope?.getAttachments() || []).map(a => createAttachmentEnvelopeItem(a));
   }
 
   /**

packages/node/src/client.ts

@@ -1,7 +1,7 @@
 import { BaseClient, Scope, SDK_VERSION } from '@sentry/core';
 import { SessionFlusher } from '@sentry/hub';
 import { AttachmentItem, Event, EventHint, Severity, SeverityLevel } from '@sentry/types';
-import { attachmentItemFromAttachment, logger, resolvedSyncPromise } from '@sentry/utils';
+import { createAttachmentEnvelopeItem, logger, resolvedSyncPromise } from '@sentry/utils';
 
 import { eventFromMessage, eventFromUnknownInput } from './eventbuilder';
 import { IS_DEBUG_BUILD } from './flags';
@@ -156,6 +156,6 @@ export class NodeClient extends BaseClient<NodeClientOptions> {
    */
   protected _getAttachments(scope: Scope | undefined): AttachmentItem[] {
     // TODO: load any attachments from paths...
-    return (scope?.getAttachments() || []).map(a => attachmentItemFromAttachment(a));
+    return (scope?.getAttachments() || []).map(a => createAttachmentEnvelopeItem(a));
   }
 }

packages/node/test/index.test.ts

@@ -1,6 +1,6 @@
 import { initAndBind, SDK_VERSION } from '@sentry/core';
 import { getMainCarrier } from '@sentry/hub';
-import { Integration } from '@sentry/types';
+import { AttachmentItem, Integration } from '@sentry/types';
 import { createStackParser } from '@sentry/utils';
 import * as domain from 'domain';
 
@@ -79,7 +79,7 @@ describe('SentryNode', () => {
   });
 
   describe('breadcrumbs', () => {
-    let s: jest.SpyInstance<void, Event[]>;
+    let s: jest.SpyInstance<void, [Event, AttachmentItem[]?]>;
 
     beforeEach(() => {
       s = jest.spyOn(NodeClient.prototype, 'sendEvent').mockImplementation(async () => Promise.resolve({ code: 200 }));
@@ -110,7 +110,7 @@ describe('SentryNode', () => {
   });
 
   describe('capture', () => {
-    let s: jest.SpyInstance<void, Event[]>;
+    let s: jest.SpyInstance<void, [Event, AttachmentItem[]?]>;
 
     beforeEach(() => {
       s = jest.spyOn(NodeClient.prototype, 'sendEvent').mockImplementation(async () => Promise.resolve({ code: 200 }));

packages/utils/src/attachment.ts

@@ -1,6 +1,19 @@
 import { Attachment, AttachmentItem } from '@sentry/types';
 
 /** */
-export function attachmentItemFromAttachment(_attachment: Attachment): AttachmentItem {
-  throw new Error('Not implemented');
+export function createAttachmentEnvelopeItem(attachment: Attachment): AttachmentItem {
+  const [pathOrData, options] = attachment;
+
+  const buffer = typeof pathOrData === 'string' ? new TextEncoder().encode(pathOrData) : pathOrData;
+
+  return [
+    {
+      type: 'attachment',
+      length: buffer.length,
+      filename: options?.filename || 'No filename',
+      content_type: options?.contentType,
+      attachment_type: options?.attachmentType,
+    },
+    buffer,
+  ];
 }