Merge branch 'main' into main

Author: anvega

CODEOWNERS

@@ -41,7 +41,7 @@ There is a growing ecosystem of tools that promises to unlock developer producti
 ## Publications
 
 TAG Security has published several resources for the community, which can be
-found in the [publications](PUBLICATIONS.md) document.
+found under [publications](publications/README.md).
 
 ## Governance
 
@@ -122,34 +122,37 @@ seen [here](governance/related-groups/README.md)
 
 ### Security TAG Chairs
 
-- Pushkar Joglekar ([@PushkarJ](https://github.com/PushkarJ)), Independent [Chair term: 6/3/2023 - 6/3/2025]
-- Marina Moore ([@mnm678](https://github.com/mnm678)), NYU [Chair term: 10/3/2023 - 10/3/2025]
-- Eddie Knight ([@eddie-knight](https://github.com/eddie-knight)), Sonatype [Chair term: 5/6/2024 - 5/6/2026]
+| Name                  | Organization            | Term                | Handle    |
+|-----------------------|------------------------|---------------------|-----------|
+| Pushkar Joglekar      | Independent            | June, 2023 - June, 2025 | @PushkarJ |
+| Marina Moore          | Independent                  | October, 2023 - October, 2025 | @mnm678   |
+| Eddie Knight          | Sonatype               | May, 2024 - May, 2026 | @eddie-knight |
+
 
 ### Tech Leads
 
-- Justin Cappos ([@JustinCappos](https://github.com/JustinCappos)), New York
-  University
-- Ash Narkar ([@ashutosh-narkar](https://github.com/ashutosh-narkar)), Styra
-- Andres Vega ([@anvega](https://github.com/anvega))
-- Ragashree Shekar ([@ragashreeshekar](https://github.com/ragashreeshekar)), Independent
-- Michael Lieberman ([@mlieberman85](https://github.com/mlieberman85)), Kusari
+| Name                  | Organization            | Handle              |
+|-----------------------|------------------------|---------------------|
+| Justin Cappos         | New York University    | @JustinCappos       |
+| Ash Narkar            | Styra                  | @ashutosh-narkar    |
+| Andrés Vega           | M42                    | @anvega             |
+| Ragashree Shekar      | Independent            | @ragashreeshekar    |
+| Michael Lieberman     | Kusari                 | @mlieberman85       |
+| John Kjell    | TestifySec                 | @jkjell       |
+
 
 ### Security TAG Chair Emeriti
 
-- Dan Shaw ([@dshaw](https://github.com/dshaw)),
-  PayPal [Chair term: 6/3/2019 - 9/3/2020]
-- Sarah Allen ([@ultrasaurus](https://github.com/ultrasaurus)), [Chair term:
-  6/3/2019 - 6/3/2021]
-- Jeyappragash JJ ([@pragashj](https://github.com/pragashj)),
-  Tetrate.io [Chair term: 6/3/2019 - 6/3/2021]
-- Emily Fox ([@TheFoxAtWork](https://github.com/TheFoxAtWork)),
-  Apple [Chair term: 9/28/2020 - 2/4/2022]
-- Brandon Lum ([@lumjjb](https://github.com/lumjjb)), Google [Chair term:
-  6/3/2021 - 6/3/2023]
-- Aradhana Chetal ([@achetal01](https://github.com/achetal01)), TIAA [Chair term: 6/3/2021 - 9/3/2023]
-- Andrew Martin ([@sublimino](https://github.com/sublimino)),
-  ControlPlane [Chair term: 3/17/2022 - 3/17/2024]
+| Name                  | Organization            | Term                | Handle    |
+|-----------------------|------------------------|---------------------|-----------|
+| Dan Shaw              | PayPal                 | June, 2019 - September, 2020 | @dshaw    |
+| Sarah Allen           |                        | June, 2019 - June, 2021 | @ultrasaurus |
+| Jeyappragash JJ       | Tetrate.io             | June, 2019 - June, 2021 | @pragashj |
+| Emily Fox             | Apple                  | September, 2020 - February, 2022 | @TheFoxAtWork |
+| Brandon Lum           | Google                 | June, 2021 - June, 2023 | @lumjjb   |
+| Aradhana Chetal       | TIAA                   | June, 2021 - September, 2023 | @achetal01 |
+| Andrew Martin         | ControlPlane           | March, 2022 - March, 2024 | @sublimino|
+
 
 ### On-going projects
 

README.md

@@ -103,15 +103,9 @@ them
 
 - [Markdown](https://github.com/cncf/tag-security/tree/main/supply-chain-security/compromises)
 
-
-
 ## Use Cases & Personas
 
 List of use cases to enable secure access, policy control and safety for users
 of cloud native technology
 
 - [Markdown](https://github.com/cncf/tag-security/blob/main/usecase-personas/README.md)
-
-
-
-

PUBLICATIONS.md publications/README.md

@@ -5,7 +5,7 @@ deps:
 	rsync -avv ../ root/ \
 	--include='assessments' --include='assessments/**' \
 	--include='governance' --include='governance/**' \
-	--include='supply-chain-security' --include='supply-chain-security/**' \
+	--include='publications' --include='publications/**' \
 	--include='*.md' --exclude='*'
 
 	# Move over content such as graphics and logos
@@ -68,4 +68,10 @@ preview-build: deps
 		--buildDrafts \
 		--buildFuture \
 		--minify
-	npx -y pagefind --site public
+	npx -y pagefind --site public
+
+clean:
+	@git clean -f .
+	@rm -rf public resource
+	@find root/* -type f ! -name '*.gitkeep' -print0 | xargs -0 rm -v
+	@echo "Finished removing anything residual"

website/Makefile

@@ -1,11 +1,19 @@
 {{ $link := .Destination }}
 {{ $isRemote := strings.HasPrefix $link "http" }}
-{{- if not $isRemote -}}
-{{ $url := urls.Parse .Destination }}
-{{- if $url.Path -}}
-{{ $fragment := "" }}
-{{- with $url.Fragment }}{{ $fragment = printf "#%s" . }}{{ end -}}
-{{- with .Page.GetPage $url.Path }}{{ $link = printf "%s%s" .RelPermalink $fragment }}{{ end }}{{ end -}}
-{{- end -}}
-{{ $out := replace $link "README" "" }}
-<a href="{{ $out | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank"{{ end }}>{{ .Text | safeHTML }}</a>
+{{ if not $isRemote }}
+  {{ $url := urls.Parse .Destination }}
+  {{ $path := replace $url.Path "README" "" }}
+  {{ $path = replace $path ".md" "" }}
+  {{ $url = urls.Parse $path }}
+  {{ if $url.Path }}
+    {{ $fragment := "" }}
+    {{ with $url.Fragment }}
+      {{ $fragment = printf "#%s" . }}
+    {{ end }}
+    {{ $link = $url.Path }}
+    {{ with .Page.GetPage $url.Path }}
+      {{ $link = printf "%s%s" .RelPermalink $fragment }}
+    {{ end }}
+  {{ end }}
+{{ end }}
+<a href="{{ $link | safeURL }}"{{ with .Title }} title="{{ . }}"{{ end }}{{ if $isRemote }} target="_blank"{{ end }}>{{ .Text | safeHTML }}</a>

website/layouts/_default/_markup/render-link.html

@@ -1,4 +1,3 @@
 {{ $filepath := .Get 0 }}
-{{ $raw := readFile $filepath }}
-{{ $content := $raw | replaceRE `(\[.*?\]\(.*?)(\.md)(\))` "${1}${3}" }}
+{{ $content := readFile $filepath }}
 {{ $content | markdownify }}

website/layouts/shortcodes/include-markdown.html

@@ -1,3 +1,3 @@
-This directory is used at build time to store all of the top-level repo content for use in the website, pulled in by the `Makefile` command `deps`.
+This directory is used at build time to store all of the top-level repo content for use in the website, pulled in by the `Makefile` command `deps`, and emptied by `clean`
 
 Example Usage: `{{< include-markdown "root/README.md" >}}`