From 8dc6bb305293974a4210247251a30335b911c12d Mon Sep 17 00:00:00 2001 From: Matthis Holleville Date: Sun, 12 Nov 2023 21:59:28 +0100 Subject: [PATCH 1/2] feat: add project_id attribute to cache object Signed-off-by: Matthis Holleville --- protobuf/schema/v1/schema.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/protobuf/schema/v1/schema.proto b/protobuf/schema/v1/schema.proto index 503af2c..792ed79 100644 --- a/protobuf/schema/v1/schema.proto +++ b/protobuf/schema/v1/schema.proto @@ -79,6 +79,7 @@ message Cache { string bucket_name = 2; string storage_account = 3; string container_name = 4; + string project_id = 5; } message Trivy { From ee5a6626d1644f18e3bbd41b273f033f62e6aae2 Mon Sep 17 00:00:00 2001 From: Matthis Holleville Date: Tue, 14 Nov 2023 18:50:17 +0100 Subject: [PATCH 2/2] feat: bump buf version & rework cache structure Signed-off-by: Matthis Holleville --- Makefile | 2 +- protobuf/schema/v1/schema.proto | 22 +++++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d049cf3..c9646db 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BUF_VERSION=v1.6.0 +BUF_VERSION=v1.28.0 TAG=protobuf-v0.1.4 guard-%: @ if [ "${${*}}" = "" ]; then \ diff --git a/protobuf/schema/v1/schema.proto b/protobuf/schema/v1/schema.proto index 792ed79..048e65c 100644 --- a/protobuf/schema/v1/schema.proto +++ b/protobuf/schema/v1/schema.proto @@ -75,11 +75,27 @@ message RemoveConfigResponse { } message Cache { + oneof cache_type { + S3Cache s3_cache = 1; + AzureCache azure_cache = 2; + GCSCache gcs_cache = 3; + } +} + +message S3Cache { + string region = 1; + string bucket_name = 2; +} + +message AzureCache { + string storage_account = 1; + string container_name = 2; +} + +message GCSCache { string region = 1; string bucket_name = 2; - string storage_account = 3; - string container_name = 4; - string project_id = 5; + string project_id = 3; } message Trivy {