Remove retired lock authorities
This commit is contained in:
@@ -15,7 +15,7 @@ import (
|
||||
|
||||
const (
|
||||
extractSemanticConfigVersion = 1
|
||||
publishSemanticConfigVersion = 1
|
||||
publishSemanticConfigVersion = 2
|
||||
notifySemanticConfigVersion = 1
|
||||
)
|
||||
|
||||
@@ -45,7 +45,6 @@ type publishSemanticConfig struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
UploadRun bool `json:"upload_run"`
|
||||
Rules []publishSemanticRule `json:"rules"`
|
||||
StaticLocks []publishSemanticLock `json:"static_locks"`
|
||||
Destination publishSemanticDestination `json:"destination"`
|
||||
}
|
||||
|
||||
@@ -55,11 +54,6 @@ type publishSemanticRule struct {
|
||||
Required bool `json:"required"`
|
||||
}
|
||||
|
||||
type publishSemanticLock struct {
|
||||
Source string `json:"source"`
|
||||
Reason string `json:"reason,omitempty"`
|
||||
}
|
||||
|
||||
type publishSemanticDestination struct {
|
||||
Backend string `json:"backend"`
|
||||
Bucket string `json:"bucket,omitempty"`
|
||||
@@ -122,7 +116,7 @@ func (publishStage) SemanticConfigFingerprint(env *Env) (manifest.SemanticConfig
|
||||
}
|
||||
pipeline := env.Config.Pipeline
|
||||
payload := publishSemanticConfig{
|
||||
Rules: []publishSemanticRule{}, StaticLocks: []publishSemanticLock{},
|
||||
Rules: []publishSemanticRule{},
|
||||
Destination: publishSemanticDestination{Backend: strings.ToLower(strings.TrimSpace(pipeline.Storage.Backend))},
|
||||
}
|
||||
if payload.Destination.Backend == "" {
|
||||
@@ -166,19 +160,6 @@ func (publishStage) SemanticConfigFingerprint(env *Env) (manifest.SemanticConfig
|
||||
}
|
||||
return payload.Rules[i].Dest < payload.Rules[j].Dest
|
||||
})
|
||||
for _, lock := range cfg.Locks {
|
||||
source, err := artifactpolicy.ValidatePublishSourceWithExtractions(lock.Source, configured, extractions)
|
||||
if err != nil {
|
||||
return manifest.SemanticConfigFingerprint{}, fmt.Errorf("publish semantic lock source %q: %w", lock.Source, err)
|
||||
}
|
||||
payload.StaticLocks = append(payload.StaticLocks, publishSemanticLock{
|
||||
Source: source.ID,
|
||||
Reason: strings.TrimSpace(lock.Reason),
|
||||
})
|
||||
}
|
||||
sort.Slice(payload.StaticLocks, func(i, j int) bool {
|
||||
return payload.StaticLocks[i].Source < payload.StaticLocks[j].Source
|
||||
})
|
||||
return FingerprintSemanticConfig(publishSemanticConfigVersion, payload)
|
||||
}
|
||||
|
||||
|
||||
@@ -101,7 +101,6 @@ func TestPublishSemanticConfigSensitivityAndOperationalExclusions(t *testing.T)
|
||||
{name: "source", mutate: func(env *Env) { env.Config.Pipeline.Publish.Outputs[0].Source = "narratio.transcript.final_markdown" }},
|
||||
{name: "destination", mutate: func(env *Env) { env.Config.Pipeline.Publish.Outputs[0].Dest = "published/other.json" }},
|
||||
{name: "required", mutate: func(env *Env) { env.Config.Pipeline.Publish.Outputs[0].Required = boolPointer(false) }},
|
||||
{name: "static lock", mutate: func(env *Env) { env.Config.Pipeline.Publish.Locks = nil }},
|
||||
{name: "backend", mutate: func(env *Env) { env.Config.Pipeline.Storage.Backend = config.StorageBackendLocal }},
|
||||
{name: "bucket", mutate: func(env *Env) { env.Config.Pipeline.Storage.S3.Bucket = "other-bucket" }},
|
||||
{name: "region", mutate: func(env *Env) { env.Config.Pipeline.Storage.S3.Region = "eu-west-1" }},
|
||||
@@ -140,8 +139,6 @@ func TestDeliverySemanticConfigCanonicalOrderingAndNotifyMode(t *testing.T) {
|
||||
second := downstreamSemanticEnv()
|
||||
second.Config.Pipeline.Publish.Outputs[0], second.Config.Pipeline.Publish.Outputs[1] =
|
||||
second.Config.Pipeline.Publish.Outputs[1], second.Config.Pipeline.Publish.Outputs[0]
|
||||
second.Config.Pipeline.Publish.Locks[0], second.Config.Pipeline.Publish.Locks[1] =
|
||||
second.Config.Pipeline.Publish.Locks[1], second.Config.Pipeline.Publish.Locks[0]
|
||||
firstPublish, err := (publishStage{}).SemanticConfigFingerprint(first)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
@@ -221,10 +218,6 @@ func downstreamSemanticEnv() *Env {
|
||||
{Source: "narratio.transcript.final_trimmed", Dest: "transcripts/final.trimmed.json", Required: boolPointer(true)},
|
||||
{Source: "narratio.transcript.final_trimmed_markdown", Dest: "transcripts/final.trimmed.md", Required: boolPointer(true)},
|
||||
},
|
||||
Locks: []config.PublishLockRule{
|
||||
{Source: "narratio.transcript.final_trimmed", Reason: "curated"},
|
||||
{Source: "narratio.transcript.final_trimmed_markdown", Reason: "approved"},
|
||||
},
|
||||
},
|
||||
Notification: config.NotificationConfig{Mode: config.DefaultNotificationMode},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user