Merge pull request #382 from camunda/fix-375

fix(camunda8): add optional tenantId to deployResourcesFromFiles fixes #375

Author: jwulf

README.md

@@ -4,9 +4,11 @@
 
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
+Full API Docs are [here](https://camunda.github.io/camunda-8-js-sdk/).
+
 This is the official Camunda 8 JavaScript SDK. It is written in TypeScript and runs on Node.js. See why [this does not run in a web browser](https://github.com/camunda/camunda-8-js-sdk/issues/79).
 
-Full API Docs are [here](https://camunda.github.io/camunda-8-js-sdk/). See the QUICKSTART.md file in [the repository](https://github.com/camunda/camunda-8-js-sdk) for a quick start.
+See the QUICKSTART.md file in [the repository](https://github.com/camunda/camunda-8-js-sdk) for a quick start.
 
 ## What does "supported" mean?
 
@@ -36,8 +38,9 @@ In this release, the functionality of Camunda 8 is exposed via dedicated clients
 import { Camunda8 } from '@camunda8/sdk'
 
 const c8 = new Camunda8()
+const restClient = c8.getCamundaRestClient() // New REST API
 const zeebe = c8.getZeebeGrpcApiClient()
-const zeebeRest = c8.getZeebeRestClient()
+const zeebeRest = c8.getZeebeRestClient() // Deprecated
 const operate = c8.getOperateApiClient()
 const optimize = c8.getOptimizeApiClient()
 const tasklist = c8.getTasklistApiClient()

package.json

@@ -12,10 +12,10 @@
 		"sm:start": "docker compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml up -d",
 		"sm:stop": "docker compose -f docker/docker-compose-multitenancy.yaml -f docker/docker-compose-modeler.yaml down && docker/cleanup-volumes.sh",
 		"test": "cross-env CAMUNDA_UNIT_TEST=true jest '\\.unit\\.' -u --detectOpenHandles --runInBand --testPathIgnorePatterns integration --testPathIgnorePatterns local-integration --testPathIgnorePatterns disconnection --testPathIgnorePatterns multitenancy --testPathIgnorePatterns __tests__/config",
-		"test:integration": "jest --runInBand --testPathIgnorePatterns disconnection --testPathIgnorePatterns '\\.unit\\.' --testPathIgnorePatterns __tests__/config --testPathIgnorePatterns multitenancy --detectOpenHandles --verbose true -u",
+		"test:integration": "jest --runInBand --testPathIgnorePatterns disconnection --testPathIgnorePatterns '\\.unit\\.' --testPathIgnorePatterns __tests__/config --testPathIgnorePatterns __tests__/multitenancy --detectOpenHandles --verbose true -u",
 		"test:multitenancy": "jest --runInBand --testPathIgnorePatterns disconnection --testPathIgnorePatterns admin --testPathIgnorePatterns '\\.unit\\.' --testPathIgnorePatterns __tests__/config - --detectOpenHandles --verbose true -u",
 		"test:local": "jest --runInBand --verbose true --detectOpenHandles local-integration -u",
-		"test:local-integration": "jest --runInBand --detectOpenHandles --verbose --testPathIgnorePatterns disconnection --testPathIgnorePatterns '\\.unit\\.' --testPathIgnorePatterns admin --testPathIgnorePatterns multitenancy --testPathIgnorePatterns __tests__/config -u",
+		"test:local-integration": "jest --runInBand --detectOpenHandles --verbose --testPathIgnorePatterns disconnection --testPathIgnorePatterns '\\.unit\\.' --testPathIgnorePatterns admin --testPathIgnorePatterns --testPathIgnorePatterns __tests__/multitenancy --testPathIgnorePatterns __tests__/config -u",
 		"test:docker": "jest --runInBand --testPathIgnorePatterns disconnection --testPathIgnorePatterns __tests__/config local-integration --detectOpenHandles --verbose true",
 		"test:disconnect": "jest --runInBand --verbose true --detectOpenHandles --testPathIgnorePatterns __tests__/config disconnection",
 		"test:smoketest": "npm run build && node smoke-test/smoke-test.js && npx tsd --typings dist/",

src/__tests__/c8/rest/broadcastSigna.rest.spec.ts src/__tests__/c8/rest/broadcastSignal.rest.spec.ts

@@ -0,0 +1,23 @@
+import path from 'node:path'
+
+import { CamundaRestClient } from '../../../c8/lib/CamundaRestClient'
+
+let processDefinitionId: string
+const restClient = new CamundaRestClient()
+
+test('It can deploy with a specific tenantId', async () => {
+	const res = await restClient.deployResourcesFromFiles(
+		[
+			path.join(
+				'.',
+				'src',
+				'__tests__',
+				'testdata',
+				'hello-world-complete-rest.bpmn'
+			),
+		],
+		{ tenantId: 'green' }
+	)
+	processDefinitionId = res.processes[0].processDefinitionId
+	expect(processDefinitionId).toBeTruthy()
+})

src/__tests__/multitenancy/c8/deployResourcesFromFiles.rest.spec.ts

@@ -851,7 +851,10 @@ export class CamundaRestClient {
 	 *
 	 * @since 8.6.0
 	 */
-	public async deployResourcesFromFiles(files: string[]) {
+	public async deployResourcesFromFiles(
+		files: string[],
+		{ tenantId }: { tenantId?: string } = {}
+	) {
 		const resources: { content: string; name: string }[] = []
 
 		for (const file of files) {
@@ -861,7 +864,7 @@ export class CamundaRestClient {
 			})
 		}
 
-		return this.deployResources(resources)
+		return this.deployResources(resources, tenantId ?? this.tenantId)
 	}
 
 	/**