From 7c1d1b91826d8af7a85a9e2bd6186ce313f2476f Mon Sep 17 00:00:00 2001 From: Eddy Ashton Date: Mon, 22 Jul 2024 10:27:35 +0000 Subject: [PATCH 1/2] Update all of the version strings --- .devcontainer.json | 2 +- auditable-logging-app/docker/ccf_app_js.virtual | 4 ++-- auditable-logging-app/package.json | 2 +- banking-app/docker/ccf_app_js.enclave | 4 ++-- banking-app/docker/ccf_app_js.virtual | 4 ++-- banking-app/package.json | 2 +- data-reconciliation-app/docker/ccf_app_js.enclave | 4 ++-- data-reconciliation-app/docker/ccf_app_js.virtual | 4 ++-- data-reconciliation-app/package.json | 2 +- decentralize-rbac-app/package.json | 2 +- express-debug/bundle_loader.js | 3 ++- express-debug/package.json | 2 +- 12 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.devcontainer.json b/.devcontainer.json index 6673eaa4..b44db52e 100644 --- a/.devcontainer.json +++ b/.devcontainer.json @@ -1,6 +1,6 @@ { "name": "CCF Samples", - "image": "mcr.microsoft.com/ccf/app/dev:4.0.12-virtual", + "image": "ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.0", "customizations": { "vscode": { "extensions": [ diff --git a/auditable-logging-app/docker/ccf_app_js.virtual b/auditable-logging-app/docker/ccf_app_js.virtual index 64491375..6f8b7575 100644 --- a/auditable-logging-app/docker/ccf_app_js.virtual +++ b/auditable-logging-app/docker/ccf_app_js.virtual @@ -1,8 +1,8 @@ # Build -FROM mcr.microsoft.com/ccf/app/dev:4.0.12-virtual as builder +FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.0 as builder # Run -FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-virtual +FROM ghcr.io/microsoft/ccf/app/run-js/virtual:ccf-5.0.0 # Note: libjs_generic.virtual is not included in run-js container COPY --from=builder /opt/ccf_virtual/lib/libjs_generic.virtual.so /usr/lib/ccf diff --git a/auditable-logging-app/package.json b/auditable-logging-app/package.json index 93ed7f82..360dcd1e 100644 --- a/auditable-logging-app/package.json +++ b/auditable-logging-app/package.json @@ -10,7 +10,7 @@ "node": ">=16" }, "dependencies": { - "@microsoft/ccf-app": "^4.0.0", + "@microsoft/ccf-app": "^5.0.0", "js-base64": "^3.5.2", "jsrsasign": "^11.0.0", "jsrsasign-util": "^1.0.2", diff --git a/banking-app/docker/ccf_app_js.enclave b/banking-app/docker/ccf_app_js.enclave index f1db5551..44c5d164 100644 --- a/banking-app/docker/ccf_app_js.enclave +++ b/banking-app/docker/ccf_app_js.enclave @@ -1,8 +1,8 @@ # Build -FROM mcr.microsoft.com/ccf/app/dev:4.0.12-sgx as builder +FROM ghcr.io/microsoft/ccf/app/dev/sgx:ccf-5.0.0 as builder # Run -FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-sgx +FROM ghcr.io/microsoft/ccf/app/run-js/sgx:ccf-5.0.0 # copy configuration into image COPY ./governance/constitution/*.js /app/ diff --git a/banking-app/docker/ccf_app_js.virtual b/banking-app/docker/ccf_app_js.virtual index 64491375..6f8b7575 100644 --- a/banking-app/docker/ccf_app_js.virtual +++ b/banking-app/docker/ccf_app_js.virtual @@ -1,8 +1,8 @@ # Build -FROM mcr.microsoft.com/ccf/app/dev:4.0.12-virtual as builder +FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.0 as builder # Run -FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-virtual +FROM ghcr.io/microsoft/ccf/app/run-js/virtual:ccf-5.0.0 # Note: libjs_generic.virtual is not included in run-js container COPY --from=builder /opt/ccf_virtual/lib/libjs_generic.virtual.so /usr/lib/ccf diff --git a/banking-app/package.json b/banking-app/package.json index e788dafe..360dcd1e 100644 --- a/banking-app/package.json +++ b/banking-app/package.json @@ -10,7 +10,7 @@ "node": ">=16" }, "dependencies": { - "@microsoft/ccf-app": "^4.0.12", + "@microsoft/ccf-app": "^5.0.0", "js-base64": "^3.5.2", "jsrsasign": "^11.0.0", "jsrsasign-util": "^1.0.2", diff --git a/data-reconciliation-app/docker/ccf_app_js.enclave b/data-reconciliation-app/docker/ccf_app_js.enclave index f1db5551..44c5d164 100755 --- a/data-reconciliation-app/docker/ccf_app_js.enclave +++ b/data-reconciliation-app/docker/ccf_app_js.enclave @@ -1,8 +1,8 @@ # Build -FROM mcr.microsoft.com/ccf/app/dev:4.0.12-sgx as builder +FROM ghcr.io/microsoft/ccf/app/dev/sgx:ccf-5.0.0 as builder # Run -FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-sgx +FROM ghcr.io/microsoft/ccf/app/run-js/sgx:ccf-5.0.0 # copy configuration into image COPY ./governance/constitution/*.js /app/ diff --git a/data-reconciliation-app/docker/ccf_app_js.virtual b/data-reconciliation-app/docker/ccf_app_js.virtual index 64491375..6f8b7575 100755 --- a/data-reconciliation-app/docker/ccf_app_js.virtual +++ b/data-reconciliation-app/docker/ccf_app_js.virtual @@ -1,8 +1,8 @@ # Build -FROM mcr.microsoft.com/ccf/app/dev:4.0.12-virtual as builder +FROM ghcr.io/microsoft/ccf/app/dev/virtual:ccf-5.0.0 as builder # Run -FROM mcr.microsoft.com/ccf/app/run-js:4.0.12-virtual +FROM ghcr.io/microsoft/ccf/app/run-js/virtual:ccf-5.0.0 # Note: libjs_generic.virtual is not included in run-js container COPY --from=builder /opt/ccf_virtual/lib/libjs_generic.virtual.so /usr/lib/ccf diff --git a/data-reconciliation-app/package.json b/data-reconciliation-app/package.json index 63fc4faf..4603e336 100755 --- a/data-reconciliation-app/package.json +++ b/data-reconciliation-app/package.json @@ -12,7 +12,7 @@ "node": ">=16" }, "dependencies": { - "@microsoft/ccf-app": "^4.0.12", + "@microsoft/ccf-app": "^5.0.0", "axios": "^1.2.4", "crypto-js": "^4.2.0", "inquirer": "9.1.4", diff --git a/decentralize-rbac-app/package.json b/decentralize-rbac-app/package.json index 4709228a..a16aecac 100755 --- a/decentralize-rbac-app/package.json +++ b/decentralize-rbac-app/package.json @@ -12,7 +12,7 @@ "node": ">=16" }, "dependencies": { - "@microsoft/ccf-app": "^4.0.12", + "@microsoft/ccf-app": "^5.0.0", "axios": "^1.2.4", "crypto-js": "^3.1.9-1", "inquirer": "9.1.4", diff --git a/express-debug/bundle_loader.js b/express-debug/bundle_loader.js index ccae9f72..26183d3e 100644 --- a/express-debug/bundle_loader.js +++ b/express-debug/bundle_loader.js @@ -3,6 +3,7 @@ import * as path from "path"; import yargs from "yargs"; +console.info(process.argv); const argv = yargs(process.argv.slice(2)).option("bundle", { describe: "JSON bundle describing application to host", type: "string", @@ -28,7 +29,7 @@ export async function resolve(specifier, context, nextResolve) { } canonicalSpecifier = path.resolve( path.dirname(canonicalSpecifier), - specifier, + specifier ); canonicalSpecifier = path.relative(targetRoot, canonicalSpecifier); specifier = canonicalSpecifier; diff --git a/express-debug/package.json b/express-debug/package.json index 9426ad13..0cf0db67 100644 --- a/express-debug/package.json +++ b/express-debug/package.json @@ -10,7 +10,7 @@ }, "type": "module", "dependencies": { - "@microsoft/ccf-app": "^4.0.12", + "@microsoft/ccf-app": "^5.0.0", "express": "^4.18.2", "jsonwebtoken": "^9.0.0", "pem": "^1.14.8", From 8ca2e7fd0ee1666f197ada92d74f5cf4a9c64796 Mon Sep 17 00:00:00 2001 From: Eddy Ashton Date: Mon, 22 Jul 2024 10:37:48 +0000 Subject: [PATCH 2/2] Fix some typos --- Makefile | 2 +- data-reconciliation-app/Makefile | 2 +- .../docs/adr/03-reconciliation-logic.md | 2 +- .../src/repositories/kv-repository.ts | 18 +++++++++--------- .../src/utils/api-result.ts | 4 ++-- .../src/repositories/kv-repository.ts | 16 ++++++++-------- decentralize-rbac-app/src/utils/api-result.ts | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 993df80c..813e5019 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ deploy-ms-idp: ## 🔐 Create an Identity Provider @echo -e "\e[34m$@\e[0m" || true cd deploy && pwsh ./New-IdentityProvider.ps1 -generate-access-token: ## 🔐 Generate and access token +generate-access-token: ## 🔐 Generate an access token @echo -e "\e[34m$@\e[0m" || true ./scripts/generate_access_token.sh diff --git a/data-reconciliation-app/Makefile b/data-reconciliation-app/Makefile index 5460d77b..a9db2e58 100755 --- a/data-reconciliation-app/Makefile +++ b/data-reconciliation-app/Makefile @@ -102,7 +102,7 @@ deploy-mccf: ## 🚀 Deploy Managed CCF deploy-ms-idp: ## 🔐 Create an Identity Provider @cd .. && $(MAKE) deploy-ms-idp -generate-access-token: ## 🔐 Generate and access token +generate-access-token: ## 🔐 Generate an access token @cd .. && $(MAKE) generate-access-token # Keep this at the bottom. diff --git a/data-reconciliation-app/docs/adr/03-reconciliation-logic.md b/data-reconciliation-app/docs/adr/03-reconciliation-logic.md index 2de38cb1..33b8d00f 100755 --- a/data-reconciliation-app/docs/adr/03-reconciliation-logic.md +++ b/data-reconciliation-app/docs/adr/03-reconciliation-logic.md @@ -21,7 +21,7 @@ When a user requests a reconciliation report via the `/report` endpoint, it is g This decouples data ingestion from reconciliation reporting. -Reconciliation is implemented by querying CFF KV Store for all the keys this user has submitted. Any keys unknown to this user are not used in the reconciliation report. This ensures the user only sees a report with their submitted data. +Reconciliation is implemented by querying CCF KV Store for all the keys this user has submitted. Any keys unknown to this user are not used in the reconciliation report. This ensures the user only sees a report with their submitted data. ## Scenarios diff --git a/data-reconciliation-app/src/repositories/kv-repository.ts b/data-reconciliation-app/src/repositories/kv-repository.ts index 0558c3f1..82bede8e 100755 --- a/data-reconciliation-app/src/repositories/kv-repository.ts +++ b/data-reconciliation-app/src/repositories/kv-repository.ts @@ -3,54 +3,54 @@ import { ReconciledRecord } from "../models/reconciled-record"; import { ServiceResult } from "../utils/service-result"; /** - * Generic Key-Value implementation wrapping CFF TypedKvMap storage engine + * Generic Key-Value implementation wrapping CCF TypedKvMap storage engine */ export interface IRepository { /** - * Store {T} in CFF TypedKvMap storage by key + * Store {T} in CCF TypedKvMap storage by key * @param {string} key * @param {T} value */ set(key: string, value: T): ServiceResult; /** - * Retrive {T} in CFF TypedKvMap storage by key + * Retrive {T} in CCF TypedKvMap storage by key * @param {string} key * @param {T} value */ get(key: string): ServiceResult; /** - * Check if {T} exists in CFF TypedKvMap storage by key + * Check if {T} exists in CCF TypedKvMap storage by key * @param {string} key * @param {T} value */ has(key: string): ServiceResult; /** - * Retrieve all keys in CFF TypedKvMap storage + * Retrieve all keys in CCF TypedKvMap storage */ keys(): ServiceResult; /** - * Retrieve all values in CFF TypedKvMap storage + * Retrieve all values in CCF TypedKvMap storage */ values(): ServiceResult; /** - * Get size of CFF TypedKvMap storage + * Get size of CCF TypedKvMap storage * @returns {ServiceResult} */ get size(): ServiceResult; /** - * Iterate through CFF TypedKvMap storage by key + * Iterate through CCF TypedKvMap storage by key * @param callback */ forEach(callback: (key: string, value: T) => void): ServiceResult; /** - * Clears CFF TypedKvMap storage + * Clears CCF TypedKvMap storage */ clear(): ServiceResult; } diff --git a/data-reconciliation-app/src/utils/api-result.ts b/data-reconciliation-app/src/utils/api-result.ts index 128765e7..754e7969 100755 --- a/data-reconciliation-app/src/utils/api-result.ts +++ b/data-reconciliation-app/src/utils/api-result.ts @@ -10,7 +10,7 @@ export enum StatusCode { } /** - * Status code for CFF network conventions + * Status code for CCF network conventions */ export interface CCFResponse { statusCode: number; @@ -19,7 +19,7 @@ export interface CCFResponse { } /** - * Utility class for wrapping the response with CFF network conventions + * Utility class for wrapping the response with CCF network conventions */ export class ApiResult { /** diff --git a/decentralize-rbac-app/src/repositories/kv-repository.ts b/decentralize-rbac-app/src/repositories/kv-repository.ts index 5416c950..4173aa86 100755 --- a/decentralize-rbac-app/src/repositories/kv-repository.ts +++ b/decentralize-rbac-app/src/repositories/kv-repository.ts @@ -7,50 +7,50 @@ import { ServiceResult } from "../utils/service-result"; */ export interface IRepository { /** - * Store {T} in CFF TypedKvMap storage by key + * Store {T} in CCF TypedKvMap storage by key * @param {string} key * @param {T} value */ set(key: string, value: T): ServiceResult; /** - * Retrive {T} in CFF TypedKvMap storage by key + * Retrive {T} in CCF TypedKvMap storage by key * @param {string} key * @param {T} value */ get(key: string): ServiceResult; /** - * Check if {T} exists in CFF TypedKvMap storage by key + * Check if {T} exists in CCF TypedKvMap storage by key * @param {string} key * @param {T} value */ has(key: string): ServiceResult; /** - * Retrieve all keys in CFF TypedKvMap storage + * Retrieve all keys in CCF TypedKvMap storage */ keys(): ServiceResult; /** - * Retrieve all values in CFF TypedKvMap storage + * Retrieve all values in CCF TypedKvMap storage */ values(): ServiceResult; /** - * Get size of CFF TypedKvMap storage + * Get size of CCF TypedKvMap storage * @returns {ServiceResult} */ get size(): ServiceResult; /** - * Iterate through CFF TypedKvMap storage by key + * Iterate through CCF TypedKvMap storage by key * @param callback */ forEach(callback: (key: string, value: T) => void): ServiceResult; /** - * Clears CFF TypedKvMap storage + * Clears CCF TypedKvMap storage */ clear(): ServiceResult; diff --git a/decentralize-rbac-app/src/utils/api-result.ts b/decentralize-rbac-app/src/utils/api-result.ts index f02fff98..ac32970b 100755 --- a/decentralize-rbac-app/src/utils/api-result.ts +++ b/decentralize-rbac-app/src/utils/api-result.ts @@ -10,7 +10,7 @@ export enum StatusCode { } /** - * Status code for CFF network conventions + * Status code for CCF network conventions */ export interface CCFResponse { statusCode: number; @@ -19,7 +19,7 @@ export interface CCFResponse { } /** - * Utility class for wrapping the response with CFF network conventions + * Utility class for wrapping the response with CCF network conventions */ export class ApiResult { /**