@forge/cache 0.2.0-next.0 → 0.2.0-next.2

package/out/__test__/cache.test.js

@@ -32,6 +32,10 @@ describe('connect', () => {
                 rms: {
                     url: 'https://dev.services.atlassian.com',
                     host: 'rockmelon-storage.dev.atl-paas.net'
+                },
+                tracing: {
+                    traceId: 'trace-id-test',
+                    spanId: 'span-id-test'
                 }
             };
         });
@@ -75,6 +79,10 @@ describe('createFetch', () => {
             rms: {
                 url: 'https://dev.services.atlassian.com',
                 host: 'rockmelon-storage.dev.atl-paas.net'
+            },
+            tracing: {
+                traceId: 'trace-id-test',
+                spanId: 'span-id-test'
             }
         };
         const fetch = (0, cache_1.createFetchRmsRuntimeV2)();
@@ -84,7 +92,9 @@ describe('createFetch', () => {
         expect((options === null || options === void 0 ? void 0 : options.agent)['keepAlive']).toBeTruthy();
         expect(options === null || options === void 0 ? void 0 : options.headers).toMatchObject({
             Authorization: 'Bearer token',
-            Host: 'rockmelon-storage.dev.atl-paas.net'
+            Host: 'rockmelon-storage.dev.atl-paas.net',
+            'x-b3-traceid': 'trace-id-test',
+            'x-b3-spanid': 'span-id-test'
         });
     });
 });
@@ -172,12 +182,6 @@ describe('Cache', () => {
             expect(result).toEqual(11);
             expect(fetch.mock.lastCall).toMatchSnapshot();
         });
-        it('handles success with ttl', async () => {
-            const { cache, fetch } = buildCache();
-            fetch.mockResolvedValueOnce({ ok: true, text: async () => JSON.stringify({ response: 13 }), status: 200 });
-            await cache.incrementAndGet('key', { ttlSeconds: 100 });
-            expect(fetch.mock.lastCall).toMatchSnapshot();
-        });
         it('handles failure', async () => {
             const { cache, fetch } = buildCache();
             fetch.mockResolvedValueOnce({ ok: false, text: async () => 'Not allowed', status: 403 });

package/out/cache.d.ts

@@ -12,9 +12,7 @@ export declare class Cache {
         ttlSeconds: number;
     }): Promise<'OK' | null>;
     get(key: string): Promise<string>;
-    incrementAndGet(key: string, opt?: {
-        ttlSeconds: number;
-    }): Promise<number>;
+    incrementAndGet(key: string): Promise<number>;
 }
 export declare function getFetchRmsRuntimeV1(): ((path: string, options?: RequestInit) => Promise<Response>) | undefined;
 export declare function createFetchRmsRuntimeV2(): (path: string, options?: RequestInit) => Promise<Response>;

package/out/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AACA,OAAkB,EAAE,WAAW,EAAE,QAAQ,IAAI,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAInF,oBAAY,QAAQ,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC;AAGzE,wBAAsB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAYtE;AAED,qBAAa,KAAK;IACJ,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC;IAGtF,OAAO,CAAC,YAAY;IAUP,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5E,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAO9F,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAOjC,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAMzF;AAED,wBAAgB,oBAAoB,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,SAAS,CAE/G;AAID,wBAAgB,uBAAuB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAwBpG;AAED,wBAAgB,OAAO,UAItB"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"AACA,OAAkB,EAAE,WAAW,EAAE,QAAQ,IAAI,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAInF,oBAAY,QAAQ,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC;AAGzE,wBAAsB,eAAe,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAYtE;AAED,qBAAa,KAAK;IACJ,OAAO,CAAC,MAAM;gBAAN,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC;IAGtF,OAAO,CAAC,YAAY;IAUP,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5E,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAO9F,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAOjC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAM3D;AAED,wBAAgB,oBAAoB,IAAI,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,SAAS,CAE/G;AAID,wBAAgB,uBAAuB,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,QAAQ,CAAC,CA2BpG;AAED,wBAAgB,OAAO,UAItB"}

package/out/cache.js

@@ -43,8 +43,8 @@ class Cache {
         const { value: result } = await getResponseBody(response);
         return result;
     }
-    async incrementAndGet(key, opt) {
-        const response = await this.client('rms/store/incr', this.buildRequest(Object.assign({ key }, opt)));
+    async incrementAndGet(key) {
+        const response = await this.client('rms/store/incr', this.buildRequest({ key }));
         const { response: result } = await getResponseBody(response);
         return result;
     }
@@ -56,14 +56,14 @@ function getFetchRmsRuntimeV1() {
 }
 exports.getFetchRmsRuntimeV1 = getFetchRmsRuntimeV1;
 function createFetchRmsRuntimeV2() {
-    const { proxy, rms } = (0, api_1.getRuntime)();
+    const { proxy, rms, tracing } = (0, api_1.getRuntime)();
     const agent = new https_1.Agent({ keepAlive: true });
     if (!(rms === null || rms === void 0 ? void 0 : rms.url) || !(rms === null || rms === void 0 ? void 0 : rms.host)) {
         throw new Error('RMS config not available.');
     }
     return async function (path, options) {
         const rmsFullUrl = new URL(rms.url) + path;
-        return await global['fetch'](rmsFullUrl, Object.assign(Object.assign({}, options), { agent, headers: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.headers), { Authorization: `Bearer ${proxy.token}`, Host: rms.host }) }));
+        return await global['fetch'](rmsFullUrl, Object.assign(Object.assign({}, options), { agent, headers: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.headers), { Authorization: `Bearer ${proxy.token}`, Host: rms.host, 'x-b3-traceid': tracing.traceId, 'x-b3-spanid': tracing.spanId }) }));
     };
 }
 exports.createFetchRmsRuntimeV2 = createFetchRmsRuntimeV2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cache",
-  "version": "0.2.0-next.0",
+  "version": "0.2.0-next.2",
   "description": "Forge Cache methods",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -20,6 +20,6 @@
     "node-fetch": "2.6.7"
   },
   "dependencies": {
-    "@forge/api": "^2.16.0"
+    "@forge/api": "^2.17.0-next.0"
   }
 }