Skip to content

Commit 244cff9

Browse files
authored
Merge branch 'main' into 361_exclude_symlink_directories_skips_other_dirs
2 parents 1fabd4f + 7cf8053 commit 244cff9

File tree

26 files changed

+396
-151
lines changed

26 files changed

+396
-151
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
kind: FEATURES
2+
body: 'resource/archive_file: Remove `deprecated` status'
3+
time: 2024-09-12T14:01:36.373922-04:00
4+
custom:
5+
Issue: "218"

.github/workflows/ci-changie.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
# Ensure terraform-devex-repos is updated on version changes.
22-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
# Ensure terraform-devex-repos is updated on version changes.
2424
- uses: miniscruff/changie-action@6dcc2533cac0495148ed4046c438487e4dceaa23 # v2.0.0
2525
with:

.github/workflows/compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
copywrite:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
14+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1515
- uses: hashicorp/setup-copywrite@32638da2d4e81d56a0764aa1547882fc4d209636 # v1.1.3
1616
- run: copywrite headers --plan
1717
- run: copywrite license --plan

.github/workflows/issue-opened.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
issue_triage:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
11+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1212
- uses: github/issue-labeler@c1b0f9f52a63158c4adc09425e858e87b32e9685 # v3.4
1313
with:
1414
repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
configuration-path: .github/labeler-pull-request-triage.yml
1717
repo-token: "${{ secrets.GITHUB_TOKEN }}"
18-
- uses: CodelyTV/pr-size-labeler@56f6f0fc35c7cc0f72963b8467729e1120cb4bed # v1.10.0
18+
- uses: CodelyTV/pr-size-labeler@c7a55a022747628b50f3eb5bf863b9e796b8f274 # v1.10.1
1919
with:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2121
xs_label: 'size/XS'

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
28+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929
with:
3030
fetch-depth: 0
3131
# Avoid persisting GITHUB_TOKEN credentials as they take priority over our service account PAT for `git push` operations
@@ -57,7 +57,7 @@ jobs:
5757
runs-on: ubuntu-latest
5858
steps:
5959
- name: Checkout
60-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
60+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6161
with:
6262
fetch-depth: 0
6363
# Default input is the SHA that initially triggered the workflow. As we created a new commit in the previous job,
@@ -79,7 +79,7 @@ jobs:
7979
needs: [ changelog-version, changelog, release-tag ]
8080
runs-on: ubuntu-latest
8181
steps:
82-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
82+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8383
with:
8484
ref: ${{ inputs.versionNumber }}
8585
fetch-depth: 0
@@ -89,7 +89,7 @@ jobs:
8989
cd .changes
9090
sed -e "1{/# /d;}" -e "2{/^$/d;}" ${{ needs.changelog-version.outputs.version }}.md > release-notes.txt
9191
92-
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
92+
- uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
9393
with:
9494
name: release-notes
9595
path: ./.changes/release-notes.txt

.github/workflows/test.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,25 @@ jobs:
2020
steps:
2121

2222
- name: Check out code into the Go module directory
23-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
23+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424

2525
- name: Set up Go
26-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
26+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
2727
with:
2828
go-version-file: 'go.mod'
2929
id: go
3030

3131
- name: Run linters
32-
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
32+
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
3333
with:
3434
version: latest
3535

36+
# We need the latest version of Terraform for our documentation generation to use
37+
- name: Set up Terraform
38+
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2
39+
with:
40+
terraform_wrapper: false
41+
3642
- name: Generate
3743
run: make generate
3844

@@ -62,10 +68,10 @@ jobs:
6268
steps:
6369

6470
- name: Check out code
65-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
71+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6672

6773
- name: Setup Go
68-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
74+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
6975
with:
7076
go-version-file: 'go.mod'
7177
check-latest: true

DESIGN.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
# Archive Provider Design
22

3-
The Archive Provider offers focussed functionality specifically geared towards archiving files. Specifically,
4-
the provider data source generates zip archives of individual or multiple files.
3+
The Archive Provider offers focussed functionality specifically geared towards archiving files. The provider generates
4+
zip archives of individual or multiple files.
55

66
Below we have a collection of _Goals_ and _Patterns_: they represent the guiding principles applied during the
77
development of this provider. Some are in place, others are ongoing processes, others are still just inspirational.
88

99
## Goals
1010

1111
* [_Stability over features_](.github/CONTRIBUTING.md)
12-
* Provide data source for generating zip archives.
12+
* Provide a mechanism for generating zip archives.
1313

1414
General to development:
1515

docs/cdktf/python/data-sources/file.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
page_title: "archive_file Data Source - terraform-provider-archive"
33
subcategory: ""
44
description: |-
5-
Generates an archive from content, a file, or directory of files.
5+
Generates an archive from content, a file, or directory of files. The archive is built during the terraform plan, so you must persist the archive through to the terraform apply. See the archive_file resource for an alternative if you cannot persist the file, such as in a multi-phase CI or build server context.
66
---
77

88

99
<!-- Please do not edit this file, it is generated. -->
1010
# archive_file (Data Source)
1111

12-
Generates an archive from content, a file, or directory of files.
12+
Generates an archive from content, a file, or directory of files. The archive is built during the terraform plan, so you must persist the archive through to the terraform apply. See the `archive_file` resource for an alternative if you cannot persist the file, such as in a multi-phase CI or build server context.
1313

1414
## Example Usage
1515

@@ -117,4 +117,4 @@ Required:
117117
- `content` (String) Add this content to the archive with `filename` as the filename.
118118
- `filename` (String) Set this as the filename when declaring a `source`.
119119

120-
<!-- cache-key: cdktf-0.20.1 input-e028531bc97a019f848b3e37c5dde395799324b83b8cd5ea78649ffc9177c542 -->
120+
<!-- cache-key: cdktf-0.20.8 input-58f16fa5c1a288eadc3103ca8daf35401729e7a632b0a84dc82a5c5d959b0602 -->

docs/cdktf/python/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ The archive provider exposes resources to manage archive files.
1212

1313
This provider requires no configuration. For information on the resources
1414
it provides, see the navigation bar.
15-
<!-- cache-key: cdktf-0.20.1 input-29729bd5dcf423357d35fb88a589120ee1e2d5d1677702061afe3d70700dddc8 -->
15+
<!-- cache-key: cdktf-0.20.8 input-29729bd5dcf423357d35fb88a589120ee1e2d5d1677702061afe3d70700dddc8 -->

0 commit comments

Comments
 (0)