Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BREAKING: remove v3 and deprecations #168

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ jobs:
name: Static Analysis
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Run pre-commit
run: make test/docker/pre-commit
uses: docker://ghcr.io/antonbabenko/pre-commit-terraform:latest

unit-tests:
needs: pre-commit
runs-on: ubuntu-latest
name: Unit Tests
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Check for Terraform file changes
uses: getsentry/paths-filter@v2
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/mineiros-io/pre-commit-hooks
rev: v0.4.1
rev: v0.5.1
hooks:
- id: terraform-fmt
- id: terraform-validate
Expand Down
2 changes: 1 addition & 1 deletion examples/public-repository/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module "repository" {

required_status_checks = {
strict = true
contexts = ["ci/travis"]
checks = ["ci/travis"]
}

required_pull_request_reviews = {
Expand Down
18 changes: 7 additions & 11 deletions examples/public-repository/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

module "repository" {
source = "mineiros-io/repository/github"
version = "~> 0.13.0"
source = "../.."

module_depends_on = [
module.team
Expand All @@ -24,7 +23,6 @@ module "repository" {
allow_rebase_merge = false
allow_squash_merge = false
allow_auto_merge = true
has_downloads = false
auto_init = true
gitignore_template = "Terraform"
license_template = "mit"
Expand All @@ -47,16 +45,15 @@ module "repository" {

admin_collaborators = ["terraform-test-user-1"]

branch_protections = [
{
branch = "main"
branch_protections = {
"main" = {
enforce_admins = true
require_conversation_resolution = true
require_signed_commits = true

required_status_checks = {
strict = true
contexts = ["ci/travis"]
strict = true
checks = ["ci/travis"]
}

required_pull_request_reviews = {
Expand All @@ -70,16 +67,15 @@ module "repository" {
teams = [module.team.name]
}
}
]
}
}

# ---------------------------------------------------------------------------------------------------------------------
# TEAM
# ---------------------------------------------------------------------------------------------------------------------

module "team" {
source = "mineiros-io/team/github"
version = "~> 0.8.0"
source = "github.com/kevcube/terraform-github-team?ref=a0b2c37"

name = "DevOps"
description = "The DevOps Team"
Expand Down
4 changes: 2 additions & 2 deletions examples/public-repository/provider.tf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
provider "github" {}

terraform {
required_version = "~> 1.0"
required_version = "~> 1.7"

required_providers {
github = {
source = "integrations/github"
version = "~> 4.0"
version = "~> 6"
}
}
}
Loading