Skip to content
Merged
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/v2/lens/enforcement/contract.dag
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ import v2.lens.registry {
}
import v2.lens.enforcement.vocab {
SubjectRoster, ScopeRoster,
EnforcementMode, Blocking, AuditOnly, Advisory,
EnforcementMode, Blocking, AuditOnly,
ConsumerKind, EnrolledInFloorRoster, WitnessOnly, NoConsumer,
ConsumerWitnessBinding, BoundConsumerWitness, NoConsumerWitness,
ScopeSatisfaction, ScopeCovers, ScopeNarrowed, ScopeMissing,
Expand Down
4 changes: 1 addition & 3 deletions src/v2/lens/enforcement/gate.dag
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import v2.std.algebra { for_all, any, filter, contains, non_empty, list_head, He
import v2.lens.registry { LensRegistryEntryV0, LensIdV0, lens_id_v0_eq }
import v2.lens.enforcement.vocab {
SubjectRoster,
EnforcementMode, Advisory, AuditOnly, Blocking, enforcement_mode_satisfies,
EnforcementMode, AuditOnly, Blocking, enforcement_mode_satisfies,
ConsumerKind, ConsumerRequirement, WitnessOnly, consumer_is_live, consumer_satisfies,
ScopeSatisfaction, ScopeCovers, ScopeNarrowed, ScopeMissing,
subject_roster_covers,
Expand Down Expand Up @@ -140,7 +140,6 @@ fn scope_leg(intent: StandingIntent, s: ScopeSatisfaction) -> LegVerdict {
match intent.default_mode {
Blocking => LegFails { reason: "blocking intent narrowed by a reason not on the allow-list" }
AuditOnly => LegHolds
Advisory => LegHolds
}
}
}
Expand Down Expand Up @@ -222,7 +221,6 @@ fn contract_internally_consistent(c: LensContract, receipts: List<EnrollmentDisc
ReceiptAbsent => false
}
AuditOnly => true
Advisory => true
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/v2/lens/enforcement/vocab.dag
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ type ScopeRoster {
roots: List<String>
}

type EnforcementMode = Advisory | AuditOnly | Blocking
type EnforcementMode = AuditOnly | Blocking

type ConsumerKind
= EnrolledInFloorRoster | MergeAdmission | PrePushHook | PeriodicActuator
Expand Down Expand Up @@ -48,7 +48,6 @@ type ReceiptRef = HasReceiptRef { ref: String } | NoReceiptRef

fn mode_rank(m: EnforcementMode) -> Int {
match m {
Advisory => 1
AuditOnly => 2
Blocking => 3
}
Expand Down
5 changes: 3 additions & 2 deletions src/v2/test/lens_enforcement/gate_test.dag
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ import v2.lens.common.construction_justification {
WallAfterGrounding
}
import std.disposition { SingleAuthority }
import v2.lens.enforcement.contract { EnrollmentDiscoveryReceipt, LensContract }
import v2.lens.enforcement.standing_intent { StandingIntent }
import v2.std.live_tree { LiveTreeDisposition }


data live_tree_disposition: LiveTreeDisposition = ReadsLiveTree
Expand Down Expand Up @@ -204,6 +207,4 @@ test fn consumer_requirement_discriminates() -> Bool {
test fn enforcement_mode_order_discriminates() -> Bool {
return !enforcement_mode_satisfies(actual: AuditOnly, required: v2.lens.enforcement.vocab.Blocking)
&& enforcement_mode_satisfies(actual: v2.lens.enforcement.vocab.Blocking, required: AuditOnly)
&& !enforcement_mode_satisfies(actual: Advisory, required: AuditOnly)
&& enforcement_mode_satisfies(actual: AuditOnly, required: Advisory)
}
48 changes: 24 additions & 24 deletions src/v2/workflow/floor_unimported_bare_provider_debt_roster.dag
Original file line number Diff line number Diff line change
Expand Up @@ -2097,37 +2097,37 @@ data unimported_bare_provider_dispositions: List<UnimportedBareProviderDispositi
UnimportedBareProviderDisposition { file: "src/v2/test/fixture/rung_3_4_common.dag", name: "eval_test_claim_subject", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/fixture/rung_3_4_common.dag", name: "run_test_claim", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/fixture/rung_3_4_common.dag", name: "run_test_claim_emit_vs_eval", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "AnyLiveConsumer", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "AuditOnly", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "EnrolledInFloorRoster", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ExternalRuntimeOnly", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "LensFamily", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "LensModuleFunctionObserved", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "MergeAdmission", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "NoConsumerWitness", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "NoReceiptRef", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "OneOf", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "Parallelism", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ReadsLiveTree", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "RedControlFailedToFlip", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "RedControlPassed", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ScopeCovers", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ScopeNarrowed", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ScopeRoster", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "SubjectRoster", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "WitnessOnly", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "AnyLiveConsumer", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "AuditOnly", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "EnrolledInFloorRoster", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ExternalRuntimeOnly", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "LensFamily", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "LensModuleFunctionObserved", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "MergeAdmission", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "NoConsumerWitness", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "NoReceiptRef", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "OneOf", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "Parallelism", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ReadsLiveTree", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "RedControlFailedToFlip", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "RedControlPassed", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ScopeCovers", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ScopeNarrowed", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "ScopeRoster", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "SubjectRoster", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "WitnessOnly", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "all_intents_admissible", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "blocking_consumers_enrolled", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "consumer_satisfies", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "consumer_satisfies", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "contract_internally_consistent", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "enforcement_mode_satisfies", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "enforcement_mode_satisfies", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "intent_family_holds", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "intent_family_verdict", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "leg_fails", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "leg_holds", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "lens_registry_v0_parallelism", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "qualified_name_from_dotted_string", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "standing_intent_registry", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "lens_registry_v0_parallelism", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "qualified_name_from_dotted_string", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_enforcement/gate_test.dag", name: "standing_intent_registry", standing: Retired { cause: ImportsFixed } },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_mock_totality/cron_mock_totality_test.dag", name: "PublishedMockCase", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_mock_totality/cron_mock_totality_test.dag", name: "SubstrateInputsOnly", standing: ActiveDebt },
UnimportedBareProviderDisposition { file: "src/v2/test/lens_mock_totality/diagnostic_mock_totality_test.dag", name: "SubstrateInputsOnly", standing: ActiveDebt },
Expand Down