Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[provisioning] make extension CA config optional #25685

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions sw/host/provisioning/orchestrator/src/orchestrator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions sw/host/provisioning/orchestrator/src/sku_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading