From b70117c60ce573bf83485e02f82be6ff28ea103f Mon Sep 17 00:00:00 2001
From: Tim Trippel <ttrippel@google.com>
Date: Tue, 17 Dec 2024 08:48:13 -0800
Subject: [PATCH] [provisioning] make extension CA config optional

The extension CA was made optional in #25545 in the host benchtop
provisioning FT harness. However, it was not propagated to the
orchestrator script. This updates the orchestrator script to also make
the extension CA optional, as some SKUs do not require extensions.

Signed-off-by: Tim Trippel <ttrippel@google.com>
---
 sw/host/provisioning/orchestrator/src/orchestrator.py | 11 +++++++----
 sw/host/provisioning/orchestrator/src/sku_config.py   |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sw/host/provisioning/orchestrator/src/orchestrator.py b/sw/host/provisioning/orchestrator/src/orchestrator.py
index 53506b04171fa..e8d25e8f05df9 100644
--- a/sw/host/provisioning/orchestrator/src/orchestrator.py
+++ b/sw/host/provisioning/orchestrator/src/orchestrator.py
@@ -36,21 +36,24 @@ def get_user_confirmation(
 SKU:      {sku_config.name}
 LC State: {sku_config.target_lc_state}
 
+[OTHER]
+fpga:          {args.fpga}
+> commit hash: {commit_hash}
+
 [DICE CA]
 certificate: {sku_config.dice_ca.certificate}
 key:         {sku_config.dice_ca.key}
 key type:    {sku_config.dice_ca.key_type}
 key ID:      {sku_config.dice_ca.key_id}
+""")
+    if sku_config.ext_ca:
+        print(f"""
 
 [EXTENSION CA]
 certificate: {sku_config.ext_ca.certificate}
 key:         {sku_config.ext_ca.key}
 key type:    {sku_config.ext_ca.key_type}
 key ID:      {sku_config.ext_ca.key_id}
-
-[OTHER]
-fpga:          {args.fpga}
-> commit hash: {commit_hash}
 """)
     if not args.non_interactive:
         confirm()
diff --git a/sw/host/provisioning/orchestrator/src/sku_config.py b/sw/host/provisioning/orchestrator/src/sku_config.py
index a6a17658958aa..41c466f594a7b 100644
--- a/sw/host/provisioning/orchestrator/src/sku_config.py
+++ b/sw/host/provisioning/orchestrator/src/sku_config.py
@@ -26,9 +26,9 @@ class SkuConfig:
     target_lc_state: str  # valid: must be in ["dev", "prod", "prod_end"]
     otp: str  # valid: any string
     perso_bin: str  # valid: any string
-    dice_ca: Optional[OrderedDict]  # valid: see CaConfig
-    ext_ca: Optional[OrderedDict]  # valid: see CaConfig
     token_encrypt_key: str
+    dice_ca: Optional[OrderedDict]  # valid: see CaConfig
+    ext_ca: Optional[OrderedDict] = None  # valid: see CaConfig
 
     def __post_init__(self):
         # Load CA configs.