@pbvision/cloud-run-service 0.0.3 → 0.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pbvision/cloud-run-service",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "fastify-firestore-service Web Framework on Cloud Run",
   "license": "Apache-2.0",
   "type": "module",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@google-cloud/tasks": "^4.0.1",
-    "@pbvision/fastify-firestore-service": "^0.0.19",
+    "@pbvision/fastify-firestore-service": "^0.0.20",
     "google-auth-library": "^9.4.2"
   },
   "devDependencies": {

package/src/call-service-api.js

@@ -3,7 +3,7 @@
 // works if this service has been granted access to the target service!)
 import { GoogleAuth } from 'google-auth-library'
 
-import { getServiceHost } from './utils.js'
+import { getServiceProtocolAndHost } from './utils.js'
 
 const auth = new GoogleAuth()
 
@@ -13,12 +13,10 @@ export async function callServiceAPI ({
   body = undefined, qsParams = undefined,
   method = 'POST', headers = {}, isServiceInternal = true
 }) {
-  const host = getServiceHost(serviceName)
-  // istanbul ignore next
-  const protocol = host === 'localhost' ? 'https' : 'http'
-  const url = `${protocol}://${host}${path}`
+  const protocolAndHost = getServiceProtocolAndHost(serviceName)
+  const url = `${protocolAndHost}${path}`
   if (isServiceInternal) {
-    const targetAudience = `https://${host}/`
+    const targetAudience = `${protocolAndHost}/`
     const client = await auth.getIdTokenClient(targetAudience)
     const token = await client.idTokenProvider.fetchIdToken(targetAudience)
     headers.Authorization = `Bearer ${token}`

package/src/tasks.js

@@ -1,6 +1,6 @@
 import { CloudTasksClient } from '@google-cloud/tasks'
 
-import { getServiceHost } from './utils.js'
+import { getServiceProtocolAndHost } from './utils.js'
 
 const tasksClient = new CloudTasksClient()
 
@@ -30,13 +30,14 @@ export async function enqueueCloudTask ({
 }) {
   const parent = tasksClient.queuePath(
     process.env.PROJECT, process.env.REGION, queue)
+  const protocolAndHost = getServiceProtocolAndHost(service)
   const task = {
     httpRequest: {
       headers: {
         'Content-Type': 'application/json'
       },
       httpMethod: 'POST',
-      url: `https://${getServiceHost(service)}/${queue.replace(/-/g, '_')}`,
+      url: `${protocolAndHost}/${queue.replace(/-/g, '_')}`,
       body: Buffer.from(JSON.stringify(payload)).toString('base64'),
       oidcToken: {
         serviceAccountEmail: `cr-${process.env.SERVICE}@${process.env.PROJECT}.iam.gserviceaccount.com`

package/src/utils.js

@@ -2,6 +2,13 @@ import assert from 'node:assert'
 
 import { port as portForThisService } from './port.js'
 
+export function getServiceProtocolAndHost (serviceName) {
+  const host = getServiceHost(serviceName)
+  // istanbul ignore next
+  const protocol = host === 'localhost' ? 'https' : 'http'
+  return `${protocol}://${host}`
+}
+
 export function getServiceHost (serviceName) {
   if (isLocalhost()) {
     if (process.env.SERVICE === serviceName) {

package/test/unit-test-call-service-api.js

@@ -51,7 +51,7 @@ class TestCallServiceAPI extends AppTest {
     // make sure Google Auth was called with appropriate arguments (or not, if
     // this wasn't an internal call)
     if (shouldHaveToken) {
-      const targetAudience = `https://localhost:${expPort}/`
+      const targetAudience = `http://localhost:${expPort}/`
       expect(GoogleAuth.prototype.getIdTokenClient).toHaveBeenCalledWith(targetAudience)
       expect(this.fetchIdToken).toHaveBeenCalledWith(targetAudience)
     } else {

package/test/unit-test-tasks.js

@@ -49,7 +49,7 @@ class TestTasks extends BaseTest {
           oidcToken: {
             serviceAccountEmail: 'cr-tbd@xyz-dev.iam.gserviceaccount.com'
           },
-          url: 'https://localhost:8888/test_queue'
+          url: 'http://localhost:8888/test_queue'
         },
         ...taskExpectations
       }