Merge pull request #144 from linuxfoundation/feat/skip-enrichment-header

feat: add X-Skip-Enrichment header for committee member writes

Author: andrest50

cmd/committee-api/design/committee.go

@@ -304,6 +304,7 @@ var _ = dsl.Service("committee-service", func() {
 			VersionAttribute()
 			XSyncAttribute()
 			SkipNotificationAttribute()
+			SkipEnrichmentAttribute()
 			CommitteeUIDAttribute()
 
 			CommitteeMemberCreateAttributes()
@@ -326,6 +327,7 @@ var _ = dsl.Service("committee-service", func() {
 			dsl.Header("bearer_token:Authorization")
 			dsl.Header("x_sync:X-Sync")
 			dsl.Header("skip_notification:X-Skip-Notification")
+			dsl.Header("skip_enrichment:X-Skip-Enrichment")
 			dsl.Response(dsl.StatusCreated)
 			dsl.Response("BadRequest", dsl.StatusBadRequest)
 			dsl.Response("NotFound", dsl.StatusNotFound)
@@ -490,6 +492,7 @@ var _ = dsl.Service("committee-service", func() {
 			VersionAttribute()
 			IfMatchAttribute()
 			XSyncAttribute()
+			SkipEnrichmentAttribute()
 			CommitteeUIDAttribute()
 			MemberUIDAttribute()
 
@@ -514,6 +517,7 @@ var _ = dsl.Service("committee-service", func() {
 			dsl.Header("bearer_token:Authorization")
 			dsl.Header("if_match:If-Match")
 			dsl.Header("x_sync:X-Sync")
+			dsl.Header("skip_enrichment:X-Skip-Enrichment")
 			dsl.Response(dsl.StatusOK)
 			dsl.Response("BadRequest", dsl.StatusBadRequest)
 			dsl.Response("NotFound", dsl.StatusNotFound)

cmd/committee-api/design/type.go

@@ -388,6 +388,15 @@ func SkipNotificationAttribute() {
 	})
 }
 
+// SkipEnrichmentAttribute is the DSL attribute for skipping auth-service enrichment on
+// committee member writes (email→username lookup and profile metadata backfill).
+func SkipEnrichmentAttribute() {
+	dsl.Attribute("skip_enrichment", dsl.Boolean, "When true, skip auth-service enrichment: the username, name, and avatar from the request body are stored as-is without email→username lookup or profile metadata backfill. Intended for trusted sync callers.", func() {
+		dsl.Default(false)
+		dsl.Example(true)
+	})
+}
+
 // CreatedAtAttribute is the DSL attribute for creation timestamp.
 func CreatedAtAttribute() {
 	dsl.Attribute("created_at", dsl.String, "The timestamp when the resource was created (read-only)", func() {

cmd/committee-api/service/committee_service.go

@@ -284,11 +284,12 @@ func (s *committeeServicesrvc) CreateCommitteeMember(ctx context.Context, p *com
 	// Convert payload to domain model
 	request := s.convertMemberPayloadToDomain(p)
 
-	// If no username was supplied, resolve it from email and enrich profile fields.
-	s.enrichMember(ctx, request)
+	if !p.SkipEnrichment {
+		s.enrichMember(ctx, request)
+	}
 
 	// Execute use case
-	response, err := s.committeeWriterOrchestrator.CreateMember(ctx, request, p.XSync)
+	response, err := s.committeeWriterOrchestrator.CreateMember(ctx, request, p.XSync, p.SkipEnrichment)
 	if err != nil {
 		return nil, wrapError(ctx, err)
 	}
@@ -588,11 +589,12 @@ func (s *committeeServicesrvc) UpdateCommitteeMember(ctx context.Context, p *com
 	// Convert payload to domain model
 	committeeMember := s.convertPayloadToUpdateMember(p)
 
-	// If no username was supplied, resolve it from email and enrich profile fields.
-	s.enrichMember(ctx, committeeMember)
+	if !p.SkipEnrichment {
+		s.enrichMember(ctx, committeeMember)
+	}
 
 	// Execute use case
-	updatedMember, err := s.committeeWriterOrchestrator.UpdateMember(ctx, committeeMember, parsedRevision, p.XSync)
+	updatedMember, err := s.committeeWriterOrchestrator.UpdateMember(ctx, committeeMember, parsedRevision, p.XSync, p.SkipEnrichment)
 	if err != nil {
 		return nil, wrapError(ctx, err)
 	}
@@ -939,7 +941,7 @@ func (s *committeeServicesrvc) AcceptInvite(ctx context.Context, p *committeeser
 	}
 	s.enrichMember(ctx, member)
 
-	response, err := s.committeeWriterOrchestrator.CreateMember(ctx, member, false)
+	response, err := s.committeeWriterOrchestrator.CreateMember(ctx, member, false, false)
 	if err != nil {
 		return nil, wrapError(ctx, err)
 	}
@@ -1159,7 +1161,7 @@ func (s *committeeServicesrvc) ApproveApplication(ctx context.Context, p *commit
 		member.SkipNotification = true
 	}
 
-	response, err := s.committeeWriterOrchestrator.CreateMember(ctx, member, false)
+	response, err := s.committeeWriterOrchestrator.CreateMember(ctx, member, false, false)
 	if err != nil {
 		return nil, wrapError(ctx, err)
 	}
@@ -1257,7 +1259,7 @@ func (s *committeeServicesrvc) JoinCommittee(ctx context.Context, p *committeese
 	s.enrichMember(ctx, member)
 	s.enrichMemberOrganization(ctx, member)
 
-	response, err := s.committeeWriterOrchestrator.CreateMember(ctx, member, p.XSync)
+	response, err := s.committeeWriterOrchestrator.CreateMember(ctx, member, p.XSync, false)
 	if err != nil {
 		return nil, wrapError(ctx, err)
 	}

cmd/committee-api/service/committee_service_test.go

@@ -139,7 +139,7 @@ func (m *mockCommitteeWriterOrchestrator) Delete(ctx context.Context, uid string
 	return errs.NewUnexpected("not implemented for test")
 }
 
-func (m *mockCommitteeWriterOrchestrator) CreateMember(ctx context.Context, member *model.CommitteeMember, sync bool) (*model.CommitteeMember, error) {
+func (m *mockCommitteeWriterOrchestrator) CreateMember(ctx context.Context, member *model.CommitteeMember, sync bool, skipEnrichment bool) (*model.CommitteeMember, error) {
 	m.createMemberCalls = append(m.createMemberCalls, member)
 	if m.createMemberErr != nil {
 		return nil, m.createMemberErr
@@ -150,7 +150,7 @@ func (m *mockCommitteeWriterOrchestrator) CreateMember(ctx context.Context, memb
 	return nil, errs.NewUnexpected("not implemented for test")
 }
 
-func (m *mockCommitteeWriterOrchestrator) UpdateMember(ctx context.Context, member *model.CommitteeMember, revision uint64, sync bool) (*model.CommitteeMember, error) {
+func (m *mockCommitteeWriterOrchestrator) UpdateMember(ctx context.Context, member *model.CommitteeMember, revision uint64, sync bool, skipEnrichment bool) (*model.CommitteeMember, error) {
 	m.updateMemberCalls = append(m.updateMemberCalls, updateMemberCall{member: member, revision: revision})
 	if m.updateMemberErr != nil {
 		return nil, m.updateMemberErr
@@ -166,7 +166,7 @@ func (m *mockCommitteeWriterOrchestrator) DeleteMember(ctx context.Context, uid
 // ReassignMember mirrors the real orchestrator: create the new holder, delete the old, and roll back
 // the created member (an extra delete) if the delete fails, so reassign tests can assert the calls.
 func (m *mockCommitteeWriterOrchestrator) ReassignMember(ctx context.Context, oldMemberUID string, oldRevision uint64, newMember *model.CommitteeMember, sync bool) (*model.CommitteeMember, error) {
-	created, err := m.CreateMember(ctx, newMember, sync)
+	created, err := m.CreateMember(ctx, newMember, sync, false)
 	if err != nil {
 		return nil, err
 	}

cmd/committee-cli/commands/sync/total_members_attribute_test.go

@@ -167,10 +167,10 @@ func (w *mockWriter) UpdateSettings(_ context.Context, s *model.CommitteeSetting
 	return s, nil
 }
 func (w *mockWriter) Delete(_ context.Context, _ string, _ uint64, _ bool) error { return nil }
-func (w *mockWriter) CreateMember(_ context.Context, m *model.CommitteeMember, _ bool) (*model.CommitteeMember, error) {
+func (w *mockWriter) CreateMember(_ context.Context, m *model.CommitteeMember, _ bool, _ bool) (*model.CommitteeMember, error) {
 	return m, nil
 }
-func (w *mockWriter) UpdateMember(_ context.Context, m *model.CommitteeMember, _ uint64, _ bool) (*model.CommitteeMember, error) {
+func (w *mockWriter) UpdateMember(_ context.Context, m *model.CommitteeMember, _ uint64, _ bool, _ bool) (*model.CommitteeMember, error) {
 	return m, nil
 }
 func (w *mockWriter) DeleteMember(_ context.Context, _ string, _ uint64, _ bool, _ bool) error {
@@ -398,11 +398,11 @@ func (c *conditionalFailWriter) UpdateSettings(ctx context.Context, s *model.Com
 func (c *conditionalFailWriter) Delete(ctx context.Context, uid string, rev uint64, sync bool) error {
 	return c.inner.Delete(ctx, uid, rev, sync)
 }
-func (c *conditionalFailWriter) CreateMember(ctx context.Context, m *model.CommitteeMember, sync bool) (*model.CommitteeMember, error) {
-	return c.inner.CreateMember(ctx, m, sync)
+func (c *conditionalFailWriter) CreateMember(ctx context.Context, m *model.CommitteeMember, sync bool, skipEnrichment bool) (*model.CommitteeMember, error) {
+	return c.inner.CreateMember(ctx, m, sync, skipEnrichment)
 }
-func (c *conditionalFailWriter) UpdateMember(ctx context.Context, m *model.CommitteeMember, rev uint64, sync bool) (*model.CommitteeMember, error) {
-	return c.inner.UpdateMember(ctx, m, rev, sync)
+func (c *conditionalFailWriter) UpdateMember(ctx context.Context, m *model.CommitteeMember, rev uint64, sync bool, skipEnrichment bool) (*model.CommitteeMember, error) {
+	return c.inner.UpdateMember(ctx, m, rev, sync, skipEnrichment)
 }
 func (c *conditionalFailWriter) DeleteMember(ctx context.Context, uid string, rev uint64, sync bool, skipNotification bool) error {
 	return c.inner.DeleteMember(ctx, uid, rev, sync, skipNotification)