Skip to content

Commit 31ca2cf

Browse files
authored
Merge pull request #43240 from github/repo-sync
Repo sync
2 parents f6d05f9 + 189007e commit 31ca2cf

File tree

25 files changed

+484
-265
lines changed

25 files changed

+484
-265
lines changed

.github/instructions/all.instructions.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,3 @@ When you create a pull request:
2929
3. Label with "llm-generated".
3030
4. If an issue exists, include "fixes owner/repo#issue" or "towards owner/repo#issue" as appropriate.
3131
5. Always create PRs in **draft mode** using `--draft` flag.
32-
6. When you are using gh cli, always _escape backticks_.

.github/instructions/code.instructions.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ For code reviews, follow guidelines, tests, and validate instructions. For creat
99
## Guidelines
1010

1111
- If available, use ripgrep (`rg`) instead of `grep`.
12-
- When using gh cli, always _escape backticks_.
12+
- When using gh cli in double-quoted strings, escape backticks to prevent bash command substitution. In single-quoted strings, backticks do not need escaping.
1313
- All scripts should be listed in `package.json` and use `tsx`.
1414
- Whenever you create or comment on an issue or pull request, indicate you are GitHub Copilot.
1515
- Be careful fetching full HTML pages off the internet. Prefer to use MCP or gh cli whenever possible for github.com. Limit the number of tokens when grabbing HTML.
1616
- Avoid pull requests with over 300 lines of code changed. When significantly larger, offer to split up into smaller pull requests if possible.
1717
- All new code should be written in TypeScript and not JavaScript.
1818
- We use absolute imports, relative to the `src` directory, using the `@` symbol. For example, `getRedirect` which lives in `src/redirects/lib/get-redirect.ts` can be imported with `import getRedirect from '@/redirects/lib/get-redirect'`. The same rule applies for TypeScript (`.ts`) imports, e.g. `import type { GeneralSearchHit } from '@/search/types'`
1919
- For updates to the content linter, read important information in `src/content-linter/README.md`.
20+
- Do not commit to `main` branch.
21+
- Do not use git force push, and avoid git rebase.
2022

2123
## Tests
2224

.github/workflows/index-general-search.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ jobs:
285285
} >> "$GITHUB_OUTPUT"
286286
287287
- name: Send consolidated Slack notification
288-
if: ${{ steps.check-artifacts.outputs.has_artifacts == 'true' }}
288+
if: ${{ steps.check-artifacts.outputs.has_artifacts == 'true' && fromJSON(steps.aggregate.outputs.result).hasFailures }}
289289
uses: ./.github/actions/slack-alert
290290
with:
291291
slack_channel_id: ${{ secrets.DOCS_ALERTS_SLACK_CHANNEL_ID }}

content/code-security/how-tos/report-and-fix-vulnerabilities/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ topics:
1717
contentType: how-tos
1818
children:
1919
- configure-vulnerability-reporting
20-
- report-a-vulnerability
20+
- privately-reporting-a-security-vulnerability
2121
- fix-reported-vulnerabilities
2222
---
23+

content/code-security/how-tos/report-and-fix-vulnerabilities/report-a-vulnerability/privately-reporting-a-security-vulnerability.md renamed to content/code-security/how-tos/report-and-fix-vulnerabilities/privately-reporting-a-security-vulnerability.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ shortTitle: Report privately
1313
redirect_from:
1414
- /code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability
1515
- /code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/privately-reporting-a-security-vulnerability
16+
- /code-security/security-advisories/repository-security-advisories/evaluating-the-security-settings-of-a-repository
17+
- /code-security/security-advisories/working-with-repository-security-advisories/evaluating-the-security-settings-of-a-repository
18+
- /code-security/how-tos/report-and-fix-vulnerabilities/report-a-vulnerability/evaluating-the-security-settings-of-a-repository
19+
- /code-security/how-tos/report-and-fix-vulnerabilities/report-a-vulnerability
20+
- /code-security/how-tos/report-and-fix-vulnerabilities/report-a-vulnerability/privately-reporting-a-security-vulnerability
1621
---
1722

1823
{% data reusables.security-advisory.private-vulnerability-reporting-enable %}
@@ -21,7 +26,7 @@ redirect_from:
2126
> * If you have admin or security permissions for a public repository, you don’t need to submit a vulnerability report. Instead, create a draft security advisory directly. See [AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/creating-a-repository-security-advisory).
2227
> * Private vulnerability reporting is separate from a repository’s `SECURITY.md` file. You can only report vulnerabilities privately for repositories where this feature is enabled, and you don’t need to follow the instructions in `SECURITY.md`.
2328
24-
If a public repository has private vulnerability reporting enabled, anyone can submit a private vulnerability report to the repository maintainers. Users can also evaluate the general security of a public repository and suggest a security policy. See [AUTOTITLE](/code-security/security-advisories/working-with-repository-security-advisories/evaluating-the-security-settings-of-a-repository).
29+
If a public repository has private vulnerability reporting enabled, anyone can submit a private vulnerability report to the repository maintainers.
2530

2631
If the repository doesn't have private vulnerability reporting enabled, you need to initiate the reporting process by following the instructions in the security policy for the repository, or by creating an issue asking the maintainers for a preferred security contact. See [AUTOTITLE](/code-security/security-advisories/guidance-on-reporting-and-writing-information-about-vulnerabilities/about-coordinated-disclosure-of-security-vulnerabilities#about-reporting-and-disclosing-vulnerabilities-in-projects-on-github).
2732

content/code-security/how-tos/report-and-fix-vulnerabilities/report-a-vulnerability/evaluating-the-security-settings-of-a-repository.md

Lines changed: 0 additions & 54 deletions
This file was deleted.

content/code-security/how-tos/report-and-fix-vulnerabilities/report-a-vulnerability/index.md

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Testing query help files
33
shortTitle: Test query help files
4-
intro: You can use the {% data variables.product.prodname_codeql_cli %} to preview your query help files as Markdown and ensure they are valid.
4+
intro: Ensure your {% data variables.product.prodname_codeql %} query help files are valid by previewing them as Markdown.
55
product: '{% data reusables.gated-features.codeql %}'
66
versions:
77
fpt: '*'
@@ -18,53 +18,28 @@ redirect_from:
1818
contentType: how-tos
1919
---
2020

21-
## About testing query help files
22-
23-
Test query help files by rendering them as Markdown to ensure they are valid before uploading them to the {% data variables.product.prodname_codeql %} repository or using them in code scanning.
24-
25-
<!-- capitalized Markdown -->
26-
27-
Query help is documentation that accompanies a query to explain how the query works, as well as providing information about the potential problem that the query identifies. It is good practice to write query help for all new queries. For more information, see [Contributing to {% data variables.product.prodname_codeql %}](https://github.com/github/codeql/blob/main/CONTRIBUTING.md) in the {% data variables.product.prodname_codeql %} repository.
28-
29-
The {% data variables.product.prodname_codeql_cli %} includes a command to test query help and render the content as markdown, so that you can easily preview the content in your IDE. Use the command to validate query help files before uploading them to the {% data variables.product.prodname_codeql %} repository or sharing them with other users. From {% data variables.product.prodname_codeql_cli %} 2.7.1 onwards, you can also include the markdown-rendered query help in SARIF files
30-
generated during {% data variables.product.prodname_codeql %} analyses so that the query help can be displayed in the code scanning UI. For more information, see [AUTOTITLE](/code-security/codeql-cli/getting-started-with-the-codeql-cli/analyzing-your-code-with-codeql-queries).
31-
3221
## Prerequisites
3322

34-
* The query help (`.qhelp`) file must have an accompanying query (`.ql`) file with an identical base name.
35-
* The query help file should follow the standard structure and style for query help documentation. For more information, see the [Query help style guide](https://github.com/github/codeql/blob/main/docs/query-help-style-guide.md) in the {% data variables.product.prodname_codeql %} repository.
36-
37-
## Running `codeql generate query-help`
38-
39-
You can test query help files by running the following command:
40-
41-
```shell
42-
codeql generate query-help <qhelp|query|dir|suite> --format=<format> [--output=<dir|file>]
43-
```
44-
45-
For this command `<qhelp|query|dir|suite>` must be the path to a `.qhelp` file, the path to a `.ql` file, the path to a directory containing queries and query help files, or the path to a query suite.
46-
47-
You must specify a `--format` option, which defines how the query help is rendered. Currently, you must specify `markdown` to render the query help as markdown.
48-
49-
The `--output` option defines a file path where the rendered query help will be saved.
50-
51-
* For directories containing `.qhelp` files or a query suites defining one or more `.qhelp` files, you must specify an `--output` directory. Filenames within the output directory will be derived from the `.qhelp` file names.
52-
* For single `.qhelp` or `.ql` files, you may specify an `--output` option. If you don’t specify an output path, the rendered query help is written to `stdout`.
53-
54-
For full details of all the options you can use when testing query help files, see [AUTOTITLE](/code-security/codeql-cli/codeql-cli-manual/generate-query-help).
23+
* The query help (`.qhelp`) files must have accompanying query (`.ql`) files with identical base names.
24+
* The query help files should follow the standard structure and style for query help documentation. For more information, see the [Query help style guide](https://github.com/github/codeql/blob/main/docs/query-help-style-guide.md) in the {% data variables.product.prodname_codeql %} repository.
5525

56-
## Results
26+
## Previewing your query help files
5727

58-
When you run the command, {% data variables.product.prodname_codeql %} attempts to render each `.qhelp` file that has an accompanying `.ql` file. For single files, the rendered content will be printed to `stdout` if you don’t specify an `--output` option. For all other use cases, the rendered content is saved to the specified output path.
28+
1. To render your query help files as Markdown, run the following command:
5929

60-
By default, the {% data variables.product.prodname_codeql_cli %} will print a warning message if:
30+
```shell copy
31+
codeql generate query-help <qhelp|query|dir|suite> --format=markdown [--output=<dir|file>]
32+
```
6133

62-
* Any of the query help is invalid, along with a description of the invalid query help elements
63-
* Any `.qhelp` files specified in the command don’t have the same base name as an accompanying `.ql` file
64-
* Any `.ql` files specified in the command don’t have the same base name as an accompanying `.qhelp` file
34+
For information on the options available for this command, see [AUTOTITLE](/code-security/reference/code-scanning/codeql/codeql-cli-manual/generate-query-help).
6535

66-
You can tell the {% data variables.product.prodname_codeql_cli %} how to handle these warnings by including a `--warnings` option in your command. For more information, see [AUTOTITLE](/code-security/codeql-cli/codeql-cli-manual/generate-query-help#--warningsmode).
36+
1. If you receive any warning messages, review and fix them, then rerun the command. By default, the {% data variables.product.prodname_codeql_cli %} will print a warning message if:
37+
* Any of the query help is invalid
38+
* Any `.qhelp` files specified in the command don’t have the same base name as an accompanying `.ql` file
39+
* Any `.ql` files specified in the command don’t have the same base name as an accompanying `.qhelp` file
40+
1. Review the rendered Markdown in your output directory, file, or terminal to check that your files appear as expected.
6741

6842
## Further reading
6943

7044
* [Query help files](https://codeql.github.com/docs/writing-codeql-queries/query-help-files/#query-help-files)
45+
* [AUTOTITLE](/code-security/codeql-cli/codeql-cli-manual/generate-query-help)

content/code-security/how-tos/secure-at-scale/configure-organization-security/configure-specific-tools/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ children:
1010
- /assess-your-secret-risk
1111
- /viewing-the-secret-risk-assessment-report-for-your-organization
1212
- /estimating-the-price-of-secret-protection
13-
- /calculating-the-cost-savings-of-push-protection
1413
- /protect-your-secrets
1514
- /configuring-default-setup-for-code-scanning-at-scale
1615
- /configuring-advanced-setup-for-code-scanning-with-codeql-at-scale
1716
- /enforcing-dependency-review-across-an-organization
1817
---
18+

content/code-security/how-tos/secure-at-scale/configure-organization-security/establish-complete-coverage/applying-a-custom-security-configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ After you create a {% data variables.product.prodname_custom_security_configurat
3838
3939
## Next steps
4040

41-
To learn how to interpret security findings from your {% data variables.product.prodname_custom_security_configuration %} on a repository, see [AUTOTITLE](/code-security/securing-your-organization/managing-the-security-of-your-organization/interpreting-security-findings).
41+
To learn how to monitor security alerts in your organization, see [AUTOTITLE](/code-security/how-tos/view-and-interpret-data/analyze-organization-data/find-insecure-repositories).
4242

4343
{% data reusables.security-configurations.edit-configuration-next-step %}
4444

0 commit comments

Comments
 (0)