hecks 3.12.0 → 3.14.0

data/lib/hecks/site/bluebook/site.bluebook

@@ -12,7 +12,9 @@
 # The same command projects the CDN: a project that adds Edge, EdgePolicy, EdgeOrigin and EdgeRule rows
 # to its chapter has the CloudFront behaviours and the listener rules written into the marked regions
 # of the template it owns (the `:site_cdn` projection). Those rows are the template's facts, so only the
-# closed sets they draw on, cache class and origin, are named here.
+# closed sets they draw on, cache class, origin and the kind of an EdgeFunction row, are named here. A
+# route's `edge:` names an EdgeFunction row, a viewer-request function the projection writes into the
+# template's `edge_functions` region and attaches to that route's behaviour.
 #
 # Each run records that it was requested before the SiteToolchain port is asked, and what came of
 # it after. No command declares a role: the chapter boots standing alone.
@@ -33,6 +35,7 @@ Hecks.bluebook "Site" do
     attribute :source, Source,  optional: true
     attribute :http_method, HttpMethod, optional: true
     attribute :preview, Preview, optional: true
+    attribute :edge, EdgeName, optional: true
 
     # `/blog/:slug.html` names a parameter; a trailing `/*` matches everything beneath a prefix. A
     # row with a `command:` or `query:` source may leave its path out, and the projection derives it
@@ -78,6 +81,18 @@ Hecks.bluebook "Site" do
       attribute :value, String, one_of: ["public", "draft"]
     end
 
+    # The logical id of an `EdgeFunction` row: the viewer-request function the route's behaviour runs.
+    value_object "EdgeName" do
+      attribute :value, String, pattern: '\A[A-Za-z][A-Za-z0-9]*\z'
+    end
+
+    # What an `EdgeFunction` row asks the projection to write: `redirect_host` answers a request for
+    # a watched path on an alias host with a redirect to the canonical host and leaves every other
+    # request alone.
+    value_object "EdgeFunctionKind" do
+      attribute :value, String, one_of: ["redirect_host"]
+    end
+
     # The HTTP verbs a route answers.
     value_object "HttpMethod" do
       attribute :value, String, one_of: ["GET", "POST", "PUT", "PATCH", "DELETE"]
@@ -114,14 +129,14 @@ Hecks.bluebook "Site" do
     identified_by :run
 
     value_object "RunKey" do
-      attribute :value, String, pattern: '[^ \t\n\r]'
+      attribute :value, String, matches: :present
 
       invariant("a run is named") { !value.to_s.empty? }
     end
 
     # A project directory, whose `bluebook/` holds the chapter that declares the route table.
     value_object "DomainPath" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
 
       invariant("a project is named by its path") { !value.to_s.empty? }
     end
@@ -129,7 +144,7 @@ Hecks.bluebook "Site" do
     # A directory or file anywhere on disk, relative to where the command runs: where routes.ts is
     # written when not in the project's generated/ directory, or the template to rewrite in place.
     value_object "Location" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     # The file extension of the generated module: `ts` (routes.ts), or `mts` (routes.mts), which
@@ -149,12 +164,12 @@ Hecks.bluebook "Site" do
 
     # Path patterns, comma separated: the behaviours a change is about to add to the live distribution.
     value_object "PathList" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     # Policy references and the ids they stand for live, as `!Ref Name=id`, comma separated.
     value_object "PolicyRefs" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     # A running site's address, `https://example.org`: what `check_site` sends its requests to.

data/lib/hecks/sme/bluebook/sme.bluebook

@@ -30,37 +30,37 @@ Hecks.bluebook "SME" do
     attribute :accepted_actions, Tally
 
     value_object "Reference" do
-      attribute :value, String, pattern: '[^ \t\n\r]'
+      attribute :value, String, matches: :present
     end
 
     # The domain being discovered, spelled as its bluebook will spell it. Many interviews, with
     # different experts on different days, name the same subject; the domain is not modelled here.
     value_object "Subject" do
-      attribute :value, String, pattern: '[^ \t\n\r]'
+      attribute :value, String, matches: :present
     end
 
     # Who is being interviewed.
     value_object "Expert" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     value_object "Question" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     # The expert's answer in their own words.
     value_object "Answer" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     # A label for grouping exchanges ("lending rules"); optional on every exchange.
     value_object "Topic" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     value_object "Exchange" do
-      attribute :question, String, pattern: '[^\t\n\r]'
-      attribute :answer,   String, pattern: '[^\t\n\r]'
+      attribute :question, String, matches: :not_empty
+      attribute :answer,   String, matches: :not_empty
       attribute :topic,    String, optional: true
     end
 
@@ -76,7 +76,7 @@ Hecks.bluebook "SME" do
     end
 
     value_object "Name" do
-      attribute :value, String, pattern: '[^ \t\n\r]'
+      attribute :value, String, matches: :present
     end
 
     # How many findings of a kind were accepted.
@@ -86,7 +86,7 @@ Hecks.bluebook "SME" do
     end
 
     value_object "Statement" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     # Whether an action brings its thing into being, as opposed to happening to one that exists.
@@ -97,12 +97,12 @@ Hecks.bluebook "SME" do
     # A list the expert gave in a breath, comma separated: the values a field may take, or the
     # fields an action needs to be told. Absent when the expert gave none.
     value_object "Listing" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     # Who may do an action, in the expert's words ("a maintainer", "QA engineer").
     value_object "Actor" do
-      attribute :value, String, pattern: '[^\t\n\r]'
+      attribute :value, String, matches: :not_empty
     end
 
     # A thing the domain keeps track of, and the field that identifies one: an aggregate to be.

data/lib/hecks/tickets/bluebook/tickets.bluebook

@@ -32,7 +32,7 @@ Hecks.bluebook "Tickets" do
     identified_by :finding
 
     value_object "FindingKey" do
-      attribute :value, String, pattern: '[^ \t\n\r]'
+      attribute :value, String, matches: :present
 
       invariant("a finding is named") { !value.to_s.empty? }
     end
@@ -65,7 +65,7 @@ Hecks.bluebook "Tickets" do
     # The same finding refiled by the QA loop carries the same fingerprint, so a report of it while an
     # open finding holds it changes nothing.
     value_object "Fingerprint" do
-      attribute :value, String, pattern: '[^ \t\n\r]'
+      attribute :value, String, matches: :present
     end
 
     value_object "Number" do
@@ -239,7 +239,7 @@ Hecks.bluebook "Tickets" do
     end
 
     value_object "FindingKey" do
-      attribute :value, String, pattern: '[^ \t\n\r]'
+      attribute :value, String, matches: :present
     end
 
     lifecycle :status, default: "draft" do

data/lib/hecks/tools/oidc_manifests.rb

@@ -6,7 +6,8 @@ require_relative "../tools"
 module Hecks
   module Tools
     # Projects each domain's OIDC client and scope manifest (`Hecks::Projections::OIDC`) into an
-    # `oidc.json` beside the domain.
+    # `oidc.json` beside the domain, or into one `<chapter>.oidc.json` for each chapter of a
+    # directory that holds several.
     #
     # A domain that has no bluebook is skipped and one that cannot be projected is reported, so a
     # sweep over the whole checkout carries on past either. `hecks deploy
@@ -45,20 +46,57 @@ module Hecks
            .uniq.sort
       end
 
+      # Projects one manifest for each chapter the directory holds.
+      #
       # @param root [String] the checkout
       # @param path [String] a domain directory, relative to `root`
       # @return [void]
       def project(root, path)
-        runtime = Hecks.boot(File.join(root, path), install_driving: false)
-        name    = runtime.registry.bluebooks.keys.first
-        return warn("  #{path}: no bluebook found — skipped") unless name
+        registry = Hecks.boot(File.join(root, path), install_driving: false).registry
+        return warn("  #{path}: no bluebook found — skipped") if registry.bluebooks.empty?
 
-        write_manifest(runtime.registry, name, File.join(root, path, "oidc.json"))
-        puts "  #{path}/oidc.json  <-  #{name}"
+        project_chapters(registry, root, path)
       rescue StandardError => e
         warn "  #{path}: cannot project — #{e.message.lines.first.strip}"
       end
 
+      # The chapters a directory declares: those with a `.bluebook` file under it. A chapter it
+      # only attaches (Governance, for one) is loaded from elsewhere and has its own directory's
+      # manifest.
+      #
+      # @param registry [Hecks::Runtime::Registry] the booted registry of the directory
+      # @param directory [String] the directory that was booted
+      # @return [Array<String>] the chapter names, in load order; the first loaded when none has a
+      #   recorded source
+      def chapters_of(registry, directory)
+        under = "#{File.expand_path(directory)}/"
+        own = registry.bluebooks.keys.select do |name|
+          Array(registry.bluebook_sources[name]).any? { |source| File.expand_path(source).start_with?(under) }
+        end
+        own.empty? ? registry.bluebooks.keys.first(1) : own
+      end
+
+      # @param registry [Hecks::Runtime::Registry] the booted registry of the directory
+      # @param root [String] the checkout
+      # @param path [String] the domain directory, relative to `root`
+      # @return [void]
+      def project_chapters(registry, root, path)
+        names = chapters_of(registry, File.join(root, path))
+        names.each do |name|
+          file = file_for(names, name)
+          write_manifest(registry, name, File.join(root, path, file))
+          puts "  #{path}/#{file}  <-  #{name}"
+        end
+      end
+
+      # A domain of one chapter keeps `oidc.json`; a directory of several chapters, such as the
+      # framework members, gets one manifest each, so none of them stands for the others.
+      #
+      # @param names [Array<String>] every chapter the directory holds
+      # @param name [String] the chapter the manifest is for
+      # @return [String] the manifest's file name: `oidc.json`, or `<chapter>.oidc.json`
+      def file_for(names, name) = names.one? ? "oidc.json" : "#{Naming.snake(name)}.oidc.json"
+
       # @param registry [Hecks::Runtime::Registry] the booted registry
       # @param name [String] the bluebook to project
       # @param out [String] where the manifest goes

data/lib/hecks/tools/site_routes/templates.rb

@@ -27,22 +27,19 @@ module Hecks
           regions = Projector.call(:site_cdn, bluebook: site.chapter, options: { table: site.table, edge: edge })
           relative = template || edge.setting.template
           source = template_source(root, template, relative)
-          text = rewritten(File.read(source), regions, relative, edge)
+          text = rewritten(File.read(source), regions, relative)
           { destination(source, out, template, relative) => text }
         end
 
         # @param text [String] the template
         # @param regions [Hash{String => String}] each region's name to the block that goes in it
         # @param relative [String] the template's name, for a message
-        # @param edge [Projections::Site::Edge] the checked edge
         # @return [String] the template with each region rewritten
-        # @raise [SystemExit] when a region is missing, or a listener_rules region is left behind
-        #   by an edge with no load balancer
-        def rewritten(text, regions, relative, edge)
-          if !edge.alb? && Projections::Site::Regions.region?(text, "listener_rules")
-            abort "project_site: #{relative} has a BEGIN/END GENERATED site_cdn listener_rules region, " \
-                  "and the Edge row says alb: false; remove the region"
-          end
+        # @raise [SystemExit] when a region is missing, or a listener_rules or edge_functions region
+        #   is left behind by an edge that has no load balancer or no EdgeFunction row
+        def rewritten(text, regions, relative)
+          refuse_leftover(text, regions, relative, "listener_rules", "the Edge row says alb: false")
+          refuse_leftover(text, regions, relative, "edge_functions", "the project declares no EdgeFunction rows")
           regions.reduce(text) do |current, (name, block)|
             unless Projections::Site::Regions.region?(current, name)
               abort "project_site: #{relative} has no BEGIN/END GENERATED site_cdn #{name} region"
@@ -52,6 +49,13 @@ module Hecks
           end
         end
 
+        # Refuses a region the edge does not use, so the stale text in it is removed by hand.
+        def refuse_leftover(text, regions, relative, name, reason)
+          return if regions.key?(name) || !Projections::Site::Regions.region?(text, name)
+
+          abort "project_site: #{relative} has a BEGIN/END GENERATED site_cdn #{name} region, and #{reason}; remove the region"
+        end
+
         # @return [Hash] nothing, after refusing a template named for a project with no edge
         def missing_edge(template)
           abort "project_site: --template names #{template}, but the project declares no Edge rows" if template

data/lib/hecks/version.rb

@@ -1,5 +1,5 @@
 module Hecks
   # Read directly by the gemspec, so this file must never require the
   # rest of the gem (its dependencies aren't resolved yet at that point).
-  VERSION = "3.12.0".freeze
+  VERSION = "3.14.0".freeze # rust/host/HECKS_RELEASE names the same release
 end