Merge branch 'main' into add-makefile

microsoft · Jul 22, 2024 · b89e469 · b89e469
2 parents da3b80a + 58dff38
commit b89e469
Show file tree

Hide file tree

Showing 19 changed files with 42 additions and 41 deletions.
diff --git 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/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/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
@@ -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
@@ -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
@@ -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
@@ -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/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/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
@@ -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/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/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/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<T> {
   /**
-   * 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<T>;
 
   /**
-   * 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<T>;
 
   /**
-   * 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<boolean>;
 
   /**
-   * Retrieve all keys in CFF TypedKvMap storage
+   * Retrieve all keys in CCF TypedKvMap storage
    */
   keys(): ServiceResult<string[]>;
 
   /**
-   * Retrieve all values in CFF TypedKvMap storage
+   * Retrieve all values in CCF TypedKvMap storage
    */
   values(): ServiceResult<T[]>;
 
   /**
-   * Get size of CFF TypedKvMap storage
+   * Get size of CCF TypedKvMap storage
    * @returns {ServiceResult<number>}
    */
   get size(): ServiceResult<number>;
 
   /**
-   * Iterate through CFF TypedKvMap storage by key
+   * Iterate through CCF TypedKvMap storage by key
    * @param callback
    */
   forEach(callback: (key: string, value: T) => void): ServiceResult<string>;
 
   /**
-   * Clears CFF TypedKvMap storage
+   * Clears CCF TypedKvMap storage
    */
   clear(): ServiceResult<void>;
 }

diff --git 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/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/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<T> {
   /**
-   * 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<T>;
 
   /**
-   * 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<T>;
 
   /**
-   * 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<boolean>;
 
   /**
-   * Retrieve all keys in CFF TypedKvMap storage
+   * Retrieve all keys in CCF TypedKvMap storage
    */
   keys(): ServiceResult<string[]>;
 
   /**
-   * Retrieve all values in CFF TypedKvMap storage
+   * Retrieve all values in CCF TypedKvMap storage
    */
   values(): ServiceResult<T[]>;
 
   /**
-   * Get size of CFF TypedKvMap storage
+   * Get size of CCF TypedKvMap storage
    * @returns {ServiceResult<number>}
    */
   get size(): ServiceResult<number>;
 
   /**
-   * Iterate through CFF TypedKvMap storage by key
+   * Iterate through CCF TypedKvMap storage by key
    * @param callback
    */
   forEach(callback: (key: string, value: T) => void): ServiceResult<string>;
 
   /**
-   * Clears CFF TypedKvMap storage
+   * Clears CCF TypedKvMap storage
    */
   clear(): ServiceResult<void>;
 

diff --git 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 {
   /**

diff --git 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
@@ -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",