Merge branch 'random_key_2' of github.com:piotrpalcz/image-rs into ra…

…ndom_key_2

Signed-off-by: piotrpalcz <[email protected]>

.github/workflows/aa_basic.yml

@@ -8,11 +8,13 @@ on:
       - 'attestation-agent/**'
       - '.github/workflows/aa_basic.yml'
       - 'Cargo.toml'
+      - 'Cargo.lock'
   pull_request:
     paths:
       - 'attestation-agent/**'
       - '.github/workflows/aa_basic.yml'
       - 'Cargo.toml'
+      - 'Cargo.lock'
   create:
   workflow_dispatch:
 
@@ -30,7 +32,7 @@ jobs:
           - stable
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

.github/workflows/aa_cc_kbc.yml

@@ -38,7 +38,7 @@ jobs:
           - cc_kbc_snp
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

.github/workflows/aa_crypto.yml

@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

.github/workflows/aa_eaa_kbc.yml

@@ -1,16 +1,16 @@
 name: attestation-agent eaa_kbc tests
 
 on:
-  push:
-    branches:
-      - 'main'
-    paths:
-      - 'attestation-agent/kbc/eaa_kbc/**'
-      - '.github/workflows/aa_eaa_kbc.yml'
-  pull_request:
-    paths:
-      - 'attestation-agent/kbc/eaa_kbc/**'
-      - '.github/workflows/aa_eaa_kbc.yml'
+  # push:
+  #   branches:
+  #     - 'main'
+  #   paths:
+  #     - 'attestation-agent/kbc/eaa_kbc/**'
+  #     - '.github/workflows/aa_eaa_kbc.yml'
+  # pull_request:
+  #   paths:
+  #     - 'attestation-agent/kbc/eaa_kbc/**'
+  #     - '.github/workflows/aa_eaa_kbc.yml'
   create:
   workflow_dispatch:
 
@@ -31,7 +31,7 @@ jobs:
 
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

.github/workflows/aa_occlum_sgx.yml

@@ -27,7 +27,7 @@ jobs:
         working-directory: ./attestation-agent
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 

.github/workflows/aa_release.yml

@@ -9,17 +9,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
 
       - name: Build and push coco-key-provider
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./attestation-agent/docker/Dockerfile.keyprovider

.github/workflows/aa_sample_keyprovider.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

.github/workflows/aa_sev_kbc.yml

@@ -30,7 +30,7 @@ jobs:
           - online_sev_kbc
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

.github/workflows/api-server-rest-basic.yml

@@ -8,11 +8,13 @@ on:
       - 'api-server-rest/**'
       - '.github/workflows/api-server-rest-basic.yml'
       - 'Cargo.toml'
+      - 'Cargo.lock'
   pull_request:
     paths:
       - 'api-server-rest/**'
       - '.github/workflows/api-server-rest-basic.yml'
       - 'Cargo.toml'
+      - 'Cargo.lock'
   create:
   workflow_dispatch:
 
@@ -30,7 +32,7 @@ jobs:
           - stable
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

.github/workflows/cdh_basic.yml

@@ -0,0 +1,80 @@
+name: confidential-data-hub basic build and unit tests
+
+on:
+  push:
+    branches:
+      - "main"
+    paths:
+      - 'confidential-data-hub/**'
+      - '.github/workflows/cdh_basic.yml'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
+  pull_request:
+    paths:
+      - 'confidential-data-hub/**'
+      - '.github/workflows/cdh_basic.yml'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
+  create:
+  workflow_dispatch:
+
+jobs:
+  basic_ci:
+    name: Check
+    defaults:
+      run:
+        working-directory: ./confidential-data-hub
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rust:
+          - stable
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Install Rust toolchain (${{ matrix.rust }})
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt, clippy
+
+      - name: Install protoc
+        run: |
+          sudo apt-get update && sudo apt-get install -y protobuf-compiler
+
+      - name: Build and install
+        run: |
+          make && make install
+
+      - name: Musl build
+        run: |
+          make LIBC=musl
+
+      - name: s390x build
+        run:
+          make ARCH=s390x
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --features kbs,aliyun,sev,bin -p kms -p confidential-data-hub -p secret -p image
+
+      - name: Run cargo fmt check
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: -p kms -p confidential-data-hub -p secret -p image -- --check
+
+      - name: Run rust lint check
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          # We are getting error in generated code due to derive_partial_eq_without_eq check, so ignore it for now
+          args: -p kms -p confidential-data-hub -p secret -p image -- -D warnings -A clippy::derive-partial-eq-without-eq 

.github/workflows/image_rs_build.yml

@@ -6,10 +6,14 @@ on:
     paths:
       - 'image-rs/**'
       - '.github/workflows/image_rs_build.yml'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
   pull_request:
     paths:
       - 'image-rs/**'
       - '.github/workflows/image_rs_build.yml'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
   create:
   workflow_dispatch:
 
@@ -29,7 +33,7 @@ jobs:
           - nightly
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 

.github/workflows/links.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Restore lychee cache
         uses: actions/cache@v3

.github/workflows/ocicrypt_rs_build.yml

@@ -6,10 +6,14 @@ on:
     paths:
       - 'ocicrypt-rs/**'
       - '.github/workflows/ocicrypt_rs_build.yml'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
   pull_request:
     paths:
       - 'ocicrypt-rs/**'
       - '.github/workflows/ocicrypt_rs_build.yml'
+      - 'Cargo.toml'
+      - 'Cargo.lock'
   create:
   workflow_dispatch:
 
@@ -33,7 +37,7 @@ jobs:
 
     steps:
       - name: Code checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Update cargo home