From 78425b3613e78d7d2d17d425895ec96058a87092 Mon Sep 17 00:00:00 2001 From: Hayden B Date: Fri, 7 Oct 2022 11:56:17 -0700 Subject: [PATCH] Update swagger doc version for Fulcio 1.0 (#816) * Update swagger doc version for Fulcio 1.0 The legacy API will be 1.0.0, and the gRPC V2 API 2.0.0 Signed-off-by: Hayden Blauzvern * Update generated code Signed-off-by: Hayden Blauzvern * Update protoc Signed-off-by: Hayden Blauzvern Signed-off-by: Hayden Blauzvern --- .github/workflows/main.yml | 2 +- fulcio.proto | 2 +- fulcio.swagger.json | 2 +- fulcio_legacy.proto | 2 +- fulcio_legacy.swagger.json | 2 +- pkg/generated/protobuf/fulcio.pb.go | 4 ++-- pkg/generated/protobuf/fulcio_grpc.pb.go | 2 +- pkg/generated/protobuf/legacy/fulcio_legacy.pb.go | 4 ++-- pkg/generated/protobuf/legacy/fulcio_legacy_grpc.pb.go | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 60bc02cd1..5deb97805 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,7 +38,7 @@ jobs: - uses: arduino/setup-protoc@64c0c85d18e984422218383b81c52f8b077404d3 # v1.1.2 name: Install protobuf with: - version: '3.20.1' + version: '3.20.3' - name: Build run: make -C $GITHUB_WORKSPACE all diff --git a/fulcio.proto b/fulcio.proto index 3348792ad..8a899ad7e 100644 --- a/fulcio.proto +++ b/fulcio.proto @@ -28,7 +28,7 @@ option java_outer_classname = "FulcioProto"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { title: "Fulcio"; - version: "0.0.1"; + version: "2.0.0"; contact: { name: "sigstore Fulcio project"; url: "https://github.com/sigstore/fulcio"; diff --git a/fulcio.swagger.json b/fulcio.swagger.json index 9c74ddee2..e3f7fb7ff 100644 --- a/fulcio.swagger.json +++ b/fulcio.swagger.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "Fulcio", - "version": "0.0.1", + "version": "2.0.0", "contact": { "name": "sigstore Fulcio project", "url": "https://github.com/sigstore/fulcio", diff --git a/fulcio_legacy.proto b/fulcio_legacy.proto index e860fb1e1..e3da03404 100644 --- a/fulcio_legacy.proto +++ b/fulcio_legacy.proto @@ -30,7 +30,7 @@ option java_outer_classname = "FulcioProto"; option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { info: { title: "Fulcio Legacy"; - version: "0.0.1"; + version: "1.0.0"; contact: { name: "sigstore Fulcio project"; url: "https://github.com/sigstore/fulcio"; diff --git a/fulcio_legacy.swagger.json b/fulcio_legacy.swagger.json index bcd44771f..a30b6a923 100644 --- a/fulcio_legacy.swagger.json +++ b/fulcio_legacy.swagger.json @@ -2,7 +2,7 @@ "swagger": "2.0", "info": { "title": "Fulcio Legacy", - "version": "0.0.1", + "version": "1.0.0", "contact": { "name": "sigstore Fulcio project", "url": "https://github.com/sigstore/fulcio", diff --git a/pkg/generated/protobuf/fulcio.pb.go b/pkg/generated/protobuf/fulcio.pb.go index f1d26029b..17d0ed3fb 100644 --- a/pkg/generated/protobuf/fulcio.pb.go +++ b/pkg/generated/protobuf/fulcio.pb.go @@ -16,7 +16,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.20.1 +// protoc v3.20.3 // source: fulcio.proto package protobuf @@ -1080,7 +1080,7 @@ var file_fulcio_proto_rawDesc = []byte{ 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x69, 0x67, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x66, 0x75, 0x6c, 0x63, 0x69, 0x6f, 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, 0x4c, 0x49, 0x43, 0x45, 0x4e, 0x53, - 0x45, 0x32, 0x05, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x1a, 0x13, 0x66, 0x75, 0x6c, 0x63, 0x69, 0x6f, + 0x45, 0x32, 0x05, 0x32, 0x2e, 0x30, 0x2e, 0x30, 0x1a, 0x13, 0x66, 0x75, 0x6c, 0x63, 0x69, 0x6f, 0x2e, 0x73, 0x69, 0x67, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x64, 0x65, 0x76, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, diff --git a/pkg/generated/protobuf/fulcio_grpc.pb.go b/pkg/generated/protobuf/fulcio_grpc.pb.go index df8c8fb0f..81fd86215 100644 --- a/pkg/generated/protobuf/fulcio_grpc.pb.go +++ b/pkg/generated/protobuf/fulcio_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.20.1 +// - protoc v3.20.3 // source: fulcio.proto package protobuf diff --git a/pkg/generated/protobuf/legacy/fulcio_legacy.pb.go b/pkg/generated/protobuf/legacy/fulcio_legacy.pb.go index c34f35399..98d189f5b 100644 --- a/pkg/generated/protobuf/legacy/fulcio_legacy.pb.go +++ b/pkg/generated/protobuf/legacy/fulcio_legacy.pb.go @@ -16,7 +16,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.28.1 -// protoc v3.20.1 +// protoc v3.20.3 // source: fulcio_legacy.proto package legacy @@ -252,7 +252,7 @@ var file_fulcio_legacy_proto_rawDesc = []byte{ 0x30, 0x12, 0x34, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x69, 0x67, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x66, 0x75, 0x6c, 0x63, 0x69, 0x6f, 0x2f, 0x62, 0x6c, 0x6f, 0x62, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, - 0x4c, 0x49, 0x43, 0x45, 0x4e, 0x53, 0x45, 0x32, 0x05, 0x30, 0x2e, 0x30, 0x2e, 0x31, 0x1a, 0x13, + 0x4c, 0x49, 0x43, 0x45, 0x4e, 0x53, 0x45, 0x32, 0x05, 0x31, 0x2e, 0x30, 0x2e, 0x30, 0x1a, 0x13, 0x66, 0x75, 0x6c, 0x63, 0x69, 0x6f, 0x2e, 0x73, 0x69, 0x67, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x64, 0x65, 0x76, 0x2a, 0x01, 0x01, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, diff --git a/pkg/generated/protobuf/legacy/fulcio_legacy_grpc.pb.go b/pkg/generated/protobuf/legacy/fulcio_legacy_grpc.pb.go index 21291b901..e375f6b43 100644 --- a/pkg/generated/protobuf/legacy/fulcio_legacy_grpc.pb.go +++ b/pkg/generated/protobuf/legacy/fulcio_legacy_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.2.0 -// - protoc v3.20.1 +// - protoc v3.20.3 // source: fulcio_legacy.proto package legacy