Skip to content

Commit 3341fbb

Browse files
Sync from github/github-well-architected-internal (main)
Source Repository: github/github-well-architected-internal Source Branch: main Source SHA: 19df7eb80cb63be9f9f42048ccf315e876108117
1 parent 3befb51 commit 3341fbb

159 files changed

Lines changed: 2777 additions & 1132 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CONTRIBUTING.md

Lines changed: 33 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ Thank you for contributing! We look forward to working with you. ❤️
4848
- :octocat: See [GitHub Well-Architected Framework overview] to understand the program and purpose.
4949
- 🗳️ We use [GitHub Flow] to manage changes. It is the most effective way to collaborate with all stakeholders on this project.
5050
- 🐙 [Issues] are used to **track work**, such as bug reports and feature requests. They are also used to keep track of ideas that may not yet be ready to work on.
51+
- :writing_hand: [Frontmatter and metadata](docs/contributing-learn.md) make content discoverable and publishable.
5152
- 🚢 [Pull requests] are the best way to collaborate on reviews.
5253

5354
---
@@ -131,39 +132,25 @@ Once you're ready to start, fork the repository and begin authoring. We **strong
131132

132133
#### Create your article
133134

134-
There are three options to create a new article:
135-
136-
##### Option 1. Use the command `hugo new content` to create a new file (recommended in Codespaces)
137-
138-
```shell
139-
# For recommendations:
140-
hugo new content library/{PILLAR}/recommendations/{ARTICLE-NAME}.md
141-
# For scenarios:
142-
hugo new content library/scenarios/{ARTICLE-NAME}.md
143-
```
144-
145-
For example,
146-
147-
```shell
148-
hugo new content library/productivity/recommendations/my-article.md
149-
```
135+
There are two options for creating a new article.
150136

151137
> [!IMPORTANT]
152-
> When you use this method, you do not need to put `content/` in the command since Hugo considers it the root.
138+
> Hugo-based authoring workflows are deprecated in this repository. Rely on standard Markdown file creation and editing for article authoring. Hugo remains part of local preview/build behind the repository scripts.
153139
154-
##### Option 2. Use a page bundle to create a new article with associated files like images
140+
##### Option 1. Use the template helper command (recommended)
155141

156-
Add a folder (instead of one markdown file) at that location and bundle the files together. The format is:
142+
Run:
157143

158-
```plaintext
159-
content/library/{PILLAR}/recommendations/{ARTICLE-NAME}/index.md
160-
content/library/{PILLAR}/recommendations/{ARTICLE-NAME}/image1.png
161-
content/library/{PILLAR}/recommendations/{ARTICLE-NAME}/image2.png
144+
```shell
145+
# For recommendations:
146+
tools/new-content recommendation {PILLAR} {ARTICLE-NAME}
147+
# For scenarios:
148+
tools/new-content scenario {ARTICLE-NAME}
162149
```
163150

164-
##### Option 3. Copy/paste the template into a new file
151+
Replace `{PILLAR}` and `{ARTICLE-NAME}` with real values.
165152

166-
Simply copy [`archetypes/default.md`] and paste it into:
153+
This command copies [`archetypes/default.md`] into the correct destination.
167154

168155
For **recommendation** articles:
169156

@@ -177,42 +164,30 @@ For **scenario** articles:
177164
content/library/scenarios/{ARTICLE-NAME}.md
178165
```
179166

180-
##### Writing Style:
167+
##### Option 2. Use a page bundle to create a new article with associated files like images
181168

182-
- Always use sentence case
183-
- Keep your files tidy - no rogue spaces or characters, please
184-
- Use dashes for unordered lists (not `*`)
185-
- Use single spaces before and after headings, lists, and paragraphs
169+
Add a folder (instead of one markdown file) at that location and bundle the files together. The format is:
186170

187-
#### Edit front-matter
171+
```plaintext
172+
content/library/{PILLAR}/recommendations/{ARTICLE-NAME}/index.md
173+
content/library/{PILLAR}/recommendations/{ARTICLE-NAME}/page1.md
174+
content/library/{PILLAR}/recommendations/{ARTICLE-NAME}/assets/image1.png
175+
content/library/{PILLAR}/recommendations/{ARTICLE-NAME}/assets/image2.png
176+
```
188177

189-
Each article (written in markdown) should have front-matter at the top of the file. This front-matter should look like this:
178+
> [!WARNING]
179+
> Do not use `hugo new content` for new article creation in this repository.
190180
191-
```yaml
192-
---
193-
draft: true # Set to false when ready to publish
194-
title: 'Insert title here'
195-
publishDate: 2024-12-05 # Date the article is published
196-
197-
# Add author details
198-
params:
199-
authors:
200-
[
201-
{ name: 'Mona', handle: 'octocat' },
202-
]
203-
204-
# Classifications of the framework to drive key concepts, design principles, and architectural best practices
205-
pillars:
206-
- placeholder
207-
- placeholder
208-
---
209-
```
181+
#### Writing style
210182

211-
- When you are done with your article, set `draft: false` when you are ready to publish.
183+
- Always use sentence case
184+
- Keep your files tidy - no rogue spaces or characters, please
185+
- Use dashes for unordered lists (not `*`)
186+
- Use single spaces before and after headings, lists, and paragraphs
212187

213-
- Set `publishDate` to the date the article is first merged to `main`. Do not change it on future revisions.
188+
#### Required frontmatter and metadata
214189

215-
- All recommended values for all of these fields are described in [Taxonomies]. **Insert all that apply to your article. This is how your article will be discoverable!**
190+
Articles must include the required frontmatter fields described in [docs/contributing-learn.md](docs/contributing-learn.md). This is critical for the content to be processed and published correctly.
216191

217192
---
218193

@@ -356,10 +331,10 @@ There are several primary types of contributions to this project:
356331

357332
### 📝 Content Library Article Submission(s)
358333

359-
Contributions will typically author content articles under `/content/` folder. To start writing, we recommend reviewing these essential framework resources:
334+
Contributions typically involve authoring content articles under the `/content/` folder. To start writing, we recommend reviewing these essential framework resources:
360335

361336
- [Framework Overview] - Learn about the WAF mission, vision, objectives, and five pillars
362-
- [Taxonomies](/docs/taxonomies.md) - Explore the design principles, areas, and other classifications
337+
- [Taxonomies] - Explore the design principles, areas, and other classifications
363338

364339
**Inspiration for Content Library articles** comes from **Azure Architecture Center**. See the following example articles for your inspiration: 💡
365340

@@ -426,7 +401,7 @@ See [Framework Overview] for details on each pillar.
426401
- Avoid unnecessary jargon
427402
- Include practical examples
428403
- Prefer GitHub Docs links to **Enterprise Cloud**: `https://docs.github.com/enterprise-cloud@latest` (unless the guidance is specific to GitHub Enterprise Server)
429-
- Use Hugo shortcodes to keep articles consistent (see `archetypes/default.md`):
404+
- Use repository shortcodes to keep articles consistent (see [`archetypes/default.md`]):
430405
- Further assistance: `{{% seeking-further-assistance-details %}}`
431406
- Related links: `{{% related-links-github-docs %}}`
432407

@@ -488,7 +463,7 @@ Here are the checklists for code reviewers.
488463

489464
## Code of conduct
490465

491-
By participating, you are expected to the GitHub Community [Code of Conduct].
466+
By participating, you are expected to follow the GitHub Community [Code of Conduct].
492467

493468
---
494469

archetypes/default.md

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,67 @@
11
---
22
draft: false # Set to true to keep the page hidden
33
title: 'Insert title here'
4-
publishDate: YYYY-MM-DD
5-
params:
4+
publishDate: 2006-01-02 # Example format placeholder; replace before merge
65

7-
# Add and remove authors as needed. Please reserve authorship for significant contributions, not edits and feedback.
6+
# Optional navigation metadata
7+
# weight: 1
8+
# prev: library/{PILLAR}/previous-page
9+
# next: library/{PILLAR}/next-page
810

9-
authors: [
10-
{name: "INSERT_NAME_1", handle: "INSERT_HANDLE_1"},
11-
{name: "INSERT_NAME_2", handle: "INSERT_HANDLE_2"},
12-
]
11+
params:
12+
authors:
13+
- name: "INSERT_NAME_1"
14+
handle: "INSERT_HANDLE_1"
15+
- name: "INSERT_NAME_2"
16+
handle: "INSERT_HANDLE_2"
1317

1418
# Classifications of the framework to drive key concepts, design principles, and architectural best practices
1519

1620
pillars:
17-
18-
- placeholder
19-
- placeholder
21+
- placeholder
22+
- placeholder
2023

2124
# The areas of the GitHub adoption journey. Inspiration taken from docs.github.com
2225

2326
areas:
24-
25-
- placeholder
26-
- placeholder
27+
- placeholder
28+
- placeholder
2729

2830
# Classifications of industries who may be at different stages of the customer journey.
2931

3032
verticals:
31-
32-
- placeholder
33-
- placeholder
33+
- placeholder
34+
- placeholder
3435

3536
# Individuals in key roles on the customer journey, typically consisting of one or more administrators and the end-user community.
3637

3738
personas:
38-
39-
- placeholder
40-
- placeholder
39+
- placeholder
40+
- placeholder
4141

4242
# Deployment options for GitHub Enterprise, including Cloud (GHEC), Server (GHES), and Hybrid.
4343

4444
platform:
45-
46-
- placeholder
47-
- placeholder
45+
- placeholder
46+
- placeholder
4847

4948
# GitHub product functions designed to support every stage of development.
5049

5150
features:
52-
53-
- placeholder
54-
- placeholder
51+
- placeholder
52+
- placeholder
5553

5654
# Deeper-level topics of the GitHub Platform and its features. They are most often interacted with by end-users.
5755

5856
components:
59-
60-
- placeholder
61-
- placeholder
57+
- placeholder
58+
- placeholder
6259

6360
# Associated teams and other GitHub and Partner resources that can provide additional support.
6461

6562
github:
66-
67-
- placeholder
68-
- placeholder
69-
63+
- placeholder
64+
- placeholder
7065
---
7166

7267
<!-- This disables the linting rule for multiple top-level headers -->

config/_default/hugo.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,27 @@ languageCode: en-us
44
title: GitHub Well-Architected
55
enableInlineShortcodes: true # https://imfing.github.io/hextra/docs/guide/shortcodes/icon
66
enableGitInfo: true
7+
contentDir: content-processed
78

89
# import hextra as module
910
module:
1011
imports:
1112
- path: github.com/imfing/hextra
1213
version: v0.8.6
13-
14+
1415

1516
build:
1617
# cache busting for css changes
1718
cachebusters:
1819
- source: layouts/.*
1920
target: css
2021

22+
# Cascade type: docs to all library pages so Hugo uses the docs layout (sidebar enabled)
23+
cascade:
24+
- _target:
25+
path: /library/**
26+
type: docs
27+
2128
markup:
2229
# allow raw html
2330
goldmark:
@@ -90,7 +97,7 @@ params:
9097
displayAuthorInfo: true
9198

9299
frontmatter:
93-
publishDate:
100+
publishDate:
94101
- publishDate
95102
- :filename
96103
- date
@@ -100,7 +107,7 @@ frontmatter:
100107
navbar:
101108
displayTitle: true
102109
displayLogo: true
103-
logo:
110+
logo:
104111
path: media/github-mark.svg
105112
dark: media/github-mark-white.svg
106113
link: /

content/_index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
# SPDX-FileCopyrightText: GitHub and The Project Authors
33
# SPDX-License-Identifier: MIT
4+
title: GitHub Well-Architected Framework
45
description: The GitHub Well-Architected Framework is an open source-style, community-driven framework to curate the best way to deploy the GitHub platform.
56
params:
67
logosBlock: false

content/index.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
# SPDX-FileCopyrightText: GitHub and The Project Authors
3+
# SPDX-License-Identifier: MIT
4+
title: GitHub Well-Architected Framework
5+
description: The GitHub Well-Architected Framework is an open source-style, community-driven framework to curate the best way to deploy the GitHub platform.

content/library/_index.md

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
---
22
# SPDX-FileCopyrightText: GitHub and The Project Authors
33
# SPDX-License-Identifier: MIT
4-
title: 🔒 Application Security
4+
title: Overview
5+
linkTitle: Application Security
56
weight: 5
6-
slug: application-security
77
---
8-
9-
The **Application Security** pillar is about ensuring the security of your applications. It could include principles related to using GitHub's security features like Dependabot, security advisories, and code scanning.
10-
11-
{{< cards >}}
12-
{{< card link="quick-links" title="Quick Links" icon="sparkles" >}}
13-
{{< card link="design-principles" title="Design Principles" icon="book-open" >}}
14-
{{< card link="checklist" title="Assessment Checklist" icon="book-open" >}}
15-
{{< card link="recommendations" title="Recommendations" icon="book-open" >}}
16-
{{< /cards >}}

content/library/application-security/checklist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-FileCopyrightText: GitHub and The Project Authors
33
# SPDX-License-Identifier: MIT
44
title: Checklist for Application Security
5-
weight: 3
5+
weight: 4
66
prev: library/application-security/design-principles
77
next: library/application-security/recommendations
88
---

content/library/application-security/design-principles.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# SPDX-FileCopyrightText: GitHub and The Project Authors
33
# SPDX-License-Identifier: MIT
44
title: Design Principles
5-
weight: 2
5+
weight: 3
66
prev: library/application-security/quick-links
77
next: library/application-security/checklist
88
---
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
title: Application Security
2+
description: Proactive guidelines for embedding security into every stage of development, from code scanning to compliance.
3+
weight: 5
4+
slug: application-security
5+
icon: ShieldLockIcon

0 commit comments

Comments
 (0)