Remove retired lock authorities

internal/config/validate_publish.go

@@ -83,71 +83,9 @@ func validatePublish(cfg *PublishConfig, scriptorium *ScriptoriumConfig, notariu
 		}
 		seenDest[normalizedDest] = struct{}{}
 	}
-	locks, err := ValidatePublishLockRules(cfg.Locks, scriptorium, notarius, "pipeline.publish.locks")
-	if err != nil {
-		return err
-	}
-	cfg.Locks = locks
 	return nil
 }
 
-// ValidatePublishLockRules validates and normalizes source-based publish locks.
-func ValidatePublishLockRules(locks []PublishLockRule, scriptorium *ScriptoriumConfig, notarius *NotariusConfig, label string) ([]PublishLockRule, error) {
-	seenLocks := map[string]struct{}{}
-	out := make([]PublishLockRule, 0, len(locks))
-	configuredOutputs := scriptoriumOutputPathMap(scriptorium)
-	extractionOutputs := notariusOutputKeySet(notarius)
-	if strings.TrimSpace(label) == "" {
-		label = "publish.locks"
-	}
-	for i, item := range locks {
-		prefix := fmt.Sprintf("%s[%d]", label, i)
-		source := strings.TrimSpace(item.Source)
-		if source == "" {
-			return nil, fmt.Errorf("%s.source is required", prefix)
-		}
-		if _, err := artifactpolicy.ValidatePublishSourceWithExtractions(source, configuredOutputs, extractionOutputs); err != nil {
-			return nil, fmt.Errorf("%s.source %q is unsupported: %w", prefix, item.Source, err)
-		}
-		if _, ok := seenLocks[source]; ok {
-			return nil, fmt.Errorf("%s.source %q duplicates another publish lock source", prefix, source)
-		}
-		seenLocks[source] = struct{}{}
-		out = append(out, PublishLockRule{
-			Source: source,
-			Reason: strings.TrimSpace(item.Reason),
-		})
-	}
-	return out, nil
-}
-
-// MergePublishLockRules returns the union of static and remote locks. Static
-// locks win when both sources contain the same lock.
-func MergePublishLockRules(staticLocks, remoteLocks []PublishLockRule) []PublishLockRule {
-	out := make([]PublishLockRule, 0, len(staticLocks)+len(remoteLocks))
-	seen := map[string]struct{}{}
-	for _, item := range staticLocks {
-		source := strings.TrimSpace(item.Source)
-		if source == "" {
-			continue
-		}
-		out = append(out, PublishLockRule{Source: source, Reason: strings.TrimSpace(item.Reason)})
-		seen[source] = struct{}{}
-	}
-	for _, item := range remoteLocks {
-		source := strings.TrimSpace(item.Source)
-		if source == "" {
-			continue
-		}
-		if _, ok := seen[source]; ok {
-			continue
-		}
-		out = append(out, PublishLockRule{Source: source, Reason: strings.TrimSpace(item.Reason)})
-		seen[source] = struct{}{}
-	}
-	return out
-}
-
 func scriptoriumOutputPathMap(scriptorium *ScriptoriumConfig) map[string]string {
 	out := map[string]string{}
 	if scriptorium == nil || len(scriptorium.Artifacts) == 0 {