Skip to content

Commit 18a704b

Browse files
authored
Merge pull request #54 from mineiros-io/mariux/fix-breaking-change-in-provider
Fix breaking change in provider
2 parents 8d1db69 + af0ee36 commit 18a704b

File tree

7 files changed

+92
-42
lines changed

7 files changed

+92
-42
lines changed

CHANGELOG.md

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,122 @@
11
# Changelog
2+
23
All notable changes to this project will be documented in this file.
34

45
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
56
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
67

78
## [Unreleased]
9+
10+
## [0.5.1]
11+
12+
### Fixed
13+
14+
- Remove support for Terraform Github Provider v3.1.0 as this version introduced undocumneted breaking changes. See https://github.com/terraform-providers/terraform-provider-github/issues/566 for details.
15+
816
### Changed
17+
918
- Adjust default branch in code to github new default branch naming
1019

1120
## [0.5.0]
21+
1222
### Added
23+
1324
- Add support for Terraform v0.13.x
1425
- Add support for Terraform Github Provider v3.x
1526
- Prepare support for Terraform v0.14.x (needs terraform v0.12.20 or above)
1627

1728
## [0.4.2] - 2020-06-23
29+
1830
### Added
31+
1932
- Add `CHANGELOG.md`.
33+
2034
### Changed
35+
2136
- Switch CI from SemaphoreCI to GitHub Actions.
2237

2338
## [0.4.1] - 2020-06-04
39+
2440
### Added
41+
2542
- Add CONTRIBUTING.md.
2643
- Add `phony-targets` and `markdown-link-check` hooks.
44+
2745
### Changelog
46+
2847
- Update logo and badges in README.md.
2948

3049
## [0.4.0] - 2020-05-28
50+
3151
### Fixed
52+
3253
- Fix a bug that was introduced during the last release which forced the
3354
re-creation of teams on every run.
3455

3556
## [0.3.1] - 2020-05-24
57+
3658
### Fixed
59+
3760
- Fix dependency issue when assigning teams by name.
3861

3962
## [0.3.0] - 2020-05-14
63+
4064
### Added
65+
4166
- Add `issue_labels_create` to specify whether you want to force or suppress the
4267
creation of issues labels. Default is `true` if `has_issues` is `true` or
4368
`issue_labels` is non-empty, otherwise default is `false`.
4469

4570
## [0.2.1] - 2020-05-09
71+
4672
### Added
73+
4774
- Introduced support for the
4875
[github_repository_webhook](https://www.terraform.io/docs/providers/github/r/repository_webhook.html)
4976
resource. You can now add webhooks to your repositories through the newly
5077
introduced variable `webhooks`. For further information please read the
5178
[documentation](https://github.com/mineiros-io/terraform-github-repository#webhooks-configuration).
5279

5380
## [0.2.0] - 2020-04-16
81+
5482
### Added
83+
5584
- Use slugs for team ids.
85+
5686
### Changed
87+
5788
- Set `delete_branch_on_merge` default value to `true`.
5889
- Upgrade terraform-github-provider to `~> 2.6`.
90+
5991
### Fixed
92+
6093
- Fix module dependency by introducing `modules_depends_on`.
6194

6295
## [0.1.0] - 2020-02-27
96+
6397
### Changed
98+
6499
- Update README.md and add more examples and related tests.
65100

66101
## [0.0.7] - 2020-01-14
102+
67103
### Changed
104+
68105
- Breaking Changes for `branch_protection_rules`. Properties are now configured
69106
as a nested object instead of lists.
70107

71108
## [0.0.6] - 2020-01-12
109+
72110
### Changed
111+
73112
- Ignore changes in `auto_init`.
74113
- Ignore changes in `gitignore_template`.
75114
- Ignore changes in `license_template`.
76115

77116
## [0.0.5] - 2020-01-12
117+
78118
### Added
119+
79120
- Add `defaults`.
80121
- Add `extra_topics` for adding additional topics when defaults.topics should
81122
not be overwritten but merged.
@@ -88,40 +129,60 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
88129
- Add `admin_team_ids` as a list of team IDs to add as admin teams.
89130
- Add `push_team_ids` as a list of team IDs to add as push teams.
90131
- Add `pull_team_ids` as a list of team IDs to add as pull teams.
132+
91133
### Changed
134+
92135
- Use `for_each` instead of `count` to not recreate most resources when order
93136
in module parameter changes.
94137
- Add automated unit tests.
138+
95139
### Fixed
140+
96141
- Fix race condition in `branch_protection` configuration.
142+
97143
### Removed
144+
98145
- Remove `teams`.
99146
- Remove `collaborators`.
100147

101148
## [0.0.4] - 2020-01-06
149+
102150
### Changed
151+
103152
- Set `auto_init` default value to `true`.
104153

105154
## [0.0.3] - 2020-01-06
155+
106156
### Changed
157+
107158
- Set has_issues default value to `false`.
108159

109160
## [0.0.2] - 2020-01-06
161+
110162
### Removed
163+
111164
- Remove unnecessary `Vars` declaration from test.
165+
112166
### Changed
167+
113168
- Set `has_feature` toggles default values to `false`.
114169
- Set example variables default value to null.
115170

116171
## [0.0.1] - 2020-01-05
172+
117173
### Added
174+
118175
- This is the initial release of our GitHub Repository module with support for
119176
creating and managing GitHub Repositories for Organizations.
120177

121178
<!-- markdown-link-check-disable -->
122-
[Unreleased]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.5.0...HEAD
123-
[0.5.0]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.4.2...v0.5.0
179+
180+
[unreleased]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.5.1...HEAD
181+
[0.5.1]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.5.0...v0.5.1
182+
124183
<!-- markdown-link-check-enable -->
184+
185+
[0.5.0]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.4.2...v0.5.0
125186
[0.4.2]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.4.1...v0.4.2
126187
[0.4.1]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.4.0...v0.4.1
127188
[0.4.0]: https://github.com/mineiros-io/terraform-github-repository/compare/v0.3.1...v0.4.0

CONTRIBUTING.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,13 @@ If everything looks good, they will merge the code and release a new version whi
7777

7878
<!-- References -->
7979

80-
[Pull Requests]: https://github.com/mineiros-io/terraform-github-repository/pulls
80+
[pull requests]: https://github.com/mineiros-io/terraform-github-repository/pulls
8181
[pre-commit-file]: https://github.com/mineiros-io/terraform-github-repository/blob/master/.pre-commit-config.yaml
82-
83-
[Github Flow]: https://guides.github.com/introduction/flow/
84-
[CODEOWNERS]: https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
85-
[Fork]: https://help.github.com/en/github/getting-started-with-github/fork-a-repo
82+
[github flow]: https://guides.github.com/introduction/flow/
83+
[codeowners]: https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners
84+
[fork]: https://help.github.com/en/github/getting-started-with-github/fork-a-repo
8685
[create a new branch]: https://guides.github.com/introduction/flow/
87-
[Readme Driven Development]: https://tom.preston-werner.com/2010/08/23/readme-driven-development.html
86+
[readme driven development]: https://tom.preston-werner.com/2010/08/23/readme-driven-development.html
8887
[commit]: https://help.github.com/en/desktop/contributing-to-projects/committing-and-reviewing-changes-to-your-project
8988
[create a pull request]: https://help.github.com/articles/creating-a-pull-request/
90-
[Semantic Versioning (SemVer)]: https://semver.org/
89+
[semantic versioning (semver)]: https://semver.org/

README.md

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
A [Terraform] module for creating a public or private repository on [Github].
1212

13-
***This module supports Terraform v0.13 as well as v0.12.9 and above
14-
and is compatible with the Terraform Github Provider v3 as well as v2.6 and above.***
13+
**_This module supports Terraform v0.13 as well as v0.12.9 and above
14+
and is compatible with the Terraform Github Provider v3 as well as v2.6 and above._**
1515

1616
- [Module Features](#module-features)
1717
- [Getting Started](#getting-started)
@@ -651,7 +651,6 @@ The following attributes are exported by the module:
651651
A map of Project objects keyed by the `id` of the project as returned by the
652652
[`github_repository_project`] resource
653653

654-
655654
## External Documentation
656655

657656
- Terraform Github Provider Documentation:
@@ -660,7 +659,6 @@ The following attributes are exported by the module:
660659
- https://www.terraform.io/docs/providers/github/r/repository_deploy_key.html
661660
- https://www.terraform.io/docs/providers/github/r/repository_project.html
662661

663-
664662
## Module Versioning
665663

666664
This Module follows the principles of [Semantic Versioning (SemVer)].
@@ -712,38 +710,32 @@ Copyright &copy; 2020 [Mineiros GmbH][homepage]
712710

713711
<!-- References -->
714712

715-
[Github]: https://github.com/
713+
[github]: https://github.com/
716714
[`github_repository`]: https://www.terraform.io/docs/providers/github/r/repository.html#attributes-reference
717715
[`github_repository_collaborator`]: https://www.terraform.io/docs/providers/github/r/repository_collaborator.html#attribute-reference
718716
[`github_repository_deploy_key`]: https://www.terraform.io/docs/providers/github/r/repository_deploy_key.html#attributes-reference
719717
[`github_repository_project`]: https://www.terraform.io/docs/providers/github/r/repository_project.html#attributes-reference
720-
721718
[homepage]: https://mineiros.io/?ref=terraform-github-repository
722719
723-
724720
[badge-build]: https://github.com/mineiros-io/terraform-github-repository/workflows/CI/CD%20Pipeline/badge.svg
725721
[badge-semver]: https://img.shields.io/github/v/tag/mineiros-io/terraform-github-repository.svg?label=latest&sort=semver
726722
[badge-license]: https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
727723
[badge-terraform]: https://img.shields.io/badge/terraform-0.13%20and%200.12.9+-623CE4.svg?logo=terraform
728724
[badge-slack]: https://img.shields.io/badge/[email protected]?logo=slack
729-
730725
[badge-tf-gh]: https://img.shields.io/badge/GH-3%20and%202.6+-F8991D.svg?logo=terraform
731726
[releases-github-provider]: https://github.com/terraform-providers/terraform-provider-github/releases
732-
733727
[build-status]: https://github.com/mineiros-io/terraform-github-repository/actions
734728
[releases-github]: https://github.com/mineiros-io/terraform-github-repository/releases
735729
[releases-terraform]: https://github.com/hashicorp/terraform/releases
736730
[apache20]: https://opensource.org/licenses/Apache-2.0
737731
[slack]: https://join.slack.com/t/mineiros-community/shared_invite/zt-ehidestg-aLGoIENLVs6tvwJ11w9WGg
738-
739-
[Terraform]: https://www.terraform.io
740-
[AWS]: https://aws.amazon.com/
741-
[Semantic Versioning (SemVer)]: https://semver.org/
742-
732+
[terraform]: https://www.terraform.io
733+
[aws]: https://aws.amazon.com/
734+
[semantic versioning (semver)]: https://semver.org/
743735
[variables.tf]: https://github.com/mineiros-io/terraform-github-repository/blob/master/variables.tf
744736
[examples/]: https://github.com/mineiros-io/terraform-github-repository/blob/master/examples
745-
[Issues]: https://github.com/mineiros-io/terraform-github-repository/issues
746-
[LICENSE]: https://github.com/mineiros-io/terraform-github-repository/blob/master/LICENSE
747-
[Makefile]: https://github.com/mineiros-io/terraform-github-repository/blob/master/Makefile
748-
[Pull Requests]: https://github.com/mineiros-io/terraform-github-repository/pulls
749-
[Contribution Guidelines]: https://github.com/mineiros-io/terraform-github-repository/blob/master/CONTRIBUTING.md
737+
[issues]: https://github.com/mineiros-io/terraform-github-repository/issues
738+
[license]: https://github.com/mineiros-io/terraform-github-repository/blob/master/LICENSE
739+
[makefile]: https://github.com/mineiros-io/terraform-github-repository/blob/master/Makefile
740+
[pull requests]: https://github.com/mineiros-io/terraform-github-repository/pulls
741+
[contribution guidelines]: https://github.com/mineiros-io/terraform-github-repository/blob/master/CONTRIBUTING.md

examples/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111

1212
<!-- References -->
1313
<!-- markdown-link-check-disable -->
14+
1415
[public-respository/]: https://github.com/mineiros-io/terraform-github-repository/blob/master/examples/public-respository
16+
1517
<!-- markdown-link-check-enable -->
1618

1719
[homepage]: https://mineiros.io/?ref=terraform-github-repository
18-
1920
[badge-license]: https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
2021
[badge-terraform]: https://img.shields.io/badge/terraform-0.13%20and%200.12.20+-623CE4.svg?logo=terraform
2122
[badge-slack]: https://img.shields.io/badge/[email protected]?logo=slack
2223
[badge-semver]: https://img.shields.io/github/v/tag/mineiros-io/terraform-github-repository.svg?label=latest&sort=semver
23-
2424
[releases-github]: https://github.com/mineiros-io/terraform-github-repository/releases
2525
[releases-terraform]: https://github.com/hashicorp/terraform/releases
2626
[apache20]: https://opensource.org/licenses/Apache-2.0

examples/public-repository/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,15 @@ Run `terraform destroy` to destroy all resources again.
109109
<!-- References -->
110110

111111
<!-- markdown-link-check-disable -->
112+
112113
[main.tf]: https://github.com/mineiros-io/terraform-github-repository/blob/master/examples/public-respository/main.tf
114+
113115
<!-- markdown-link-check-enable -->
114116

115117
[homepage]: https://mineiros.io/?ref=terraform-github-repository
116-
117118
[badge-license]: https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
118119
[badge-terraform]: https://img.shields.io/badge/terraform-0.13%20and%200.12.20+-623CE4.svg?logo=terraform
119120
[badge-slack]: https://img.shields.io/badge/[email protected]?logo=slack
120-
121121
[releases-terraform]: https://github.com/hashicorp/terraform/releases
122122
[apache20]: https://opensource.org/licenses/Apache-2.0
123123
[slack]: https://join.slack.com/t/mineiros-community/shared_invite/zt-ehidestg-aLGoIENLVs6tvwJ11w9WGg

test/README.md

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ of the modules that ship with this repository.
1212
## Introduction
1313

1414
We are using [Terratest] for automated tests that are located in the
15-
[`test/` directory][Testdirectory]. Terratest deploys _real_ infrastructure
15+
[`test/` directory][testdirectory]. Terratest deploys _real_ infrastructure
1616
(e.g., servers) in a _real_ environment (e.g., AWS).
1717

1818
The basic usage pattern for writing automated tests with Terratest is to:
@@ -62,19 +62,17 @@ Alternatively, you can also run the tests without Docker.
6262

6363
<!-- References -->
6464

65-
[Makefile]: https://github.com/mineiros-io/terraform-github-repository/blob/master/Makefile
66-
[Testdirectory]: https://github.com/mineiros-io/terraform-github-repository/tree/master/test
67-
65+
[makefile]: https://github.com/mineiros-io/terraform-github-repository/blob/master/Makefile
66+
[testdirectory]: https://github.com/mineiros-io/terraform-github-repository/tree/master/test
6867
[homepage]: https://mineiros.io/?ref=terraform-github-repository
69-
[Terratest]: https://github.com/gruntwork-io/terratest
68+
[terratest]: https://github.com/gruntwork-io/terratest
7069
[package testing]: https://golang.org/pkg/testing/
71-
[Docker]: https://docs.docker.com/get-started/
72-
[Go]: https://golang.org/
73-
[Terraform]: https://www.terraform.io/downloads.html
70+
[docker]: https://docs.docker.com/get-started/
71+
[go]: https://golang.org/
72+
[terraform]: https://www.terraform.io/downloads.html
7473
[badge-license]: https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
7574
[badge-terraform]: https://img.shields.io/badge/terraform-0.13%20and%200.12.20+-623CE4.svg?logo=terraform
7675
[badge-slack]: https://img.shields.io/badge/[email protected]?logo=slack
77-
7876
[releases-terraform]: https://github.com/hashicorp/terraform/releases
7977
[apache20]: https://opensource.org/licenses/Apache-2.0
8078
[slack]: https://join.slack.com/t/mineiros-community/shared_invite/zt-ehidestg-aLGoIENLVs6tvwJ11w9WGg

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ terraform {
66
required_version = ">= 0.12.20, < 0.14"
77

88
required_providers {
9-
github = ">= 2.6, < 4.0"
9+
github = ">= 2.6, < 4.0, != 3.1.0"
1010
}
1111
}

0 commit comments

Comments
 (0)