create-qpq-app 0.1.26 → 0.1.28

package/template/apps/qpqjs/services/test/service/src/smoke/suites/smokeSuites.ts

@@ -0,0 +1,46 @@
+import { SmokeSuite } from '../harness/types/SmokeSuite';
+import { emailReceiveSmokeSuite } from './emailReceive/emailReceiveSmokeSuite';
+import { encryptedResourcesSmokeSuite } from './encryptedResources/encryptedResourcesSmokeSuite';
+import { eventBusSmokeSuite } from './eventBus/eventBusSmokeSuite';
+import { eventDocSmokeSuite } from './eventDoc/eventDocSmokeSuite';
+import { keyValueStoreSmokeSuite } from './keyValueStore/keyValueStoreSmokeSuite';
+import { keyValueStoreStreamSmokeSuite } from './keyValueStoreStream/keyValueStoreStreamSmokeSuite';
+import { noopSmokeSuite } from './noop/noopSmokeSuite';
+import { openApiSmokeSuite } from './openApi/openApiSmokeSuite';
+import { parameterSmokeSuite } from './parameter/parameterSmokeSuite';
+import { scheduleSmokeSuite } from './schedule/scheduleSmokeSuite';
+import { scopedKeyValueStoreSmokeSuite } from './scopedKeyValueStore/scopedKeyValueStoreSmokeSuite';
+import { scopedStorageDriveSmokeSuite } from './scopedStorageDrive/scopedStorageDriveSmokeSuite';
+import { secretSmokeSuite } from './secret/secretSmokeSuite';
+import { signingKeySmokeSuite } from './signingKey/signingKeySmokeSuite';
+import { storageDriveSmokeSuite } from './storageDrive/storageDriveSmokeSuite';
+import { storageDriveEventSmokeSuite } from './storageDriveEvent/storageDriveEventSmokeSuite';
+
+/**
+ * Every suite a smoke run executes. Adding one: a folder under suites/
+ * exporting a SmokeSuite, and a line here. A suite with a cross-service half
+ * also has a folder of the same name under testa's smoke/suites.
+ *
+ * Every test runs in parallel on its own queue message, so none may depend on
+ * another having finished. A test's name is the key its queue message carries
+ * and must be unique across suites; its id in the run record is its position
+ * across this list, so append rather than reorder where possible.
+ */
+export const smokeSuites: SmokeSuite[] = [
+  noopSmokeSuite,
+  keyValueStoreSmokeSuite,
+  parameterSmokeSuite,
+  secretSmokeSuite,
+  storageDriveSmokeSuite,
+  eventBusSmokeSuite,
+  scheduleSmokeSuite,
+  openApiSmokeSuite,
+  eventDocSmokeSuite,
+  signingKeySmokeSuite,
+  scopedStorageDriveSmokeSuite,
+  storageDriveEventSmokeSuite,
+  scopedKeyValueStoreSmokeSuite,
+  keyValueStoreStreamSmokeSuite,
+  encryptedResourcesSmokeSuite,
+  emailReceiveSmokeSuite,
+];

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDrive/index.ts

@@ -0,0 +1,2 @@
+export * from './logic';
+export * from './storageDriveSmokeSuite';

package/template/apps/qpqjs/services/test/service/src/smoke/{tests/crossService → suites/storageDrive/logic}/askRunCrossServiceStorageDriveTest.ts

@@ -16,7 +16,7 @@ import {
   CrossServiceStorageDriveProbeResult,
 } from '@qpqjs/testa-models';
 
-import { askSmokeAssert } from '../askSmokeAssert';
+import { askSmokeAssert } from '../../../harness/assert/askSmokeAssert';
 
 // testa writes a file into the drive THIS service owns, through its foreign
 // (exact-ARN) S3 grant. An error from inside testa is that grant; the

package/template/apps/qpqjs/services/test/service/src/smoke/{tests/storageDrive → suites/storageDrive/logic}/askRunStorageDriveTest.ts

@@ -10,7 +10,7 @@ import {
 
 import { SMOKE_PROBE_DRIVE } from '@qpqjs/constants';
 
-import { askSmokeAssert } from '../askSmokeAssert';
+import { askSmokeAssert } from '../../../harness/assert/askSmokeAssert';
 
 // Every S3 action the owned-drive grant covers (PutObject, GetObject,
 // ListBucket, DeleteObject). Unlike the other kinds this grant is a bucket

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDrive/logic/index.ts

@@ -0,0 +1,2 @@
+export * from './askRunCrossServiceStorageDriveTest';
+export * from './askRunStorageDriveTest';

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDrive/storageDriveSmokeSuite.ts

@@ -0,0 +1,14 @@
+import { SmokeSuite } from '../../harness/types/SmokeSuite';
+import { askRunCrossServiceStorageDriveTest } from './logic/askRunCrossServiceStorageDriveTest';
+import { askRunStorageDriveTest } from './logic/askRunStorageDriveTest';
+
+/** Every S3 action on the probe drive, from this service and from testa. No config: the drive belongs to the harness. */
+export const storageDriveSmokeSuite: SmokeSuite = {
+  tests: [
+    { name: 'storageDrive', askRun: askRunStorageDriveTest },
+    {
+      name: 'crossServiceStorageDrive',
+      askRun: askRunCrossServiceStorageDriveTest,
+    },
+  ],
+};

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDriveEvent/config/defineStorageDriveEventSmoke.ts

@@ -0,0 +1,27 @@
+import { defineStorageDrive, QPQConfig, QpqFunctionRuntime } from 'quidproquo';
+
+import { SMOKE_FILE_EVENT_DRIVE } from '../constants/SMOKE_FILE_EVENT_DRIVE';
+import { SMOKE_SCOPED_FILE_EVENT_DRIVE } from '../constants/SMOKE_SCOPED_FILE_EVENT_DRIVE';
+
+/**
+ * A write or delete on either drive fires the handler, which writes a marker
+ * into the probe store for the test to poll. The scoped drive's events must
+ * arrive with the scope split off.
+ */
+export const defineStorageDriveEventSmoke = (): QPQConfig => {
+  const onSmokeFileEvent: QpqFunctionRuntime = {
+    basePath: __dirname,
+    relativePath: '../entry/storageDrive/onSmokeFileEvent',
+    functionName: 'onSmokeFileEvent',
+  };
+
+  return [
+    defineStorageDrive(SMOKE_FILE_EVENT_DRIVE, {
+      onEvent: { create: onSmokeFileEvent, delete: onSmokeFileEvent },
+    }),
+    defineStorageDrive(SMOKE_SCOPED_FILE_EVENT_DRIVE, {
+      scoped: true,
+      onEvent: { create: onSmokeFileEvent, delete: onSmokeFileEvent },
+    }),
+  ];
+};

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDriveEvent/config/index.ts

@@ -0,0 +1 @@
+export * from './defineStorageDriveEventSmoke';

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDriveEvent/constants/SMOKE_FILE_EVENT_DRIVE.ts

@@ -0,0 +1,2 @@
+/** The unscoped drive whose create and delete handlers write the markers the file event test polls for. */
+export const SMOKE_FILE_EVENT_DRIVE = 'smoke-file-event';

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDriveEvent/constants/SMOKE_SCOPED_FILE_EVENT_DRIVE.ts

@@ -0,0 +1,2 @@
+/** The scoped drive whose events must reach the handler with the scope split off the path. */
+export const SMOKE_SCOPED_FILE_EVENT_DRIVE = 'smoke-scoped-file-event';

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDriveEvent/constants/index.ts

@@ -0,0 +1,2 @@
+export * from './SMOKE_FILE_EVENT_DRIVE';
+export * from './SMOKE_SCOPED_FILE_EVENT_DRIVE';

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDriveEvent/entry/index.ts

@@ -0,0 +1 @@
+export * from './storageDrive';

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDriveEvent/entry/storageDrive/index.ts

@@ -0,0 +1 @@
+export * from './onSmokeFileEvent';

package/template/apps/qpqjs/services/test/service/src/smoke/{storageDrive → suites/storageDriveEvent/entry/storageDrive}/onSmokeFileEvent.ts

@@ -9,7 +9,7 @@ import {
 import { SMOKE_PROBE_STORE } from '@qpqjs/constants';
 import { SmokeProbeRecord } from '@qpqjs/test-models';
 
-import { smokeFileEventMarkerId } from './smokeFileEventMarkerId';
+import { smokeFileEventMarkerId } from '../../logic/smokeFileEventMarkerId';
 
 // Fan-in for the file event test: both the scoped and the unscoped event
 // drive point create and delete here. The marker records what the event

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDriveEvent/index.ts

@@ -0,0 +1,5 @@
+export * from './config';
+export * from './constants';
+export * from './entry';
+export * from './logic';
+export * from './storageDriveEventSmokeSuite';

package/template/apps/qpqjs/services/test/service/src/smoke/{tests/storageDriveEvent → suites/storageDriveEvent/logic}/askRunStorageDriveEventTest.ts

@@ -6,13 +6,11 @@ import {
   StorageDriveEventType,
 } from 'quidproquo';
 
-import {
-  SMOKE_FILE_EVENT_DRIVE,
-  SMOKE_SCOPED_PROBE_DRIVE,
-} from '../../constants/smokeProbe';
-import { smokeFileEventMarkerId } from '../../storageDrive/smokeFileEventMarkerId';
-import { askSmokeAssert } from '../askSmokeAssert';
-import { askSmokePollForMarker } from '../askSmokePollForMarker';
+import { askSmokeAssert } from '../../../harness/assert/askSmokeAssert';
+import { askSmokePollForMarker } from '../../../harness/assert/askSmokePollForMarker';
+import { SMOKE_FILE_EVENT_DRIVE } from '../constants/SMOKE_FILE_EVENT_DRIVE';
+import { SMOKE_SCOPED_FILE_EVENT_DRIVE } from '../constants/SMOKE_SCOPED_FILE_EVENT_DRIVE';
+import { smokeFileEventMarkerId } from './smokeFileEventMarkerId';
 
 // The storage drive event path end to end: a write fires the create handler
 // and a delete fires the delete handler, locally through the file watcher and
@@ -43,7 +41,7 @@ export function* askRunStorageDriveEventTest(): AskResponse<void> {
   );
 
   yield* askFileWriteTextContents(
-    SMOKE_SCOPED_PROBE_DRIVE,
+    SMOKE_SCOPED_FILE_EVENT_DRIVE,
     filepath,
     fileId,
     undefined,
@@ -67,7 +65,7 @@ export function* askRunStorageDriveEventTest(): AskResponse<void> {
     'scoped create handler did not run under the event scope'
   );
 
-  yield* askFileDelete(SMOKE_SCOPED_PROBE_DRIVE, [filepath], scope);
+  yield* askFileDelete(SMOKE_SCOPED_FILE_EVENT_DRIVE, [filepath], scope);
 
   const scopedDeleted = yield* askSmokePollForMarker(
     smokeFileEventMarkerId(filepath, StorageDriveEventType.Delete),

package/template/apps/qpqjs/services/test/service/src/smoke/{tests/storageDriveEvent → suites/storageDriveEvent/logic}/index.ts

@@ -1 +1,2 @@
 export * from './askRunStorageDriveEventTest';
+export * from './smokeFileEventMarkerId';

package/template/apps/qpqjs/services/test/service/src/smoke/suites/storageDriveEvent/storageDriveEventSmokeSuite.ts

@@ -0,0 +1,9 @@
+import { SmokeSuite } from '../../harness/types/SmokeSuite';
+import { defineStorageDriveEventSmoke } from './config/defineStorageDriveEventSmoke';
+import { askRunStorageDriveEventTest } from './logic/askRunStorageDriveEventTest';
+
+/** File create and delete events off an unscoped and a scoped drive. */
+export const storageDriveEventSmokeSuite: SmokeSuite = {
+  defineConfig: defineStorageDriveEventSmoke,
+  tests: [{ name: 'storageDriveEvent', askRun: askRunStorageDriveEventTest }],
+};

package/template/apps/qpqjs/services/testa/models/src/CrossServiceProbePayload.ts

@@ -1,4 +1,4 @@
-// Input to testa's smokeCrossServiceProbe service function.
+// Input to testa's key value store and storage drive probe service functions.
 export type CrossServiceProbePayload = {
   probeId: string;
 };

package/template/apps/qpqjs/services/testa/service/src/infrastructure.ts

@@ -3,13 +3,13 @@ import { defineDevServerOptions } from 'quidproquo-dev-server/config';
 import { QpqjsServiceEnum } from '@qpqjs/constants';
 import { defineQpqjsService } from '@qpqjs/service-utils';
 
-import { defineCrossServiceProbe } from './crossServiceProbe/config/defineCrossServiceProbe';
+import { defineSmokeProbes } from './smoke/config/defineSmokeProbes';
 
 // testa exists to be "the other service" in the smoke suite: it owns nothing
 // of its own and exercises the cross-service (foreign ARN) IAM grants against
 // resources the test service owns.
 export default [
-  defineDevServerOptions({ port: 3084 }),
+  defineDevServerOptions({ views: { port: 3084 } }),
 
   // never change the app name, it will result in a new stack!
   defineQpqjsService(
@@ -18,5 +18,5 @@ export default [
     '../../../../../../dist/apps/qpqjs/services/testa/service'
   ),
 
-  defineCrossServiceProbe(),
+  defineSmokeProbes(),
 ];

package/template/apps/qpqjs/services/testa/service/src/smoke/config/defineSmokeProbes.ts

@@ -0,0 +1,16 @@
+import { QPQConfig } from 'quidproquo';
+
+import { defineKeyValueStoreSmokeProbe } from '../suites/keyValueStore/config/defineKeyValueStoreSmokeProbe';
+import { defineSigningKeySmokeProbe } from '../suites/signingKey/config/defineSigningKeySmokeProbe';
+import { defineStorageDriveSmokeProbe } from '../suites/storageDrive/config/defineStorageDriveSmokeProbe';
+
+/**
+ * The cross-service half of the test service's smoke suites. Each folder under
+ * suites/ mirrors the test service suite of the same name and exercises that
+ * suite's foreign grant against a resource the test service owns.
+ */
+export const defineSmokeProbes = (): QPQConfig => [
+  defineKeyValueStoreSmokeProbe(),
+  defineStorageDriveSmokeProbe(),
+  defineSigningKeySmokeProbe(),
+];

package/template/apps/qpqjs/services/testa/service/src/smoke/config/index.ts

@@ -0,0 +1 @@
+export * from './defineSmokeProbes';

package/template/apps/qpqjs/services/{test/service/src/tick → testa/service/src/smoke}/index.ts

@@ -1 +1,2 @@
 export * from './config';
+export * from './suites';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/index.ts

@@ -0,0 +1,3 @@
+export * from './keyValueStore';
+export * from './signingKey';
+export * from './storageDrive';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/keyValueStore/config/defineKeyValueStoreSmokeProbe.ts

@@ -0,0 +1,33 @@
+import {
+  defineKeyValueStore,
+  defineServiceFunction,
+  QPQConfig,
+} from 'quidproquo';
+
+import {
+  QpqjsServiceEnum,
+  SMOKE_CROSS_SERVICE_KEY_VALUE_STORE_PROBE_FUNCTION_NAME,
+  SMOKE_PROBE_STORE,
+} from '@qpqjs/constants';
+import { SmokeProbeRecord } from '@qpqjs/test-models';
+
+/**
+ * The test service's probe store declared FOREIGN (owned by test), which is
+ * what grants this service's role exact-ARN access to it, plus the service
+ * function the test service's crossServiceKeyValueStore test invokes.
+ */
+export const defineKeyValueStoreSmokeProbe = (): QPQConfig => [
+  defineKeyValueStore<SmokeProbeRecord>(SMOKE_PROBE_STORE, 'probeId', [], {
+    indexes: ['category'],
+    owner: { module: QpqjsServiceEnum.Test },
+  }),
+  defineServiceFunction(
+    {
+      basePath: __dirname,
+      relativePath:
+        '../entry/serviceFunction/smokeCrossServiceKeyValueStoreProbe',
+      functionName: 'smokeCrossServiceKeyValueStoreProbe',
+    },
+    { functionName: SMOKE_CROSS_SERVICE_KEY_VALUE_STORE_PROBE_FUNCTION_NAME }
+  ),
+];

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/keyValueStore/config/index.ts

@@ -0,0 +1 @@
+export * from './defineKeyValueStoreSmokeProbe';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/keyValueStore/entry/serviceFunction/index.ts

@@ -0,0 +1 @@
+export * from './smokeCrossServiceKeyValueStoreProbe';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/keyValueStore/logic/index.ts

@@ -0,0 +1 @@
+export * from './askProbeForeignKeyValueStore';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/signingKey/config/defineSigningKeySmokeProbe.ts

@@ -0,0 +1,28 @@
+import { defineServiceFunction, defineSigningKey, QPQConfig } from 'quidproquo';
+
+import {
+  QpqjsServiceEnum,
+  SMOKE_CROSS_SERVICE_SIGNING_KEY_PROBE_FUNCTION_NAME,
+  SMOKE_PROBE_SIGNING_KEY,
+} from '@qpqjs/constants';
+
+/**
+ * The test service's signing key declared FOREIGN (owned by test), plus the
+ * service function the test service's crossServiceSigningKey test invokes.
+ * The one foreign grant that is alias-conditioned rather than exact-ARN: the
+ * owner's alias name is what this declaration must resolve to, or
+ * GetPublicKey is denied.
+ */
+export const defineSigningKeySmokeProbe = (): QPQConfig => [
+  defineSigningKey(SMOKE_PROBE_SIGNING_KEY, {
+    owner: { module: QpqjsServiceEnum.Test },
+  }),
+  defineServiceFunction(
+    {
+      basePath: __dirname,
+      relativePath: '../entry/serviceFunction/smokeCrossServiceSigningKeyProbe',
+      functionName: 'smokeCrossServiceSigningKeyProbe',
+    },
+    { functionName: SMOKE_CROSS_SERVICE_SIGNING_KEY_PROBE_FUNCTION_NAME }
+  ),
+];

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/signingKey/config/index.ts

@@ -0,0 +1 @@
+export * from './defineSigningKeySmokeProbe';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/signingKey/entry/index.ts

@@ -0,0 +1 @@
+export * from './serviceFunction';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/signingKey/entry/serviceFunction/index.ts

@@ -0,0 +1 @@
+export * from './smokeCrossServiceSigningKeyProbe';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/signingKey/index.ts

@@ -0,0 +1,3 @@
+export * from './config';
+export * from './entry';
+export * from './logic';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/signingKey/logic/index.ts

@@ -0,0 +1 @@
+export * from './askProbeForeignSigningKey';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/storageDrive/config/defineStorageDriveSmokeProbe.ts

@@ -0,0 +1,31 @@
+import {
+  defineServiceFunction,
+  defineStorageDrive,
+  QPQConfig,
+} from 'quidproquo';
+
+import {
+  QpqjsServiceEnum,
+  SMOKE_CROSS_SERVICE_STORAGE_DRIVE_PROBE_FUNCTION_NAME,
+  SMOKE_PROBE_DRIVE,
+} from '@qpqjs/constants';
+
+/**
+ * The test service's probe drive declared FOREIGN (owned by test), which is
+ * what grants this service's role exact-ARN access to it, plus the service
+ * function the test service's crossServiceStorageDrive test invokes.
+ */
+export const defineStorageDriveSmokeProbe = (): QPQConfig => [
+  defineStorageDrive(SMOKE_PROBE_DRIVE, {
+    owner: { module: QpqjsServiceEnum.Test },
+  }),
+  defineServiceFunction(
+    {
+      basePath: __dirname,
+      relativePath:
+        '../entry/serviceFunction/smokeCrossServiceStorageDriveProbe',
+      functionName: 'smokeCrossServiceStorageDriveProbe',
+    },
+    { functionName: SMOKE_CROSS_SERVICE_STORAGE_DRIVE_PROBE_FUNCTION_NAME }
+  ),
+];

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/storageDrive/config/index.ts

@@ -0,0 +1 @@
+export * from './defineStorageDriveSmokeProbe';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/storageDrive/entry/index.ts

@@ -0,0 +1 @@
+export * from './serviceFunction';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/storageDrive/entry/serviceFunction/index.ts

@@ -0,0 +1 @@
+export * from './smokeCrossServiceStorageDriveProbe';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/storageDrive/index.ts

@@ -0,0 +1,3 @@
+export * from './config';
+export * from './entry';
+export * from './logic';

package/template/apps/qpqjs/services/testa/service/src/smoke/suites/storageDrive/logic/index.ts

@@ -0,0 +1 @@
+export * from './askProbeForeignStorageDrive';

package/template/apps/todo/deploy.config.json

@@ -1,11 +1,20 @@
 {
-  "prefix": "todo",
-  "environments": {
+  "deployments": {
     "development": {
-      "platform": "docker"
+      "platform": "docker",
+      "name": "todo",
+      "environment": "development",
+      "settings": {
+        "ROOT_DOMAINS": "todo.quidproquojs.com"
+      }
     },
     "production": {
-      "platform": "docker"
+      "platform": "docker",
+      "name": "todo",
+      "environment": "production",
+      "settings": {
+        "ROOT_DOMAINS": "todo.quidproquojs.com"
+      }
     }
   }
 }

package/template/apps/todo/packages/constants/src/index.ts

@@ -1,3 +1,2 @@
-export * from './domain';
 export * from './TodoServiceEnum';
 export * from './userDirectory';

package/template/apps/todo/packages/service-utils/src/defineTodoService.ts

@@ -7,6 +7,7 @@ import {
   defineDefaultRouteOptions,
   defineDns,
   defineFrontendBundleOptions,
+  getDeploySettingList,
   QPQConfig,
 } from 'quidproquo';
 import {
@@ -22,13 +23,13 @@ import {
 
 import { execSync } from 'child_process';
 import {
-  TODO_DOMAINS,
   TODO_USER_DIRECTORY,
   TodoServiceEnum,
   todoServiceNames,
 } from '@todo/constants';
 
-const modulePrefix = 'todo';
+// Identity comes from the selected deployment in deploy.config.json, primed by the CLI.
+const modulePrefix = process.env.APPLICATION_NAME!;
 
 // The deployed version tag — git sha when available, so a fresh checkout
 // (or a scaffold that skipped git init) still loads.
@@ -60,12 +61,13 @@ export const defineTodoService = (
     process.env.ENVIRONMENT!,
     configRoot,
     apiBuildPath,
-    process.env.ACTOR_NAME
+    process.env.FEATURE_NAME
   ),
 
   defineApplicationVersion(`${getVersionTag()}-${new Date().toISOString()}`),
 
-  defineDns(TODO_DOMAINS),
+  // Root domains come from the deployment's ROOT_DOMAINS setting, primary first.
+  defineDns(getDeploySettingList('ROOT_DOMAINS')),
 
   defineAdminUserDirectory({
     owner: {
@@ -75,9 +77,9 @@ export const defineTodoService = (
 
   defineAuthSystem(TodoServiceEnum.Auth, TODO_USER_DIRECTORY),
 
-  // Both todo environments deploy as docker images, so there's no
-  // cross-account service map — identity comes from the environment when an
-  // aws target is ever added.
+  // Both todo deployments are docker images, so there's no cross-account
+  // service map — identity comes from the deployment when an aws target is
+  // ever added.
   defineAwsServiceAccountInfo(
     process.env.AWS_DEFAULT_ACCOUNT!,
     process.env.AWS_DEFAULT_REGION!,

package/template/apps/todo/services/admin/service/src/infrastructure.ts

@@ -4,7 +4,7 @@ import { TodoServiceEnum } from '@todo/constants';
 import { defineTodoService } from '@todo/service-utils';
 
 export default [
-  defineDevServerOptions({ port: 3082 }),
+  defineDevServerOptions({ views: { port: 3082 } }),
 
   // never change the app name, it will result in a new stack!
   defineTodoService(

package/template/apps/todo/services/admin/views/src/app/app.tsx

@@ -1,30 +1,20 @@
+import {
+  getApiUrl,
+  getFederatedViewsUrl,
+  getWebSocketUrl,
+} from 'quidproquo-web';
 import { App as QpqAdminApp } from 'quidproquo-web-admin';
 import { BaseUrlResolvers } from 'quidproquo-web-react';
 
 import { TodoServiceEnum } from '@todo/constants';
 
-export const getApiBaseUrl = () => {
-  const [_views, ...domainParts] = window.location.host.split('.');
-  const domain = domainParts.join('.');
+export const getApiBaseUrl = () => getApiUrl(TodoServiceEnum.Admin);
 
-  return window.location.hostname !== 'localhost'
-    ? `${window.location.protocol}//api.${domain}/${TodoServiceEnum.Admin}`
-    : `http://localhost:8080/api/${TodoServiceEnum.Admin}`;
-};
-
-export const getWsBaseUrl = () => {
-  const [_views, ...domainParts] = window.location.host.split('.');
-  const domain = domainParts.join('.');
-
-  return window.location.hostname !== 'localhost'
-    ? `wss://qpqadmin.${TodoServiceEnum.Admin}.${domain}`
-    : `ws://localhost:8888/${TodoServiceEnum.Admin}/qpqadmin`;
-};
+export const getWsBaseUrl = () =>
+  getWebSocketUrl(TodoServiceEnum.Admin, 'qpqadmin');
 
 export const getMFManifestBaseUrl = () =>
-  window.location.hostname !== 'localhost'
-    ? `${window.location.origin}${window.location.pathname.substring(0, window.location.pathname.lastIndexOf('/'))}`
-    : `http://localhost:3082`;
+  getFederatedViewsUrl(TodoServiceEnum.Admin);
 
 const urlResolvers: BaseUrlResolvers = {
   getApiUrl: getApiBaseUrl,

package/template/apps/todo/services/auth/service/src/infrastructure.ts

@@ -4,7 +4,7 @@ import { TodoServiceEnum } from '@todo/constants';
 import { defineTodoService } from '@todo/service-utils';
 
 export default [
-  defineDevServerOptions({ port: 3083 }),
+  defineDevServerOptions({ views: { port: 3083 } }),
 
   // never change the app name, it will result in a new stack!
   defineTodoService(

package/template/apps/todo/services/design/service/src/infrastructure.ts

@@ -4,7 +4,7 @@ import { TodoServiceEnum } from '@todo/constants';
 import { defineTodoService } from '@todo/service-utils';
 
 export default [
-  defineDevServerOptions({ port: 3081 }),
+  defineDevServerOptions({ views: { port: 3081 } }),
 
   // never change the app name, it will result in a new stack!
   defineTodoService(

package/template/apps/todo/services/shell/service/src/infrastructure.ts

@@ -54,7 +54,7 @@ const mfeHostWebEntryOptions: QPQConfigAdvancedWebEntrySettings = {
 };
 
 export default [
-  defineDevServerOptions({ port: 3080 }),
+  defineDevServerOptions({ views: { port: 3080 } }),
 
   // never change the app name, it will result in a new stack!
   defineTodoService(

package/template/apps/todo/services/todo/service/src/infrastructure.ts

@@ -4,7 +4,7 @@ import { TodoServiceEnum } from '@todo/constants';
 import { defineTodoService } from '@todo/service-utils';
 
 export default [
-  defineDevServerOptions({ port: 3084 }),
+  defineDevServerOptions({ views: { port: 3084 } }),
 
   // never change the app name, it will result in a new stack!
   defineTodoService(

package/template/docusaurus/docs/actions/core/key-value-store/ask-key-value-store-delete.md

@@ -53,7 +53,7 @@ function* askKeyValueStoreDelete(
 | --- | --- |
 | `KeyValueStoreDeleteErrorTypeEnum.ServiceUnavailable` | DynamoDB internal error or throttling. |
 | `KeyValueStoreDeleteErrorTypeEnum.ResourceNotFound` | The underlying table does not exist. |
-| `KeyValueStoreDeleteErrorTypeEnum.InvalidScope` | The `scope` option is malformed (empty, `.`, over 128 characters, or containing path separators, `..`, `@`, or null bytes), the store's partition key is not string-typed, or the partition-key value contains the reserved `@@QPQSCOPE@@` delimiter (reserved on string-pk stores, so unscoped calls reject it too). |
+| `KeyValueStoreDeleteErrorTypeEnum.InvalidScope` | The `scope` option is malformed (empty, `.`, over 128 characters, or containing path separators, `..`, `@`, or null bytes), the store's partition key is not string-typed, or the partition-key value contains the reserved `@@QPQ` marker (reserved on string-pk stores, so unscoped calls reject it too). |
 | `KeyValueStoreDeleteErrorTypeEnum.StoreNotFound` | The key value store is not declared in the qpq config (misconfiguration, e.g. a wrong name or a missing `defineKeyValueStore`). |
 
 Catch errors with `askCatch` — it returns `{ success: true, result }` or `{ success: false, error }`.

package/template/docusaurus/docs/actions/core/key-value-store/ask-key-value-store-get-all.md

@@ -55,7 +55,7 @@ function* askKeyValueStoreGetAll<Value>(
 | --- | --- |
 | `KeyValueStoreGetAllErrorTypeEnum.ServiceUnavailable` | DynamoDB internal error or throttling. |
 | `KeyValueStoreGetAllErrorTypeEnum.ResourceNotFound` | The underlying table does not exist. |
-| `KeyValueStoreGetAllErrorTypeEnum.InvalidScope` | The `scope` option is malformed (empty, `.`, over 128 characters, or containing path separators, `..`, `@`, or null bytes), the store's partition key is not string-typed, or a scoped call's partition-key value contains the reserved `@@QPQSCOPE@@` delimiter. |
+| `KeyValueStoreGetAllErrorTypeEnum.InvalidScope` | The `scope` option is malformed (empty, `.`, over 128 characters, or containing path separators, `..`, `@`, or null bytes), the store's partition key is not string-typed, or a scoped call's partition-key value contains the reserved `@@QPQ` marker. |
 | `KeyValueStoreGetAllErrorTypeEnum.StoreNotFound` | The key value store is not declared in the qpq config (misconfiguration, e.g. a wrong name or a missing `defineKeyValueStore`). |
 
 Catch errors with `askCatch` — it returns `{ success: true, result }` or `{ success: false, error }`.

package/template/docusaurus/docs/actions/core/key-value-store/ask-key-value-store-get.md

@@ -57,7 +57,7 @@ function* askKeyValueStoreGet<Value>(
 | --- | --- |
 | `KeyValueStoreGetErrorTypeEnum.ServiceUnavailable` | DynamoDB internal error or throttling. |
 | `KeyValueStoreGetErrorTypeEnum.ResourceNotFound` | The underlying table does not exist. |
-| `KeyValueStoreGetErrorTypeEnum.InvalidScope` | The `scope` option is malformed (empty, `.`, over 128 characters, or containing path separators, `..`, `@`, or null bytes), the store's partition key is not string-typed, or the partition-key value contains the reserved `@@QPQSCOPE@@` delimiter (reserved on string-pk stores, so unscoped calls reject it too). |
+| `KeyValueStoreGetErrorTypeEnum.InvalidScope` | The `scope` option is malformed (empty, `.`, over 128 characters, or containing path separators, `..`, `@`, or null bytes), the store's partition key is not string-typed, or the partition-key value contains the reserved `@@QPQ` marker (reserved on string-pk stores, so unscoped calls reject it too). |
 | `KeyValueStoreGetErrorTypeEnum.StoreNotFound` | The key value store is not declared in the qpq config (misconfiguration, e.g. a wrong name or a missing `defineKeyValueStore`). |
 
 Errors thrown by actions can be caught with `askCatch` from quidproquo-core. It returns an object — `{ success: true, result }` on success, or `{ success: false, error }` on failure: