Implement raw module output contracts

internal/framework/pipeline/registry_integration_test.go

@@ -5,11 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"gitea.maximumdirect.net/eric/notarius/internal/core/artifacts"
 	"gitea.maximumdirect.net/eric/notarius/internal/core/source"
 	"gitea.maximumdirect.net/eric/notarius/internal/framework/contracts"
-
-	validate "gitea.maximumdirect.net/eric/notarius/internal/framework/validate"
 )
 
 func TestRunnerUsesRegistries(t *testing.T) {
@@ -33,11 +30,11 @@ func TestRunnerUsesRegistries(t *testing.T) {
 	if !reflect.DeepEqual(executed, []string{"extract-first:chunk-0", "extract-second:chunk-0"}) {
 		t.Fatalf("executed = %#v, want extractor chunk execution", executed)
 	}
-	if got := artifactKeys(output.Approved); !reflect.DeepEqual(got, []string{"extract-first"}) {
-		t.Fatalf("approved keys = %#v, want [extract-first]", got)
+	if got := normalizeOutputKeys(output.NormalizeOutputs); !reflect.DeepEqual(got, []string{"normalize", "normalize"}) {
+		t.Fatalf("normalize output keys = %#v, want one output from each lane", got)
 	}
-	if got := rejectedKeys(output.Rejected); !reflect.DeepEqual(got, []string{"extract-second"}) {
-		t.Fatalf("rejected keys = %#v, want [extract-second]", got)
+	if len(output.Rejected) != 0 {
+		t.Fatalf("len(Rejected) = %d, want none", len(output.Rejected))
 	}
 }
 
@@ -64,12 +61,8 @@ func integrationRegistries(t *testing.T, built, executed *[]string) Registries {
 	}); err != nil {
 		t.Fatalf("register chunker: %v", err)
 	}
-	registerIntegrationExtractor(t, registries.Extractors, "extract-first", built, executed, []contracts.Validator{
-		integrationValidator{name: "approve-first", approve: true},
-	})
-	registerIntegrationExtractor(t, registries.Extractors, "extract-second", built, executed, []contracts.Validator{
-		integrationValidator{name: "reject-second", approve: false},
-	})
+	registerIntegrationExtractor(t, registries.Extractors, "extract-first", built, executed)
+	registerIntegrationExtractor(t, registries.Extractors, "extract-second", built, executed)
 	if err := registries.Mergers.Register("merge", func() (contracts.Merger, error) {
 		*built = append(*built, "merge")
 		return integrationMerger{}, nil
@@ -91,12 +84,12 @@ func integrationRegistries(t *testing.T, built, executed *[]string) Registries {
 	return registries
 }
 
-func registerIntegrationExtractor(t *testing.T, registry *ExtractorRegistry, key string, built, executed *[]string, validators []contracts.Validator) {
+func registerIntegrationExtractor(t *testing.T, registry *ExtractorRegistry, key string, built, executed *[]string) {
 	t.Helper()
 
 	if err := registry.Register(key, func() (contracts.Extractor, error) {
 		*built = append(*built, key)
-		return integrationExtractor{key: key, executed: executed, validators: validators}, nil
+		return integrationExtractor{key: key, executed: executed}, nil
 	}); err != nil {
 		t.Fatalf("Register(%q) error = %v, want nil", key, err)
 	}
@@ -140,36 +133,27 @@ func (chunker integrationChunker) Chunk(ctx context.Context, req contracts.Chunk
 }
 
 type integrationExtractor struct {
-	key        string
-	executed   *[]string
-	validators []contracts.Validator
+	key      string
+	executed *[]string
 }
 
 func (extractor integrationExtractor) Key() string {
 	return extractor.key
 }
 
-func (extractor integrationExtractor) ArtifactType() string {
-	return "generic-artifact"
-}
-
-func (extractor integrationExtractor) SchemaVersion() string {
-	return "v1"
-}
-
 func (extractor integrationExtractor) ReferenceSlots() []contracts.ReferenceSlot {
 	return nil
 }
 
-func (extractor integrationExtractor) Validators() []contracts.Validator {
-	return extractor.validators
-}
-
 func (extractor integrationExtractor) Extract(ctx context.Context, req contracts.ExtractionRequest) (contracts.ExtractionResult, error) {
 	*extractor.executed = append(*extractor.executed, extractor.key+":"+req.Chunk.ID)
 	return contracts.ExtractionResult{
-		Candidates: []artifacts.ArtifactCandidate{
-			{Payload: []byte(`{"value":true}`)},
+		Output: contracts.ExtractOutput{
+			Schema: contracts.ResponseSchema{ID: "integration", Name: "integration", Version: "v1"},
+			Payload: contracts.RawPayload{
+				Content:   []byte(`{"value":true}`),
+				MediaType: "application/json",
+			},
 		},
 	}, nil
 }
@@ -183,11 +167,20 @@ func (merger integrationMerger) Key() string {
 }
 
 func (merger integrationMerger) Merge(ctx context.Context, req contracts.MergeRequest) (contracts.MergeResult, error) {
-	var candidates []artifacts.ArtifactCandidate
-	for _, chunkArtifacts := range req.ChunkArtifacts {
-		candidates = append(candidates, chunkArtifacts.Candidates...)
+	output := contracts.MergeOutput{
+		LaneID: req.LaneID,
+		Schema: contracts.ResponseSchema{ID: "integration", Name: "integration", Version: "v1"},
+		Payload: contracts.RawPayload{
+			Content:   []byte(`{"merged":true}`),
+			MediaType: "application/json",
+		},
 	}
-	return contracts.MergeResult{Candidates: candidates}, nil
+	if len(req.ExtractOutputs) > 0 {
+		output.SourceID = req.ExtractOutputs[0].SourceID
+		output.Schema = req.ExtractOutputs[0].Schema
+		output.Payload = req.ExtractOutputs[0].Payload
+	}
+	return contracts.MergeResult{Output: output}, nil
 }
 
 func (normalizer integrationNormalizer) Key() string {
@@ -199,7 +192,14 @@ func (normalizer integrationNormalizer) ReferenceSlots() []contracts.ReferenceSl
 }
 
 func (normalizer integrationNormalizer) Normalize(ctx context.Context, req contracts.NormalizeRequest) (contracts.NormalizeResult, error) {
-	return contracts.NormalizeResult{Candidates: req.Candidates}, nil
+	return contracts.NormalizeResult{
+		Output: contracts.NormalizeOutput{
+			LaneID:   req.LaneID,
+			SourceID: req.MergeOutput.SourceID,
+			Schema:   req.MergeOutput.Schema,
+			Payload:  req.MergeOutput.Payload,
+		},
+	}, nil
 }
 
 type integrationOutput struct{}
@@ -216,30 +216,6 @@ func (output integrationOutput) Encode(ctx context.Context, req contracts.Output
 	}, nil
 }
 
-type integrationValidator struct {
-	name    string
-	approve bool
-}
-
-func (validator integrationValidator) Name() string {
-	return validator.name
-}
-
-func (validator integrationValidator) Validate(ctx context.Context, req contracts.ValidationRequest) (contracts.ValidationResult, error) {
-	decisions := make([]contracts.ValidationDecision, 0, len(req.Candidates))
-	for _, candidate := range req.Candidates {
-		if validator.approve {
-			decisions = append(decisions, validate.Approved(candidate.Index))
-		} else {
-			decisions = append(decisions, validate.Rejected(candidate.Index, "invalid", "not accepted"))
-		}
-	}
-	return contracts.ValidationResult{
-		ValidatorName: validator.name,
-		Decisions:     decisions,
-	}, nil
-}
-
 func integrationPipeline() ResolvedPipeline {
 	return ResolvedPipeline{
 		ID:     "pipeline-1",
@@ -276,18 +252,10 @@ func integrationSourceDocument() *source.SourceDocument {
 	}
 }
 
-func artifactKeys(approved []artifacts.Artifact) []string {
-	keys := make([]string, 0, len(approved))
-	for _, artifact := range approved {
-		keys = append(keys, artifact.ExtractorKey)
-	}
-	return keys
-}
-
-func rejectedKeys(rejected []artifacts.RejectedArtifact) []string {
-	keys := make([]string, 0, len(rejected))
-	for _, artifact := range rejected {
-		keys = append(keys, artifact.Candidate.ExtractorKey)
+func normalizeOutputKeys(outputs []contracts.NormalizeOutput) []string {
+	keys := make([]string, 0, len(outputs))
+	for _, output := range outputs {
+		keys = append(keys, output.NormalizerKey)
 	}
 	return keys
 }