Skip to content
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

backend: fetch soft deleted schemas when building registry so we can … #1599

Merged
merged 2 commits into from
Jan 27, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/pkg/schema/service.go
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ func (s *Service) GetProtoDescriptors(ctx context.Context) (map[int]*desc.FileDe
// duplicate requests against the schema registry
key := "get-proto-descriptors"
_, err, _ := s.requestGroup.Do(key, func() (any, error) {
schemasRes, errs := s.registryClient.GetSchemas(ctx, false)
schemasRes, errs := s.registryClient.GetSchemas(ctx, true)
if len(errs) > 0 {
for _, err := range errs {
s.logger.Error("failed to get schema from registry", zap.Error(err))
@@ -507,7 +507,7 @@ func (s *Service) ValidateProtobufSchema(ctx context.Context, name string, sch S
func (s *Service) GetSchemaBySubjectAndVersion(ctx context.Context, subject string, version string) (*SchemaVersionedResponse, error) {
cacheKey := subject + "v" + version
cachedSchema, err, _ := s.schemaBySubjectVersion.Get(cacheKey, func() (*SchemaVersionedResponse, error) {
schema, err := s.registryClient.GetSchemaBySubject(ctx, subject, version, false)
schema, err := s.registryClient.GetSchemaBySubject(ctx, subject, version, true)
if err != nil {
return nil, fmt.Errorf("get schema by subject failed: %w", err)
}
4 changes: 2 additions & 2 deletions backend/pkg/serde/avro_test.go
Original file line number Diff line number Diff line change
@@ -244,7 +244,7 @@ func TestAvroSerde_SerializeObject(t *testing.T) {
return
}
return
case srListSchemasPath:
case srListSchemasPath, srListSchemasPath + "?deleted=true":
type SchemaVersionedResponse struct {
Subject string `json:"subject"`
SchemaID int `json:"id"`
@@ -271,7 +271,7 @@ func TestAvroSerde_SerializeObject(t *testing.T) {
return
}
return
case srListSubjectsPath:
case srListSubjectsPath, srListSubjectsPath + "?deleted=true":
w.Header().Set("content-type", "application/vnd.schemaregistry.v1+json")
resp := []string{"test-subject-avro-v1"}
enc := json.NewEncoder(w)
4 changes: 2 additions & 2 deletions backend/pkg/serde/json_schema_test.go
Original file line number Diff line number Diff line change
@@ -221,7 +221,7 @@ func TestJsonSchemaSerde_SerializeObject(t *testing.T) {
return
}
return
case srListSchemasPath:
case srListSchemasPath, srListSchemasPath + "?deleted=true":
type SchemaVersionedResponse struct {
Subject string `json:"subject"`
SchemaID int `json:"id"`
@@ -248,7 +248,7 @@ func TestJsonSchemaSerde_SerializeObject(t *testing.T) {
return
}
return
case srListSubjectsPath:
case srListSubjectsPath, srListSubjectsPath + "?deleted=true":
w.Header().Set("content-type", "application/vnd.schemaregistry.v1+json")
resp := []string{"test-subject-json-v1"}
enc := json.NewEncoder(w)
11 changes: 7 additions & 4 deletions backend/pkg/serde/protobuf_schema_test.go
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ package serde
import (
"context"
"encoding/json"
"fmt"
"net/http"
"net/http/httptest"
"os"
@@ -46,6 +47,8 @@ func TestProtobufSchemaSerde_DeserializePayload(t *testing.T) {
return
}

fmt.Println("!!! r.URL.String():", r.URL.String())

switch r.URL.String() {
case "/schemas/ids/1000":
w.Header().Set("content-type", "application/vnd.schemaregistry.v1+json")
@@ -69,7 +72,7 @@ func TestProtobufSchemaSerde_DeserializePayload(t *testing.T) {
return
}
return
case srListSchemasPath:
case srListSchemasPath, srListSchemasPath + "?deleted=true":
type SchemaVersionedResponse struct {
Subject string `json:"subject"`
SchemaID int `json:"id"`
@@ -96,7 +99,7 @@ func TestProtobufSchemaSerde_DeserializePayload(t *testing.T) {
return
}
return
case srListSubjectsPath:
case srListSubjectsPath, srListSubjectsPath + "?deleted=true":
w.Header().Set("content-type", "application/vnd.schemaregistry.v1+json")
resp := []string{"test-subject-shop-order-v1"}
enc := json.NewEncoder(w)
@@ -302,7 +305,7 @@ func TestProtobufSchemaSerde_SerializeObject(t *testing.T) {
return
}
return
case "/schemas":
case srListSchemasPath, srListSchemasPath + "?deleted=true":
type SchemaVersionedResponse struct {
Subject string `json:"subject"`
SchemaID int `json:"id"`
@@ -336,7 +339,7 @@ func TestProtobufSchemaSerde_SerializeObject(t *testing.T) {
return
}
return
case srListSubjectsPath:
case srListSubjectsPath, srListSubjectsPath + "?deleted=true":
w.Header().Set("content-type", "application/vnd.schemaregistry.v1+json")
resp := []string{"test-subject-shop-order-v1", "test-subject-shop-data-v1"}
enc := json.NewEncoder(w)