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

Fix cc kbc aa param config file parsing #368

Conversation

stevenhorsman
Copy link
Member

Sorry, this is my-bad. I blindly copy-pasted the fixes from cdh into AA without paying enough attention and then just testing building it with the offline_fs_kbc and assumed that the workflows would run it for the others. It turns out that it doesn't, so I've tried to correct that and fix the code so that:

~/cc-guest-components/attestation-agent# make KBC=cc_kbc
DEBIANOS is: true
cd app &&  cargo build --release --no-default-features --features "cc_kbc grpc,rust-crypto" --target x86_64-unknown-linux-gnu
warning: skipping duplicate package `init` found at `/root/.cargo/git/checkouts/occlum-09e22bc8c2a4bfe1/b5a32a8/demos/runtime_boot/init`
warning: skipping duplicate package `init` found at `/root/.cargo/git/checkouts/occlum-09e22bc8c2a4bfe1/b5a32a8/tools/init`
warning: skipping duplicate package `app` found at `/root/.cargo/git/checkouts/sgxdatacenterattestationprimitives-d6934a418e6beae0/71557c7/SampleCode/RustTDQuoteGenerationSample`
    Finished release [optimized] target(s) in 0.49

works now.

- Run cc_kbc workflow if libs change

Signed-off-by: stevenhorsman <[email protected]>
@fitzthum
Copy link
Member

Ah, thanks @stevenhorsman

Can you run cargo fmt on your branch. Seems like one of the checks is complaining about indentation.

Fix changes to align them with cdh logic

Fixes: confidential-containers#364

Signed-off-by: stevenhorsman <[email protected]>
@stevenhorsman stevenhorsman force-pushed the fix-cc_kbc_aa_param_config_file_parsing branch from 51ea410 to 756b767 Compare September 22, 2023 14:53
Copy link
Member

@fitzthum fitzthum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fitzthum fitzthum merged commit f4f89da into confidential-containers:main Sep 22, 2023
@stevenhorsman stevenhorsman deleted the fix-cc_kbc_aa_param_config_file_parsing branch September 22, 2023 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants