Skip to content

Commit f7da68d

Browse files
committed
Update documentation to better reflect changes
1 parent e680b38 commit f7da68d

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Unreleased
22

3-
- [Issue #372](https://github.com/manheim/terraform-pipeline/issues/372) Replace `master` branch with `main` in code
3+
- [Issue #372](https://github.com/manheim/terraform-pipeline/issues/372) Replace `master` branch with `main` in documentation
4+
- [Issue #372](https://github.com/manheim/terraform-pipeline/issues/372)
5+
ConditionalApplyPlugin: Support main and master branches
6+
- [Issue #372](https://github.com/manheim/terraform-pipeline/issues/372)
7+
TerraformTaintPlugin: Support main and master branches
48
- [Issue #432](https://github.com/manheim/terraform-pipeline/issues/432) pass TagPlugin through `-var-file={env}-tags.tfvars`
59
- [Issue #417](https://github.com/manheim/terraform-pipeline/issues/417) DestroyPlugin & PassPlanFilePlugin - Terraform Destroy can't be called with a plan file
610

docs/ConditionalApplyPlugin.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
This plugin is enabled by default.
44

5-
By default, changes are applied through one and only one branch - main. The ConditionalApplyPlugin enforces this by making the "Confirm" and "Apply" steps of a TerraformEnvironmentStage visible only on the main branch. You can continue to use branches and PullRequests, however, branches and PullRequests will only run the Plan step for each environment, and skip over the Confirm/Apply steps.
5+
By default, changes are applied through one and only one branch - main. The
6+
ConditionalApplyPlugin enforces this by making the "Confirm" and "Apply" steps
7+
of a TerraformEnvironmentStage visible only on the main or master branch. You can
8+
continue to use branches and PullRequests, however, branches and PullRequests
9+
will only run the Plan step for each environment, and skip over the
10+
Confirm/Apply steps.
611

712
This behavior can be changed by using `ConditionalApplyPlugin.withApplyOnBranch()`. This method accepts one or more branches. "Confirm" and "Apply" steps of TerraformEnvironmentStage will then be visible for each of the specified branches. Any branch or PullRequest not in that list will only run the Plan step for each environment, and skip over the Confirm/Apply steps.
813

0 commit comments

Comments
 (0)