Merge pull request #29 from mineiros-io/mariux/tf14

feat: Add support for Terraform v0.14.x

Author: mariux

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.0]
+### Added
+- Add support for Terraform v0.14.x
+
 ## [0.2.0]
 ### Added
 - Add `CHANGELOG.md`
@@ -46,9 +50,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   Team, Nested Team, Memberships, Team Repositories.
 
 <!-- markdown-link-check-disable -->
-[Unreleased]: https://github.com/mineiros-io/terraform-github-team/compare/v0.2.0...HEAD
-[0.2.0]: https://github.com/mineiros-io/terraform-github-team/compare/v0.1.3...v0.2.0
+[Unreleased]: https://github.com/mineiros-io/terraform-github-team/compare/v0.3.0...HEAD
+[0.3.0]: https://github.com/mineiros-io/terraform-github-team/compare/v0.2.0...v0.3.0
 <!-- markdown-link-check-enable -->
+[0.2.0]: https://github.com/mineiros-io/terraform-github-team/compare/v0.1.3...v0.2.0
 [0.1.3]: https://github.com/mineiros-io/terraform-github-team/compare/v0.1.2...v0.1.3
 [0.1.2]: https://github.com/mineiros-io/terraform-github-team/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/mineiros-io/terraform-github-team/compare/v0.1.0...v0.1.1

Makefile

@@ -1,7 +1,7 @@
 # Set default shell to bash
 SHELL := /bin/bash -o pipefail
 
-BUILD_TOOLS_VERSION      ?= v0.6.1
+BUILD_TOOLS_VERSION      ?= v0.7.0
 BUILD_TOOLS_DOCKER_REPO  ?= mineiros/build-tools
 BUILD_TOOLS_DOCKER_IMAGE ?= ${BUILD_TOOLS_DOCKER_REPO}:${BUILD_TOOLS_VERSION}
 

README.md

@@ -32,8 +32,10 @@ and is compatible with the Terraform Github Provider v3 as well as v2.4 and abov
 
 ## Features
 
-This module uses the [Terraform GitHub provider v2.4](https://github.com/terraform-providers/terraform-provider-github/releases)
-that supports the following resources:
+*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
 - Nested Team
@@ -45,7 +47,7 @@ that supports the following resources:
 ```hcl
 module "team" {
   source  = "mineiros-io/team/github"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
 
   name        = "DevOps"
   description = "The DevOps Team"
@@ -209,7 +211,7 @@ Copyright © 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.13%20and%200.12.9+-623CE4.svg?logo=terraform
+[badge-terraform]: https://img.shields.io/badge/terraform-0.14%20|%200.13%20|%200.12.20+-623CE4.svg?logo=terraform
 [badge-slack]: https://img.shields.io/badge/slack-@mineiros--community-f32752.svg?logo=slack
 [build-status]: https://github.com/mineiros-io/terraform-github-team/actions
 [releases-github]: https://github.com/mineiros-io/terraform-github-team/releases

examples/github-team/README.md

@@ -19,7 +19,7 @@ and push permissions to the other.
 ```hcl
 module "team" {
   source  = "mineiros-io/team/github"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
 
   name        = "Engineering"
   description = "This team is created with terraform to test the terraformn-github-repository module."
@@ -39,7 +39,7 @@ module "team" {
 
 module "child_team" {
   source  = "mineiros-io/team/github"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
 
   name           = "DevOps"
   parent_team_id = module.team.id

examples/github-team/main.tf

@@ -39,7 +39,7 @@ resource "github_repository" "another_repository" {
 
 module "team" {
   source  = "mineiros-io/team/github"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
 
   name        = "Engineering"
   description = "This team is created with terraform to test the terraformn-github-repository module."
@@ -59,7 +59,7 @@ module "team" {
 
 module "child_team" {
   source  = "mineiros-io/team/github"
-  version = "~> 0.2.0"
+  version = "~> 0.3.0"
 
   name           = "DevOps"
   parent_team_id = module.team.id

test/github_team_test.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/gruntwork-io/terratest/modules/random"
 	"github.com/gruntwork-io/terratest/modules/terraform"
-	"gotest.tools/assert"
 )
 
 var githubOrganization, githubToken string
@@ -48,11 +47,4 @@ func TestGithubTeam(t *testing.T) {
 
 	// This will run `terraform init` and `terraform apply` and fail the test if there are any errors
 	terraform.InitAndApply(t, terraformOptions)
-
-	// Validate the names of the repositoriees
-	assert.Equal(t, repositoryA, terraform.Output(t, terraformOptions, "first_repository_name"))
-	assert.Equal(t, repositoryB, terraform.Output(t, terraformOptions, "second_repository_name"))
-
-	// Validate if the created teams name
-	assert.Equal(t, teamName, terraform.Output(t, terraformOptions, "team_name"))
 }

versions.tf

@@ -3,7 +3,7 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 terraform {
-  required_version = ">= 0.12.20, < 0.14"
+  required_version = ">= 0.12.20, < 0.15"
 
   required_providers {
     github = ">= 2.4, < 4.0"