Skip to content

Commit ebc7d22

Browse files
committed
Merge branch 'msft-main' into mitchzhu/tardev-sandbox
2 parents f67c2f2 + 9db7002 commit ebc7d22

File tree

211 files changed

+8288
-2604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+8288
-2604
lines changed

.github/workflows/basic-ci-amd64.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ jobs:
304304
TARGET_BRANCH: ${{ inputs.target-branch }}
305305

306306
- name: Install dependencies
307+
env:
308+
GITHUB_API_TOKEN: ${{ github.token }}
307309
run: bash tests/integration/nerdctl/gha-run.sh install-dependencies
308310

309311
- name: get-kata-tarball

.github/workflows/static-checks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
./tests/install_rust.sh
103103
echo "${HOME}/.cargo/bin" >> $GITHUB_PATH
104104
- name: Install protobuf-compiler
105-
if: ${{ matrix.command == 'make check' && matrix.component == 'genpolicy' }}
105+
if: ${{ matrix.command != 'make vendor' && (matrix.component == 'agent' || matrix.component == 'genpolicy' || matrix.component == 'agent-ctl') }}
106106
run: sudo apt-get -y install protobuf-compiler
107107
- name: Install musl-tools
108108
if: ${{ matrix.component != 'runtime' }}

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ src/tools/log-parser/kata-log-parser
1818

1919
# Microsoft-specific
2020
.cargo/
21-
vendor/
2221
src/agent/samples/policy/test-input/
2322
src/tarfs/**/*.cmd
2423
src/tarfs/**/*.ko

src/agent/Cargo.lock

Lines changed: 126 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/agent/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,15 @@ regorus = { version = "0.2.6", default-features = false, features = [
9696
"base64url",
9797
], optional = true }
9898
json-patch = "2.0.0"
99+
kata-agent-policy = { path = "policy" }
99100

100101
[dev-dependencies]
101102
tempfile = "3.1.0"
102103
test-utils = { path = "../libs/test-utils" }
103104
which = "4.3.0"
104105

105106
[workspace]
106-
members = [
107-
"rustjail",
108-
]
107+
members = ["rustjail", "policy"]
109108

110109
[profile.release]
111110
lto = true

src/agent/policy/Cargo.toml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
[package]
2+
name = "kata-agent-policy"
3+
version = "0.1.0"
4+
authors = [
5+
"The Kata Containers community <kata-dev@lists.katacontainers.io>",
6+
]
7+
edition = "2018"
8+
license = "Apache-2.0"
9+
10+
[dependencies]
11+
# Async runtime
12+
tokio = { version = "1.39.0", features = [
13+
"full",
14+
] }
15+
tokio-vsock = "0.3.4"
16+
17+
anyhow = "1"
18+
19+
# Configuration
20+
serde = { version = "1.0.129", features = [
21+
"derive",
22+
] }
23+
serde_json = "1.0.39"
24+
25+
# Agent Policy
26+
regorus = { version = "0.2.8", default-features = false, features = [
27+
"arc",
28+
"regex",
29+
"std",
30+
"base64",
31+
] }
32+
json-patch = "2.0.0"
33+
sha2 = { version = "0.10.6" }
34+
sev = { git = "https://github.com/virtee/sev", tag = "v1.2.0", default-features = false, features = [
35+
"snp",
36+
] }
37+
protocols = { path = "../../libs/protocols" }
38+
39+
# Note: this crate sets the slog 'max_*' features which allows the log level
40+
# to be modified at runtime.
41+
logging = { path = "../../libs/logging" }
42+
slog = "2.5.2"
43+
slog-scope = "4.1.2"
44+
slog-term = "2.9.0"

src/agent/policy/src/lib.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Copyright (c) 2024 Edgeless Systems GmbH
2+
//
3+
// SPDX-License-Identifier: Apache-2.0
4+
//
5+
6+
pub mod policy;

0 commit comments

Comments
 (0)