Merge branch 'main' into unwind_mutex_workaround

microsoft · Jul 5, 2024 · 3d5d9f2 · 3d5d9f2
2 parents fadc6b9 + a0bd508
commit 3d5d9f2
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 112 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -75,7 +75,7 @@ jobs:
           # All other acceptably fast tests, mostly end-to-end
           ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|perf|protocolstest|vegeta|suite|unit"
           # Partitions tests
-          ./tests.sh --timeout 360 --output-on-failure -LE "benchmark|perf|protocolstest|vegeta|suite"
+          ./tests.sh --timeout 240 --output-on-failure -L partitions -C partitions
         shell: bash
         if: "${{ matrix.platform.name != 'snp' }}" # Needs 1ES Pool support
 

diff --git a/doc/contribute/build_ccf.rst b/doc/contribute/build_ccf.rst
@@ -76,7 +76,9 @@ Although CCF's unit tests can be run through ``ctest`` directly, the end-to-end
 Build Older Versions of CCF
 ---------------------------
 
-Building older versions of CCF may require a different toolchain than the one used to build the current ``main`` branch (e.g. 1.x CCF releases are built with `clang-8`). To build an old version of CCF locally without having to install another toolchain that may conflict with the current one, it is recommended to use the ``ccfciteam/ccf-ci`` docker image (now ``ccfmsrc.azurecr.io/ccf/ci``). The version tag of the ``cci-ci`` (now ``ccf/ci``) image used to build the old version can be found in the :ccf_repo:`.azure-pipelines.yml` YAML file (under ``resources:container:image``).
+Building older versions of CCF may require a different toolchain than the one used to build the current ``main`` branch (e.g. 1.x CCF releases are built with `clang-8`).
+To build an old version of CCF locally without having to install another toolchain that may conflict with the current one, it is recommended to use the ``ccfciteam/ccf-ci`` docker image, later ``ccfmsrc.azurecr.io/ccf/ci`` and now ``ghcr.io/microsoft/ccf/ci/(default|sgx)`` since 5.0.0-rc0.
+The version tag of the ``cci-ci`` (later ``ccf/ci``) image used to build the old version can be found in the :ccf_repo:`.azure-pipelines.yml` YAML file (under ``resources:container:image``) before 5.0.0-rc0, and in the :ccf_repo:`.github/workflows/build.yml` YAML file afterwards.
 
 .. code-block:: bash
 

diff --git a/doc/contribute/build_images.rst b/doc/contribute/build_images.rst
@@ -1,12 +1,13 @@
 CCF Build Images
 ================
 
-CCF build images are produced by running the :ccf_repo:`docker/ccf_ci` Docker file and pushed to the ``ccfmsrc`` Azure Container Registry. They can be pulled by unauthenticated users:
+CCF build images are produced by running the :ccf_repo:`docker/ccf_ci` Docker file and pushed to the GitHub Container Repository.
+They can be pulled by unauthenticated users:
 
 .. code-block:: bash
 
-    $ docker pull ccfmsrc.azurecr.io/ccf/ci:<tag>
+    $ docker pull ghcr.io/microsoft/ccf/ci/(default|sgx):build-*
 
-Pushing a git tag of the form ``ccf_ci_image/$TAG`` will trigger the :ccf_repo:`.github/workflows/ci-containers.yml` workflow that builds and pushes a new ``ccfmsrc.azurecr.io/ccf/ci:$TAG-<platform>`` image.
+Pushing a git tag of the form ``build/*`` will trigger the :ccf_repo:`.github/workflows/ci-containers-ghcr.yml` workflow that builds and pushes a new ``ghcr.io/microsoft/ccf/ci/(default|sgx):build-*`` image.
 
 That image can then be used in CI and CD pipelines.
diff --git a/doc/operations/run_setup.rst b/doc/operations/run_setup.rst
@@ -42,52 +42,52 @@ The runtime images do not contain any particular CCF application, and may be hel
 C++ Apps
 ~~~~~~~~
 
-The `mcr.microsoft.com/ccf/app/run <https://mcr.microsoft.com/en-us/product/ccf/app/run>`_ container can be run to deploy C++ apps. It contains the ``cchost`` binary and the dependencies required to spin up a CCF node.
+The ``ghcr.io/microsoft/ccf/app/run/*`` containers can be run to deploy C++ apps. They contain the ``cchost`` binary and the dependencies required to spin up a CCF node.
 
 .. tab:: SGX
 
     .. code-block:: bash
 
-        $ export VERSION="4.0.0"
-        $ docker pull mcr.microsoft.com/ccf/app/run:$VERSION-sgx
+        $ export VERSION="5.0.0-rc0"
+        $ docker pull ghcr.io/microsoft/ccf/app/run/sgx:ccf-$VERSION
 
 .. tab:: SNP
 
     .. code-block:: bash
 
-        $ export VERSION="4.0.0"
-        $ docker pull mcr.microsoft.com/ccf/app/run:$VERSION-snp
+        $ export VERSION="5.0.0-rc0"
+        $ docker pull ghcr.io/microsoft/ccf/app/run/snp:ccf-$VERSION
 
 .. tab:: Virtual
 
     .. code-block:: bash
 
-        $ export VERSION="4.0.0"
-        $ docker pull mcr.microsoft.com/ccf/app/run:$VERSION-virtual
+        $ export VERSION="5.0.0-rc0"
+        $ docker pull ghcr.io/microsoft/ccf/app/run/virtual:ccf-$VERSION
 
 
 JavaScript/TypeScript Apps
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The `mcr.microsoft.com/ccf/app/run-js <https://mcr.microsoft.com/en-us/product/ccf/app/run-js>`_ container can be run to deploy JavaScript/TypeScripts apps. It contains the ``cchost`` binary, the ``libjs_generic`` native application to run JavaScript/TypeScript apps, and the dependencies required to spin up a CCF node.
+The ``ghcr.io/microsoft/ccf/app/run-js/*`` containers can be run to deploy JavaScript/TypeScripts apps. They contain the ``cchost`` binary, the ``libjs_generic`` native application to run JavaScript/TypeScript apps, and the dependencies required to spin up a CCF node.
 
 .. tab:: SGX
 
     .. code-block:: bash
 
-        $ export VERSION="4.0.0"
-        $ docker pull mcr.microsoft.com/ccf/app/run-js:$VERSION-sgx
+        $ export VERSION="5.0.0-rc0"
+        $ docker pull ghcr.io/microsoft/ccf/app/run-js/sgx:ccf-$VERSION
 
 .. tab:: SNP
 
     .. code-block:: bash
 
-        $ export VERSION="4.0.0"
-        $ docker pull mcr.microsoft.com/ccf/app/run-js:$VERSION-snp
+        $ export VERSION="5.0.0-rc0"
+        $ docker pull ghcr.io/microsoft/ccf/app/run-js/snp:ccf-$VERSION
 
 .. tab:: Virtual
 
     .. code-block:: bash
 
-        $ export VERSION="4.0.0"
-        $ docker pull mcr.microsoft.com/ccf/app/run-js:$VERSION-virtual
+        $ export VERSION="5.0.0-rc0"
+        $ docker pull ghcr.io/microsoft/ccf/app/run-js/virtual:ccf-$VERSION
diff --git a/include/ccf/endpoints/authentication/js.h b/include/ccf/endpoints/authentication/js.h
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the Apache 2.0 License.
 
+#include "ccf/common_auth_policies.h"
 #include "ccf/endpoint.h"
 #include "ccf/endpoints/authentication/all_of_auth.h"
 

diff --git a/include/ccf/js/named_auth_policies.h b/include/ccf/js/named_auth_policies.h
diff --git a/src/apps/js_generic/js_generic_base.cpp b/src/apps/js_generic/js_generic_base.cpp
@@ -4,6 +4,7 @@
 #include "ccf/crypto/key_wrap.h"
 #include "ccf/crypto/rsa_key_pair.h"
 #include "ccf/endpoints/authentication/all_of_auth.h"
+#include "ccf/endpoints/authentication/js.h"
 #include "ccf/historical_queries_adapter.h"
 #include "ccf/js/common_context.h"
 #include "ccf/js/core/context.h"
@@ -18,13 +19,12 @@
 #include "ccf/js/modules/chained_module_loader.h"
 #include "ccf/js/modules/kv_bytecode_module_loader.h"
 #include "ccf/js/modules/kv_module_loader.h"
-#include "ccf/js/named_auth_policies.h"
 #include "ccf/node/host_processes_interface.h"
-#include "ccf/node/rpc_context_impl.h"
 #include "ccf/service/tables/jsengine.h"
 #include "ccf/version.h"
 #include "enclave/enclave_time.h"
 #include "js/global_class_ids.h"
+#include "node/rpc_context_impl.h"
 #include "service/tables/endpoints.h"
 
 #include <memory>

diff --git a/src/endpoints/endpoint_registry.cpp b/src/endpoints/endpoint_registry.cpp
@@ -4,9 +4,9 @@
 #include "ccf/endpoint_registry.h"
 
 #include "ccf/common_auth_policies.h"
-#include "ccf/node/rpc_context_impl.h"
 #include "ccf/pal/locking.h"
 #include "http/http_parser.h"
+#include "node/rpc_context_impl.h"
 
 namespace ccf::endpoints
 {

diff --git a/src/endpoints/grpc/grpc.h b/src/endpoints/grpc/grpc.h
@@ -3,10 +3,10 @@
 #pragma once
 
 #include "ccf/endpoint_context.h"
-#include "ccf/node/rpc_context_impl.h"
 #include "ccf/odata_error.h"
 #include "message.h"
 #include "node/rpc/rpc_exception.h"
+#include "node/rpc_context_impl.h"
 #include "stream.h"
 #include "types.h"
 

diff --git a/src/http/http_rpc_context.h b/src/http/http_rpc_context.h
@@ -4,10 +4,10 @@
 
 #include "ccf/actors.h"
 #include "ccf/http_responder.h"
-#include "ccf/node/rpc_context_impl.h"
 #include "ccf/odata_error.h"
 #include "ccf/rpc_context.h"
 #include "http_parser.h"
+#include "node/rpc_context_impl.h"
 
 namespace http
 {

diff --git a/src/js/extensions/ccf/request.cpp b/src/js/extensions/ccf/request.cpp
@@ -7,9 +7,9 @@
 #include "ccf/endpoints/authentication/cert_auth.h"
 #include "ccf/endpoints/authentication/cose_auth.h"
 #include "ccf/endpoints/authentication/empty_auth.h"
+#include "ccf/endpoints/authentication/js.h"
 #include "ccf/endpoints/authentication/jwt_auth.h"
 #include "ccf/js/core/context.h"
-#include "ccf/js/named_auth_policies.h"
 
 #include <quickjs/quickjs.h>
 

diff --git a/src/js/registry.cpp b/src/js/registry.cpp
@@ -36,7 +36,7 @@
 #include "ccf/js/modules/chained_module_loader.h"
 #include "ccf/js/modules/kv_bytecode_module_loader.h"
 #include "ccf/js/modules/kv_module_loader.h"
-#include "ccf/node/rpc_context_impl.h"
+#include "node/rpc_context_impl.h"
 
 namespace ccf::js
 {

diff --git a/include/ccf/node/rpc_context_impl.h → src/node/rpc_context_impl.h b/include/ccf/node/rpc_context_impl.h → src/node/rpc_context_impl.h