Skip to content

Commit be65da5

Browse files
Merge pull request #539 from hashicorp/repo-sync
Repo sync
2 parents 5c3c56f + 9e32f03 commit be65da5

File tree

25 files changed

+650
-106
lines changed

25 files changed

+650
-106
lines changed

.github/actions/reload-dev-portal/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ inputs:
2020
description: 'Revalidate token'
2121
required: true
2222
type: string
23+
bot-bypass-token:
24+
description: 'Bot bypass token'
25+
required: true
26+
type: string
2327

2428
runs:
2529
using: "composite"
@@ -73,8 +77,10 @@ runs:
7377
env:
7478
url: 'https://developer.hashicorp.com/api/revalidate/paths'
7579
auth: 'Authorization: Bearer ${{ inputs.revalidate-token }}'
80+
bot-bypass: '${{ inputs.bot-bypass-token }}'
7681
run: |
7782
curl -X POST "${{ env.url }}" \
7883
-H "${{ env.auth }}" \
7984
-H "Content-Type: application/json" \
85+
-H "X-BOT-BYPASS: ${{ env.bot-bypass }}" \
8086
-d '{"paths": ${{ steps.map-files.outputs.FILES_URLS }} }'

.github/labeler.yml

Lines changed: 107 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,77 @@
11
# Copyright (c) HashiCorp, Inc.
22
# SPDX-License-Identifier: BUSL-1.1
33

4+
# Add 'Boundary' label to changes under 'content/boundary'
5+
#
6+
# Label | Rule
7+
# --------------- | ------------------------------------------------------------
8+
# Boundary | Default; applies to all doc updates
9+
# Boundary | Updates on HCP Boundary in hcp-docs directory
10+
11+
Boundary:
12+
- any:
13+
- changed-files:
14+
- any-glob-to-any-file: [
15+
'content/boundary/**',
16+
'content/hcp-docs/content/docs/boundary/**'
17+
]
18+
19+
# Add 'Consul' label to changes under 'content/consul'
20+
#
21+
# Label | Rule
22+
# --------------- | ------------------------------------------------------------
23+
# Consul | Default; applies to all doc updates
24+
# Consul | Updates on HCP Consul in hcp-docs directory
25+
26+
Consul:
27+
- any:
28+
- changed-files:
29+
- any-glob-to-any-file: [
30+
'content/consul/**',
31+
'content/hcp-docs/content/docs/consul/**'
32+
]
33+
34+
# Add 'HCP' label to changes under 'content/hcp-docs'
35+
#
36+
# Label | Rule
37+
# --------------- | ------------------------------------------------------------
38+
# HCP | Default; applies to all doc updates
39+
40+
HCP:
41+
- any:
42+
- changed-files:
43+
- any-glob-to-any-file: [
44+
'content/hcp-docs/**'
45+
]
46+
47+
# Add 'Packer' label to changes under 'content/packer'
48+
#
49+
# Label | Rule
50+
# --------------- | ------------------------------------------------------------
51+
# Packer | Default; applies to all doc updates
52+
# Packer | Updates on HCP Packer in hcp-docs directory
53+
54+
Packer:
55+
- any:
56+
- changed-files:
57+
- any-glob-to-any-file: [
58+
'content/packer/**',
59+
'content/hcp-docs/content/docs/packer/**'
60+
]
61+
62+
# Add 'Sentinel' label to changes under 'content/sentinel'
63+
#
64+
# Label | Rule
65+
# --------------- | ------------------------------------------------------------
66+
# Sentinel | Default; applies to all doc updates
67+
68+
Sentinel:
69+
- any:
70+
- changed-files:
71+
- any-glob-to-any-file: [
72+
'content/sentinel/**'
73+
]
74+
475
# Add a Terraform label to changes under the related folders:
576
#
677
# Folder | Labels
@@ -66,19 +137,35 @@ TF Plugin Framework:
66137
'content/terraform-plugin-framework/**'
67138
]
68139

140+
# Add 'Vagrant' label to changes under 'content/vagrant'
141+
#
142+
# Label | Rule
143+
# --------------- | ------------------------------------------------------------
144+
# Vagrant | Default; applies to all doc updates
145+
# Vagrant | Updates on HCP Vagrant in hcp-docs directory
69146

70-
# Add 'Vault' label to changes under 'content/vault'
147+
Vagrant:
148+
- any:
149+
- changed-files:
150+
- any-glob-to-any-file: [
151+
'content/vagrant/**',
152+
'content/hcp-docs/content/docs/vagrant/**'
153+
]
154+
155+
# Add 'Vault' label to changes under 'content/vault', and 'content/hcp-docs/content/docs/vault'
71156
#
72157
# Label | Rule
73158
# --------------- | ------------------------------------------------------------
74159
# Vault | Default; applies to all doc updates
160+
# Vault | Updates on HCP Vault Dedicated in hcp-docs directory
75161
# Vault IC update | Updates on "Important changes" related docs
76162

77163
Vault:
78164
- any:
79165
- changed-files:
80166
- any-glob-to-any-file: [
81-
'content/vault/**'
167+
'content/vault/**',
168+
'content/hcp-docs/content/docs/vault/**'
82169
]
83170

84171
Vault IC:
@@ -91,6 +178,19 @@ Vault IC:
91178
'content/vault/*/content/docs/updates/lts-tracker.mdx'
92179
]
93180

181+
# Add 'Vault Radar' label to changes under 'content/hcp-docs/content/docs/vault-radar'
182+
#
183+
# Label | Rule
184+
# --------------- | ------------------------------------------------------------
185+
# Vault Radar | Default; applies to all doc updates
186+
187+
Vault Radar:
188+
- any:
189+
- changed-files:
190+
- any-glob-to-any-file: [
191+
'content/hcp-docs/content/docs/vault-radar/**'
192+
]
193+
94194
# Add 'WAF' label to changes under 'content/well-architected-framework'
95195
#
96196
# Label | Rule
@@ -104,15 +204,15 @@ WAF:
104204
'content/well-architected-framework/**'
105205
]
106206

107-
# Add 'Sentinel' label to changes under 'content/sentinel'
207+
# Add 'Waypoint' label to changes under 'content/hcp-docs/content/docs/waypoint'
108208
#
109209
# Label | Rule
110210
# --------------- | ------------------------------------------------------------
111-
# Sentinel | Default; applies to all doc updates
211+
# Waypoint | Default; applies to all doc updates
112212

113-
Sentinel:
213+
Waypoint:
114214
- any:
115215
- changed-files:
116216
- any-glob-to-any-file: [
117-
'content/sentinel/**'
118-
]
217+
'content/hcp-docs/content/docs/waypoint/**'
218+
]

.github/workflows/deploy-udr.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,4 @@ jobs:
5858
head_sha: ${{ github.event.after }}
5959
dev-portal-deploy-hook-prod: ${{ secrets.DEV_PORTAL_DEPLOY_HOOK_PROD }}
6060
revalidate-token: ${{ secrets.REVALIDATE_TOKEN }}
61+
bot-bypass-token: ${{ secrets.DEVELOPER_BOT_BYPASS_TOKEN }}

.github/workflows/force-reload-dev-portal.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ jobs:
3131
head_sha: ${{ inputs.head_sha }}
3232
dev-portal-deploy-hook-prod: ${{ secrets.DEV_PORTAL_DEPLOY_HOOK_PROD }}
3333
revalidate-token: ${{ secrets.REVALIDATE_TOKEN }}
34+
bot-bypass-token: ${{ secrets.DEVELOPER_BOT_BYPASS_TOKEN }}

content/terraform-docs-agents/v1.25.x/docs/cloud-docs/agents/changelog.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ within each release are categorized into one or more of the following labels:
1818
Each version below corresponds to a release artifact available for download on
1919
the official [releases website](https://releases.hashicorp.com/tfc-agent/).
2020

21+
## 1.25.1 (10/14/2025)
22+
23+
SECURITY:
24+
25+
* Updated Docker image to address various OpenSSL CVEs (#1213)
26+
2127
## 1.25.0 (09/30/2025)
2228

2329
FEATURES:

content/terraform-docs-common/data/cloud-docs-nav-data.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,11 +298,11 @@
298298
{
299299
"title": "Import existing resources",
300300
"path": "workspaces/import",
301+
"alias": "search, terraform search, resource discoverability",
301302
"badge": {
302303
"text": "BETA",
303304
"type": "outlined",
304305
"color": "neutral"
305-
306306
}
307307
},
308308
{

content/terraform-docs-common/docs/cloud-docs/api-docs/change-requests.mdx

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -250,12 +250,12 @@ You must specify the following fields in your payload when creating a new change
250250

251251
| Key path | Type | Required | Description |
252252
|------------|------|---------|-------------|
253-
| `data.action_type` | string | Required | The action to take. To create a change request, specify `"change_request"`. |
254-
| `data.action_inputs` | object | Required | Arguments for the bulk action. |
255-
| `data.action_inputs.subject` | string | Required | The change request's subject line.
256-
| `data.action_inputs.message` | string | Required | The change request's message, which HCP Terraform treats as markdown. |
257-
| `data.target_ids` | array | Optional | The IDs of the workspace you want to associate with this change request. You do not need to specify this field if you provide `data.query`. |
258-
| `data.query` | object | Optional | An [explorer query](/terraform/cloud-docs/api-docs/explorer#execute-a-query) with workspace data. You do not need to specify this field if you provide `data.target_ids`. |
253+
| `data.attributes.action_type` | string | Required | The action to take. To create a change request, specify `"change_request"`. |
254+
| `data.attributes.action_inputs` | object | Required | Arguments for the bulk action. |
255+
| `data.attributes.action_inputs.subject` | string | Required | The change request's subject line.
256+
| `data.attributes.action_inputs.message` | string | Required | The change request's message, which HCP Terraform treats as markdown. |
257+
| `data.attributes.target_ids` | array | Optional | The IDs of the workspace you want to associate with this change request. You do not need to specify this field if you provide `data.attribute.query`. |
258+
| `data.attributes.query` | object | Optional | An [explorer query](/terraform/cloud-docs/api-docs/explorer#execute-a-query) with workspace data. You do not need to specify this field if you provide `data.attribute.target_ids`. |
259259

260260
### Sample Payload
261261

@@ -269,15 +269,20 @@ You must specify the following fields in your payload when creating a new change
269269
"subject": "[Action Required] Github Actions Pinning (SEC-090)",
270270
"message": "Some long description here",
271271
},
272-
"query": {
273-
"type": "workspaces",
274-
"filter": [
275-
"field": "workspace_name",
276-
"operator": "contains",
277-
"value": ["dev"]
278-
]
272+
"query": {
273+
"type": "workspaces",
274+
"filter": [
275+
{
276+
"workspace_name": {
277+
"contains": [
278+
"dev"
279+
]
280+
}
281+
}
282+
]
283+
}
279284
}
280-
},
285+
}
281286
}
282287
```
283288

content/terraform-docs-common/docs/cloud-docs/api-docs/projects.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Properties without a default value are required.
115115
"key": "environment",
116116
"value": "development"
117117
}
118-
},
118+
}
119119
]
120120
}
121121
}

content/terraform-docs-common/docs/cloud-docs/workspaces/import.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
2-
page_title: Import existing resources to state
3-
description: Learn how to use queries to find unmanaged infrastructure and import it into Terraform
2+
page_title: Use search to find and import existing resources to state
3+
description: Learn how to use Terraform search to find unmanaged infrastructure and import it into your workspace in bulk.
44
tfc_only: true
55
---
66

77
# Import existing resources to state
88

9-
You can define queries in your Terraform configuration to search for resources that are not yet managed by Terraform. HCP Terraform presents query results so that you can use the UI to import the resources and begin managing them as code. This topic describes the workflow for importing resources in bulk. For instructions on importing single resources or small batches of resources in your configuration, refer to [Import a single resource](/terraform/language/v1.14.x/import/single-resource).
9+
Terraform can search your existing infrastructure for resources to let you import any unmanaged resources to an HCP Terraform workspace in bulk. For instructions on importing single resources or small batches of resources in your configuration, refer to [Import a single resource](/terraform/language/v1.14.x/import/single-resource).
1010

1111
@include 'beta.mdx'
1212

1313
## Overview
1414

15-
You can use search functionality in [UI and VCS-driven](/terraform/cloud-docs/run/ui) and [CLI-driven](/terraform/cloud-docs/run/cli) workspaces. Complete the following steps to search for resources and import them into your Terraform state:
15+
You can search for unmanaged resources in [UI and VCS-driven](/terraform/cloud-docs/run/ui) and [CLI-driven](/terraform/cloud-docs/run/cli) workspaces. HCP Terraform presents results so that you can use the UI to import the resources and begin managing them as code. Complete the following steps to search for resources and import them into your Terraform state:
1616

1717
1. **Define queries**: Add `list` blocks to your Terraform configuration. If you are using the VCS-driven workflow, commit this change and push it to the repository associated with your workspace in HCP Terraform. Refer to [Import resources in bulk](/terraform/language/v1.14.x/import/bulk) for more information.
1818
1. **Run the queries**: You can run queries in the HCP Terraform UI or run the Terraform CLI on your local workstation.

content/terraform/v1.13.x/docs/language/modules/configuration.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Add the `depth` query parameter to the `source` URL and specify how many commits
6666

6767
The following module sources support shallow clones:
6868

69-
- [GitHub repositoris](/terraform/language/block/module#github-repository)
69+
- [GitHub repositories](/terraform/language/block/module#github-repository)
7070
- [Git repositories](/terraform/language/block/module#git-repository)
7171
- [BitBucket repositories](/terraform/language/block/module#bitbucket-repository)
7272

@@ -179,4 +179,4 @@ removed {
179179
}
180180
```
181181

182-
Refer to [`moved` block reference](/terraform/language/block/removed) for more information.
182+
Refer to [`moved` block reference](/terraform/language/block/removed) for more information.

0 commit comments

Comments
 (0)