@platformatic/watt-extra 1.0.0 → 1.0.1-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/watt-extra",
-  "version": "1.0.0",
+  "version": "1.0.1-alpha.0",
   "description": "The Platformatic runtime manager",
   "type": "module",
   "scripts": {
@@ -9,7 +9,13 @@
     "start": "node index.js"
   },
   "bin": {
-    "watt-extra": "./cli.js"
+    "watt-extra": "cli.js"
+  },
+  "author": "Platformatic Team",
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/platformatic/watt-extra.git"
   },
   "devDependencies": {
     "@fastify/websocket": "^11.1.0",

package/plugins/compliancy.js

@@ -16,6 +16,7 @@ async function compliancy (app, _opts) {
 
     const runtime = app.watt.runtime
     const applicationId = app.instanceConfig?.applicationId
+    const instanceId = app.instanceId
     const appDir = app.env.PLT_APP_DIR
 
     const { default: build, setDefaultHeaders } = await import('../clients/compliance/compliance.mjs')
@@ -38,8 +39,11 @@ async function compliancy (app, _opts) {
 
     {
       const res = await compliancyClient.postMetadata({
-        applicationId,
-        data: compliancyMetadata
+        body: {
+          applicationId,
+          podId: instanceId,
+          data: compliancyMetadata
+        }
       })
 
       if (res.statusCode !== 200 && res.statusCode !== 201) {
@@ -51,7 +55,9 @@ async function compliancy (app, _opts) {
     }
 
     {
-      const res = await compliancyClient.postCompliance({ applicationId })
+      const res = await compliancyClient.postCompliance({
+        body: { applicationId, podId: instanceId }
+      })
       if (res.statusCode !== 200) {
         app.log.error(res, 'Failed to get compliance status')
         throw new CompliancyStatusError()

package/plugins/init.js

@@ -9,7 +9,10 @@ async function initPlugin (app) {
     // every time, because the token might be expired
     // And we cannot set the global dispatcher because it's shared with the runtime main thread.
     setDefaultHeaders(await app.getAuthorizationHeader())
-    const request = { podId }
+    const request = {
+      podId,
+      apiVersion: 'v3'
+    }
     if (applicationName) {
       request.applicationName = applicationName
     }

package/test/compliancy.test.js

@@ -30,8 +30,8 @@ test('should retrieve and send compliancy metadata', async (t) => {
 
   const icc = await startICC(t, {
     applicationId,
-    saveComplianceMetadata: async (applicationId, data) => {
-      receivedMetadata.push({ applicationId, data })
+    saveComplianceMetadata: async (metadata) => {
+      receivedMetadata.push(metadata)
     },
     getComplianceReport: async () => {
       return { compliant: true }
@@ -56,6 +56,7 @@ test('should retrieve and send compliancy metadata', async (t) => {
 
   const [metadata] = receivedMetadata
   assert.strictEqual(metadata.applicationId, applicationId)
+  assert.deepStrictEqual(metadata.podId, app.instanceId)
   assert.deepStrictEqual(metadata.data, {
     npmDependencies: {
       runtime: {

package/test/helper.js

@@ -118,11 +118,6 @@ async function startICC (t, opts = {}) {
       }
     })
 
-    icc.post('/applications/:id/metadata', async (req) => {
-      const { applicationId, data } = req.body
-      return opts.saveComplianceMetadata?.(applicationId, data)
-    })
-
     icc.post('/pods/:id/instance/state', async (req) => {
       const instanceId = req.params.id
       const state = req.body
@@ -135,13 +130,11 @@ async function startICC (t, opts = {}) {
   // Compliance
   await icc.register(async (icc) => {
     icc.post('/metadata', async (req) => {
-      const { applicationId, data } = req.body
-      return opts.saveComplianceMetadata?.(applicationId, data)
+      return opts.saveComplianceMetadata?.(req.body)
     })
 
     icc.post('/compliance', async (req) => {
-      const { applicationId } = req.body
-      return opts.getComplianceReport?.(applicationId)
+      return opts.getComplianceReport?.(req.body)
     })
   }, { prefix: '/compliance' })
 

package/test/init.test.js

@@ -191,6 +191,7 @@ test('init plugin sends correct request structure when PLT_APP_NAME provided', a
   equal(capturedRequest.params.podId, instanceId)
   equal(capturedRequest.body.applicationName, applicationName)
   equal(capturedRequest.body.podId, instanceId)
+  equal(capturedRequest.body.apiVersion, 'v3')
 })
 
 test('init plugin sends request without applicationName when not provided', async (t) => {
@@ -237,6 +238,7 @@ test('init plugin sends request without applicationName when not provided', asyn
   equal(capturedRequest.params.podId, instanceId)
   equal(capturedRequest.body.podId, instanceId)
   equal(capturedRequest.body.applicationName, undefined)
+  equal(capturedRequest.body.apiVersion, 'v3')
 
   // But app should have the name from ICC response
   equal(app.applicationName, applicationName)