Skip to content

Commit 430f685

Browse files
viveklakviveklak
committed
Merge tag 'v2.24.1' into upstream-v2.24.1
2 parents 9ccf93a + 5dfe31a commit 430f685

Some content is hidden

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

49 files changed

+1362
-282
lines changed

‎.changelog/1070.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
helper/resource: Added `TestStep` type `RefreshState` field, which enables a step that refreshes state without an explicit apply or configuration changes
3+
```

‎.changelog/1077.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
helper/resource: Fixed `TestStep` type `ImportStateVerify` field so that it only matches against resources following a change in behaviour in Terraform 1.3 that imports both resources and their dependent data sources
3+
```

‎.changelog/1089.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
helper/resource: Fixed `TestStep` type `ImportStateCheck` field so that it only matches against resources following a change in behaviour in Terraform 1.3 that imports both resources and data sources into state
3+
```

‎.changelog/1091.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
helper/resource: Prevented goroutine leak per Terraform command when testing terraform-plugin-sdk based providers via `Providers` or `ProviderFactories`
3+
```

‎.changelog/1092.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
helper/resource: Prevented provider configuration already given error when `TestStep` type `Config` field already contained provider configuration block
3+
```

‎.changelog/1095.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
helper/resource: Prevented go-plugin goroutine leak per Terraform command
3+
```

‎.github/workflows/add-content-to-project.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: "Set Issue to 'Priority = Triage Next'"
22-
uses: leonsteinhaeuser/project-beta-automations@v2.0.0
22+
uses: leonsteinhaeuser/project-beta-automations@v2.0.1
2323
if: github.event_name == 'issues'
2424
with:
2525
gh_token: ${{ secrets.TF_DEVEX_PROJECT_GITHUB_TOKEN }}
@@ -29,7 +29,7 @@ jobs:
2929
operation_mode: custom_field
3030
custom_field_values: '[{\"name\":\"Priority\",\"type\":\"single_select\",\"value\":\"Triage Next\"}]'
3131
- name: "Set Pull Request to 'Priority = Triage Next'"
32-
uses: leonsteinhaeuser/project-beta-automations@v2.0.0
32+
uses: leonsteinhaeuser/project-beta-automations@v2.0.1
3333
if: github.event_name == 'pull_request_target'
3434
with:
3535
gh_token: ${{ secrets.TF_DEVEX_PROJECT_GITHUB_TOKEN }}

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# 2.24.1 (November 14, 2022)
2+
3+
BUG FIXES:
4+
5+
* helper/resource: Fixed `TestStep` type `ImportStateCheck` field so that it only matches against resources following a change in behaviour in Terraform 1.3 that imports both resources and data sources into state ([#1089](https://github.com/hashicorp/terraform-plugin-sdk/issues/1089))
6+
* helper/resource: Prevented go-plugin goroutine leak per Terraform command ([#1095](https://github.com/hashicorp/terraform-plugin-sdk/issues/1095))
7+
* helper/resource: Prevented goroutine leak per Terraform command when testing terraform-plugin-sdk based providers via `Providers` or `ProviderFactories` ([#1091](https://github.com/hashicorp/terraform-plugin-sdk/issues/1091))
8+
* helper/resource: Prevented provider configuration already given error when `TestStep` type `Config` field already contained provider configuration block ([#1092](https://github.com/hashicorp/terraform-plugin-sdk/issues/1092))
9+
10+
# 2.24.0 (October 13, 2022)
11+
12+
ENHANCEMENTS:
13+
* helper/resource: Added `TestStep` type `RefreshState` field, which enables a step that refreshes state without an explicit apply or configuration changes ([#1070](https://github.com/hashicorp/terraform-plugin-sdk/issues/1070))
14+
15+
BUG FIXES:
16+
* helper/resource: Fixed `TestStep` type `ImportStateVerify` field so that it only matches against resources following a change in behaviour in Terraform 1.3 that imports both resources and their dependent data sources ([#1077](https://github.com/hashicorp/terraform-plugin-sdk/issues/1077))
17+
118
# 2.23.0 (September 15, 2022)
219

320
ENHANCEMENTS:

‎LICENSE‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Copyright (c) 2019 HashiCorp, Inc.
2+
13
Mozilla Public License, version 2.0
24

35
1. Definitions

‎Makefile‎

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,5 @@
11
GOFMT_FILES?=$$(find . -name '*.go')
22

3-
WEBSITE_REPO=github.com/hashicorp/terraform-website
4-
WEBSITE_BRANCH=master
5-
6-
CURRENT_GIT_REPO=$$(basename `git rev-parse --show-toplevel`)
7-
CURRENT_GIT_BRANCH=$$(git rev-parse --abbrev-ref HEAD)
8-
9-
WEBSITE_DOCKER_IMAGE="hashicorp/terraform-website:full"
10-
WEBSITE_DOCKER_IMAGE_LOCAL="hashicorp-terraform-website-local"
11-
WEBSITE_DOCKER_RUN_FLAGS=--interactive \
12-
--rm \
13-
--tty \
14-
--workdir "/website" \
15-
--volume "$(shell pwd)/website:/website/preview" \
16-
--publish "3000:3000" \
17-
-e "IS_CONTENT_PREVIEW=true" \
18-
-e "PREVIEW_FROM_REPO=$(CURRENT_GIT_REPO)" \
19-
-e "NAV_DATA_DIRNAME=./preview/data" \
20-
-e "CONTENT_DIRNAME=./preview/docs" \
21-
-e "CURRENT_GIT_BRANCH=$(CURRENT_GIT_BRANCH)"
22-
233
default: test
244

255
test: generate
@@ -34,25 +14,16 @@ generate:
3414
fmt:
3515
gofmt -s -w -e $(GOFMT_FILES)
3616

37-
# Run the terraform.io website to preview local content changes
17+
# Run this if working on the website locally to run in watch mode.
3818
website:
39-
@echo "==> Downloading latest Docker image..."
40-
@docker pull ${WEBSITE_DOCKER_IMAGE}
41-
@echo "==> Starting website in Docker..."
42-
@docker run ${WEBSITE_DOCKER_RUN_FLAGS} ${WEBSITE_DOCKER_IMAGE} npm start
43-
44-
# Run the terraform.io website via a locally built docker image
45-
#
46-
# This is useful for development as you may be building an image
47-
# with local changes from the `terraform-website` repo.
19+
$(MAKE) -C website website
20+
21+
# Use this if you have run `website/build-local` to use the locally built image.
4822
website/local:
49-
@echo "==> Starting website in Docker..."
50-
@docker run ${WEBSITE_DOCKER_RUN_FLAGS} ${WEBSITE_DOCKER_IMAGE_LOCAL} npm start
23+
$(MAKE) -C website website/local
5124

52-
# Build the terraform.io image using `terraform-website` git repo as the build context
25+
# Run this to generate a new local Docker image.
5326
website/build-local:
54-
@echo "==> Building local Docker image"
55-
@docker build https://github.com/hashicorp/terraform-website.git\#$(WEBSITE_BRANCH) \
56-
-t $(WEBSITE_DOCKER_IMAGE_LOCAL)
27+
$(MAKE) -C website website/build-local
5728

5829
.PHONY: default fmt lint generate test website website/local website/build-local

0 commit comments

Comments
 (0)