Update repo dependencies and github action #24

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

Merged

samspycher merged 41 commits into main from chore/repo-maintenance

Apr 25, 2025

.github/workflows/mvn.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,35 +6,38 @@ jobs:
  
      build:

        runs-on: ubuntu-latest

        steps:

          - uses: actions/checkout@v2

          - uses: actions/checkout@v4

            with:

              submodules: true

          - name: Set up Docker Buildx

            uses: docker/setup-buildx-action@v1

            uses: docker/setup-buildx-action@v3

          - name: Install socat tool

            run: |

              sudo apt-get update

              sudo apt-get install socat

          - name: Cache Docker layers

            uses: actions/cache@v2

            uses: actions/cache@v4

            with:

              path: ./parsec-docker-test-image/parsec_docker_cache

              key: ${{ runner.os }}-parsec_docker_cache-${{ github.sha }}

              restore-keys: |

                ${{ runner.os }}-parsec_docker_cache-

          - name: Set up JDK 16

            uses: actions/setup-java@v2

            uses: actions/setup-java@v4

            with:

              java-version: '16'

              distribution: 'zulu'

              java-version: "16"

              distribution: "zulu"

              architecture: x64

              cache: maven

          - name: Build with Maven

            # still needs work to get tests running on java 16

            run: ./mvnw --batch-mode clean verify -DskipTests=true

          - name: Set up JDK 8

            uses: actions/setup-java@v2

            uses: actions/setup-java@v4

            with:

              java-version: '8'

              distribution: 'zulu'

              java-version: "8"

              distribution: "zulu"

              architecture: x64

              cache: maven

          - name: Build with Maven

            run: ./mvnw --batch-mode clean verify

.vscode/settings.json

-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    {
+      "java.configuration.updateBuildConfiguration": "automatic",
+      "maven.view": "hierarchical"
+    }

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,7 +2,7 @@
  
    This repository contains a Java Client and a [JCA provider](https://docs.oracle.com/javase/8/docs/technotes/guides/security/crypto/CryptoSpec.html) for Parsec. The client exposes the [PSA Crypto API](https://github.com/ARMmbed/mbed-crypto/blob/psa-crypto-api/docs/PSA_Cryptography_API_Specification.pdf) to Java Applications and the JCA Provider allows existing applications that employ JCA to switch to Parsec.

    *Note*: this client is at an early stage of development and not yet ready for production use. We welcome contributions!

    _Note_: this client is at an early stage of development and not yet ready for production use. We welcome contributions!

    ## In this repository

    @@ -12,16 +12,31 @@ The repository contains the following packages:
  
    - parsec-jca-java: JCA Provider

    - parsec-interface-java: Private wrapper for protobuf classes and socket communication

    - parsec-protobuf-java: Java Protobuf classes (generated)

    - parsec-testcontainers: Collection of Docker test containers for development & testing 

    - parsec-testcontainers: Collection of Docker test containers for development & testing

    # How to use this library

    TODO

    # How to develop the Parsec Java Client

    TODO

    Check out this repo's submodules:

    ```sh

    git submodule update --init --recursive

    ```

    You can use `act` to run the github action locally. On OSX, you need to set the container architecture, and for testcontainers to work, you may need to set the env var `TESTCONTAINERS_HOST_OVERRIDE`.

    Example CLI input:

    ```sh

    act --container-architecture linux/amd64 --env TESTCONTAINERS_HOST_OVERRIDE=`ipconfig getifaddr en0`

    ```

    # Example Implementations

    There are a number of example implementations of both the basic java client and JCA provider along with a demo (separate repository) 

    There are a number of example implementations of both the basic java client and JCA provider along with a demo (separate repository)

    Both the tests and workshop demo cover the basic functionality of the current implementation:

    - Parsec JCA Tests [**Link**](/parsec-jca-test)

    @@ -34,10 +49,8 @@ The software is provided under Apache-2.0. Contributions to this project are acc
  
    ## Contributing

    We welcome contributing, both in the use of this client library and programming,extending of this library code base. 

    We welcome contributing, both in the use of this client library and programming,extending of this library code base.

    Please check the [**Contribution Guidelines**](https://parallaxsecond.github.io/parsec-book/contributing/index.html)

    to know more about the contribution process.

    *Copyright 2021 Contributors to the Parsec project.*

    _Copyright 2021 Contributors to the Parsec project._

build_demo.sh

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -16,58 +16,57 @@ function dirty_build_on_new_comits() {
  
        awslabs/aws-crt-java \

        aws/aws-iot-device-sdk-java-v2 \

        revaultch/aws-greengrass-nucleus; do

      curl -S https://api.github.com/repos/${repo}/commits/key-op-prototype

      done | ${md5_cmd} | cut -d" " -f1 > greengrass_demo/dirty_repo.txt

        curl -S https://api.github.com/repos/${repo}/commits/key-op-prototype

      done | ${md5_cmd} | cut -d" " -f1 >greengrass_demo/dirty_repo.txt

      touch -t 190001010000 greengrass_demo/dirty_repo.txt

      export DIRTY_TS=$(cat greengrass_demo/dirty_repo.txt)

    }

    function build_greengrass_patched() {

    pushd examples/greengrass/parsec-greengrass-run-config/docker/

    docker build . \

           --build-arg BUILD_TS=${DIRTY_TS} \

           --tag parallaxsecond/greengrass_patched:latest \

           --progress plain

    popd

      pushd examples/greengrass/parsec-greengrass-run-config/docker/

      docker build . \

        --build-arg BUILD_TS=${DIRTY_TS} \

        --tag parallaxsecond/greengrass_patched:latest \

        --progress plain

      popd

    }

    function copy_deps_from_greengrass_patched_to_local() {

      docker run -v ~/.m2/repository:/host_m2_repository parallaxsecond/greengrass_patched:latest \

      /bin/bash -c "cp -r ~/.m2/repository/* /host_m2_repository"

        /bin/bash -c "cp -r ~/.m2/repository/* /host_m2_repository"

    }

    function build_parsec_containers() {

    pushd ./parsec-testcontainers/

    ./build.sh

    popd

      pushd ./parsec-testcontainers/

      ./build.sh

      popd

    }

    function build_greengrass_with_provider() {

      docker build . -f greengrass_demo/Dockerfile --tag parallaxsecond/greengrass_demo:latest  --progress plain

      docker build . -f greengrass_demo/Dockerfile --tag parallaxsecond/greengrass_demo:latest --progress plain

    }

    function parsec_run() {

        docker rm -f parsec_docker_run 2> /dev/null

        docker run -d --name parsec_docker_run \

              -ti \

              -v GG_PARSEC_STORE:/var/lib/parsec/mappings \

              -v GG_PARSEC_SOCK:/run/parsec \

               parallaxsecond/parsec:0.8.1

      docker rm -f parsec_docker_run 2>/dev/null

      docker run -d --name parsec_docker_run \

        -ti \

        -v GG_PARSEC_STORE:/parsec/quickstart/mappings\  -v GG_PARSEC_SOCK:/run/parsec \

        parallaxsecond/parsec:latest

    }

    function gg_run() {

      docker rm -f "${1}" 2> /dev/null

      docker rm -f "${1}" 2>/dev/null

      # shellcheck disable=SC2086

      docker run ${3} \

             --name "${1}" \

             -e GG_THING_NAME="${GG_THING_NAME}" \

             -e GG_ADDITIONAL_CMD_ARGS="--trusted-plugin /provider.jar" \

             -e AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}" \

             -e AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}" \

             -e AWS_REGION="${AWS_REGION}" \

    	       -e AWS_SESSION_TOKEN="${AWS_SESSION_TOKEN}" \

             -v GG_PARSEC_SOCK:/run/parsec \

             -v GG_HOME:/home/ggc_user \

             parallaxsecond/greengrass_demo:latest "${2}"

        --name "${1}" \

        -e GG_THING_NAME="${GG_THING_NAME}" \

        -e GG_ADDITIONAL_CMD_ARGS="--trusted-plugin /provider.jar" \

        -e AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY_ID}" \

        -e AWS_SECRET_ACCESS_KEY="${AWS_SECRET_ACCESS_KEY}" \

        -e AWS_REGION="${AWS_REGION}" \

        -e AWS_SESSION_TOKEN="${AWS_SESSION_TOKEN}" \

        -v GG_PARSEC_SOCK:/run/parsec \

        -v GG_HOME:/home/ggc_user \

        parallaxsecond/greengrass_demo:latest "${2}"

    }

    function run_demo() {

      parsec_run

parsec-client-java/pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,6 @@
  
    <?xml version="1.0" encoding="UTF-8"?>

    <project xmlns="http://maven.apache.org/POM/4.0.0"

             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

             xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

        <modelVersion>4.0.0</modelVersion>

        <parent>

    @@ -15,7 +14,6 @@
  
            <maven.compiler.source>1.8</maven.compiler.source>

            <maven.compiler.target>1.8</maven.compiler.target>

        </properties>

        <dependencies>

            <dependency>

                <groupId>${project.groupId}</groupId>

    @@ -25,17 +23,22 @@
  
            <dependency>

                <groupId>org.slf4j</groupId>

                <artifactId>slf4j-api</artifactId>

                <version>1.7.32</version>

                <version>${slf4j.version}</version>

            </dependency>

            <dependency>

                <groupId>net.java.dev.jna</groupId>

                <artifactId>jna</artifactId>

                <version>5.9.0</version>

                <version>5.17.0</version>

            </dependency>

            <dependency>

                <groupId>io.spiffe</groupId>

                <artifactId>java-spiffe-provider</artifactId>

                <version>0.7.0</version>

                <version>0.8.11</version>

            </dependency>

            <dependency>

                <groupId>ch.qos.logback</groupId>

                <artifactId>logback-classic</artifactId>

                <version>${logback.version}</version>

            </dependency>

            <dependency>

                <!-- make sure that docker images are build first -->

    @@ -45,16 +48,29 @@
  
                <scope>test</scope>

            </dependency>

            <dependency>

                <groupId>ch.qos.logback</groupId>

                <artifactId>logback-classic</artifactId>

                <version>1.2.5</version>

                <groupId>org.junit.jupiter</groupId>

                <artifactId>junit-jupiter-api</artifactId>

                <version>${junit.jupiter.version}</version>

                <scope>test</scope>

            </dependency>

            <dependency>

                <groupId>org.junit.jupiter</groupId>

                <artifactId>junit-jupiter-api</artifactId>

                <version>5.8.0</version>

                <artifactId>junit-jupiter-engine</artifactId>

                <version>${junit.jupiter.version}</version>

                <scope>test</scope>

            </dependency>

        </dependencies>

        <build>

            <plugins>

                <plugin>

                    <groupId>org.apache.maven.plugins</groupId>

                    <artifactId>maven-surefire-plugin</artifactId>

                    <configuration>

                        <forkCount>1</forkCount>

                        <reuseForks>false</reuseForks>

                        <parallel>none</parallel>

                    </configuration>

                </plugin>

            </plugins>

        </build>

    </project>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update repo dependencies and github action #24

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!