Skip to content

Commit

Permalink
Merge pull request #45 from mineiros-io/soerenmartius/terraform-1.0
Browse files Browse the repository at this point in the history
Add support for Terraform v1
  • Loading branch information
soerenmartius authored Jul 7, 2021
2 parents 56045b1 + c12a573 commit 3a79f15
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 16 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.6.0]

- Add support for Terraform `v1`

## [0.5.2]

### Fixed
Expand Down Expand Up @@ -108,11 +112,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

<!-- markdown-link-check-disable -->

[unreleased]: https://github.com/mineiros-io/terraform-github-team/compare/v0.5.2...HEAD
[0.5.2]: https://github.com/mineiros-io/terraform-github-team/compare/v0.5.1...v0.5.2
[unreleased]: https://github.com/mineiros-io/terraform-github-team/compare/v0.6.0...HEAD
[0.6.0]: https://github.com/mineiros-io/terraform-github-team/compare/v0.5.2...v0.6.0

<!-- markdown-link-check-enable -->

[0.5.2]: https://github.com/mineiros-io/terraform-github-team/compare/v0.5.1...v0.5.2
[0.5.1]: https://github.com/mineiros-io/terraform-github-team/compare/v0.5.0...v0.5.1
[0.5.0]: https://github.com/mineiros-io/terraform-github-team/compare/v0.4.0...v0.5.0
[0.4.0]: https://github.com/mineiros-io/terraform-github-team/compare/v0.3.1...v0.4.0
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Set default shell to bash
SHELL := /bin/bash -o pipefail

BUILD_TOOLS_VERSION ?= v0.11.0
BUILD_TOOLS_VERSION ?= v0.12.0
BUILD_TOOLS_DOCKER_REPO ?= mineiros/build-tools
BUILD_TOOLS_DOCKER_IMAGE ?= ${BUILD_TOOLS_DOCKER_REPO}:${BUILD_TOOLS_VERSION}

Expand Down
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

A [Terraform] module that offers a more convenient and tested way to provision and manage [GitHub teams].

**_This module supports Terraform v0.15, v0.14, v0.13 as well as v0.12.9 and above
**_This module supports Terraform v1, v0.15, v0.14, v0.13 as well as v0.12.9 and above
and is compatible with the Terraform Github Provider v4, v3 as well as v2.4 and above._**

- [Features](#features)
Expand All @@ -32,9 +32,6 @@ and is compatible with the Terraform Github Provider v4, v3 as well as v2.4 and

## Features

_This module supports Terraform v0.14, v0.13 as well as v0.12.9 and above
and is compatible with the Terraform Github Provider v3 as well as v2.4 and above._

This module supports the following resources:

- Team
Expand All @@ -47,7 +44,7 @@ This module supports the following resources:
```hcl
module "team" {
source = "mineiros-io/team/github"
version = "~> 0.5.0"
version = "~> 0.6.0"
name = "DevOps"
description = "The DevOps Team"
Expand Down Expand Up @@ -220,7 +217,7 @@ Copyright &copy; 2020 [Mineiros GmbH][homepage]
[badge-build]: https://github.com/mineiros-io/terraform-github-team/workflows/CI/CD%20Pipeline/badge.svg
[badge-semver]: https://img.shields.io/github/v/tag/mineiros-io/terraform-github-team.svg?label=latest&sort=semver
[badge-license]: https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
[badge-terraform]: https://img.shields.io/badge/terraform-0.15%20|0.14%20|%200.13%20|%200.12.20+-623CE4.svg?logo=terraform
[badge-terraform]: https://img.shields.io/badge/terraform-1.x%20|0.15%20|0.14%20|%200.13%20|%200.12.20+-623CE4.svg?logo=terraform
[badge-slack]: https://img.shields.io/badge/[email protected]?logo=slack
[build-status]: https://github.com/mineiros-io/terraform-github-team/actions
[releases-github]: https://github.com/mineiros-io/terraform-github-team/releases
Expand Down
2 changes: 1 addition & 1 deletion examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[homepage]: https://mineiros.io/?ref=terraform-github-team

[badge-license]: https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
[badge-terraform]: https://img.shields.io/badge/terraform-0.13%20and%200.12.20+-623CE4.svg?logo=terraform
[badge-terraform]: https://img.shields.io/badge/terraform-1.x%20|0.15%20|0.14%20|%200.13%20|%200.12.20+-623CE4.svg?logo=terraform
[badge-slack]: https://img.shields.io/badge/[email protected]?logo=slack
[badge-semver]: https://img.shields.io/github/v/tag/mineiros-io/terraform-github-team.svg?label=latest&sort=semver

Expand Down
4 changes: 2 additions & 2 deletions examples/github-team/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ and push permissions to the other.
```hcl
module "team" {
source = "mineiros-io/team/github"
version = "~> 0.5.0"
version = "~> 0.6.0"
name = "Engineering"
description = "This team is created with terraform to test the terraformn-github-repository module."
Expand Down Expand Up @@ -83,7 +83,7 @@ Run `terraform destroy` to destroy all resources again.

[homepage]: https://mineiros.io/?ref=terraform-github-team
[badge-license]: https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
[badge-terraform]: https://img.shields.io/badge/terraform-0.13%20and%200.12.20+-623CE4.svg?logo=terraform
[badge-terraform]: https://img.shields.io/badge/terraform-1.x%20|0.15%20|0.14%20|%200.13%20|%200.12.20+-623CE4.svg?logo=terraform
[badge-slack]: https://img.shields.io/badge/[email protected]?logo=slack
[releases-terraform]: https://github.com/hashicorp/terraform/releases
[apache20]: https://opensource.org/licenses/Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions examples/github-team/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ resource "github_repository" "another_repository" {

module "team" {
source = "mineiros-io/team/github"
version = "~> 0.5.0"
version = "~> 0.6.0"

name = "Engineering"
description = "This team is created with terraform to test the terraformn-github-repository module."
Expand All @@ -59,7 +59,7 @@ module "team" {

module "child_team" {
source = "mineiros-io/team/github"
version = "~> 0.5.0"
version = "~> 0.6.0"

name = "DevOps"
parent_team_id = module.team.id
Expand Down
2 changes: 1 addition & 1 deletion test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Alternatively, you can also run the tests without Docker.
[Go]: https://golang.org/
[Terraform]: https://www.terraform.io/downloads.html
[badge-license]: https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg
[badge-terraform]: https://img.shields.io/badge/terraform-0.13%20and%200.12.20+-623CE4.svg?logo=terraform
[badge-terraform]: https://img.shields.io/badge/terraform-1.x%20|0.15%20|0.14%20|%200.13%20|%200.12.20+-623CE4.svg?logo=terraform
[badge-slack]: https://img.shields.io/badge/[email protected]?logo=slack

[releases-terraform]: https://github.com/hashicorp/terraform/releases
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# ---------------------------------------------------------------------------------------------------------------------

terraform {
required_version = ">= 0.12.20, < 0.16"
required_version = ">= 0.12.20, < 2.0"

required_providers {
github = ">= 2.4, < 5.0"
Expand Down

0 comments on commit 3a79f15

Please sign in to comment.