diff --git a/.github/docker/docker-compose.yaml b/.github/docker/docker-compose.yaml index 8c70341d6a..6f1e52aac1 100644 --- a/.github/docker/docker-compose.yaml +++ b/.github/docker/docker-compose.yaml @@ -5,7 +5,7 @@ services: network_mode: "host" volumes: - /tmp/ssl:/ssl - - /tmp/ssl-kmip:/ssl-kmip + - /tmp/ssl-kmip:/tmp/ssl-kmip - ${HOME}/.aws/credentials:/root/.aws/credentials - /tmp/artifacts/${JOB_NAME}:/artifacts environment: @@ -28,7 +28,7 @@ services: - S3KMS - S3KMIP_PORT - S3KMIP_HOSTS - - S3KMIP-COMPOUND_CREATE + - S3KMIP_COMPOUND_CREATE - S3KMIP_BUCKET_ATTRIBUTE_NAME - S3KMIP_PIPELINE_DEPTH - S3KMIP_KEY diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index eb2bd5ab57..03b9100d63 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -325,6 +325,15 @@ jobs: CLOUDSERVER_IMAGE: ghcr.io/${{ github.repository }}:${{ github.sha }} PYKMIP_IMAGE: ghcr.io/${{ github.repository }}/pykmip:${{ github.sha }} JOB_NAME: ${{ github.job }} + S3KMS: kmip + S3KMIP_PORT: 5696 + S3KMIP_HOSTS: pykmip.local + S3KMIP_COMPOUND_CREATE: false + S3KMIP_BUCKET_ATTRIBUTE_NAME: '' + S3KMIP_PIPELINE_DEPTH: 8 + S3KMIP_KEY: /tmp/ssl-kmip/kmip-client-key.pem + S3KMIP_CERT: /tmp/ssl-kmip/kmip-client-cert.pem + S3KMIP_CA: /tmp/ssl-kmip/kmip-ca.pem steps: - name: Checkout uses: actions/checkout@v4 diff --git a/config.json b/config.json index 3d3d9dd9d3..4d61288a4b 100644 --- a/config.json +++ b/config.json @@ -95,5 +95,8 @@ "endpoint": "http://127.0.0.1:8080", "ak": "tbd", "sk": "tbd" + }, + "kmip": { + "providerName": "thales" } }