diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e802fc..4a34825 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - uses: hashicorp/setup-terraform@v1 with: - terraform_version: 0.14.7 + terraform_version: 1.3.7 - name: terraform fmt run: | terraform fmt -check -recursive diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 4a53202..bd0ab0a 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,24 +2,23 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/integrations/github" { - version = "4.26.1" - constraints = "4.26.1" + version = "4.31.0" + constraints = "4.31.0" hashes = [ - "h1:GoveiIP7//ag/hiQKilsHCRrzaOLuVqEMIC+PFqt4WI=", - "zh:106aec70ccc00955282dbb07fc5daae9231db127bb6912c460ab7bbcc83e2497", - "zh:2b9c8ded414a7815ffe79774d428ea12c68ef1fb7b67aa95a9917c5f0e487738", - "zh:6494db79f68f1f220cffcfdf18ce1943c098a643eb610dc6cc8b27f0277069ad", - "zh:705a31d53d3417bdea1cb765fd84e9e958325de0ddd01b43a0c3175734d31098", - "zh:76389591b417d8035d7aa3b9f81883b87c8efa767fcd4968abfb30a2641df1cc", - "zh:7dcb526e515296080f724c3b2bdeb04739a46034ea382a0bd6210436d1904203", - "zh:9878bf61cca2439f32dc290245137b33cb9ca556e68e4bda36899f579e57b3f9", - "zh:9c1aabe76001fca0a16550720787b6635044846787152fb250304c369c415a8e", - "zh:bd22b65a74471589498298c5f3a5e4403b0d4be0812c257195eccc70df2dd561", - "zh:d9f36f76ce57c360bfd1d430712a4c7457fcd72aefc8914a49ba135cffd06615", - "zh:e7d2718706c904faaa935e8112fc1b4750109d070c49feaa2b4df03ebe866428", - "zh:f3eb43d54acd4c8dc0135a45621c74b58676295ac9c640ab9264f160ea0ba614", - "zh:f59490c68239bf1a3e3580be61378d605ed02b7023fb073da1ade7fa784dc674", - "zh:fdf6007b3180ccbdc9875c426f40d5ae7933f6a7b617aa2e0107226074946ea5", + "h1:FkBft5JlVtlcYcEM0CiphlFWgjBFQVziJMwrowuBIoc=", + "zh:07208ecc74804fbdd554830de79627f3e58633fc417b12dc29aafaceae01e427", + "zh:0dca3802a7ea1ba4812c866bf202e62aef6c8995db8856fdb5b4d1d81b505518", + "zh:24e6a56b34b3e0dca6ca0d6f22d0a31dda6a3256713492902c39ce9edd14acbd", + "zh:42e41fa4e61218973615b7e5d564119bb5c728ee40b881539964cd704632d8c0", + "zh:6aa6bb04fdc00c3c762122e96ee7c19abfb8e42dc5d3a720b5767dbb4cfa274d", + "zh:74ea4bbad825eee831d37940760459786460fe492e1b30acb5c91c9edd14a5ea", + "zh:8e170f6d5e46c08fbc3b5ff251075382f75b53a66a83b7b005099fb99ad94f24", + "zh:9164b611e7318e3d08cc84513d3d8c27bd12336a7721a894cb3d346b60286233", + "zh:91d3397f021c5a9fedff36f84635ffc3169224494629bb4a578356a05091e182", + "zh:b061e1529499bf40f8f14c9c8116787dd50f6fd3d64ad38d77cd39db77e98ae9", + "zh:c9daff626f7a55c01db79b6ccc462948bf854d976c73def306ae9ae09e5afe1b", + "zh:ec7e223ae7d6292b8425b7190e801f1098a647d2aee3132761d37fd75cfcfe07", + "zh:f2001b2a2f7049fc74ffe54d7bc48c9dfec80956f468a2c8a550c5071d077dbd", + "zh:f75ec1e71924c50b346bced15883c626f697ffd3ee6c4bb2835e4170fe65215a", ] } - diff --git a/github_repository.tf b/github_repository.tf index f0c75b0..f0df5e4 100644 --- a/github_repository.tf +++ b/github_repository.tf @@ -59,11 +59,12 @@ resource "github_branch_default" "default" { branch = var.default_branch_name } -resource "github_branch_protection_v3" "repository_main" { + +resource "github_branch_protection" "repository_main" { count = var.branch_protection_enabled == true ? 1 : 0 - repository = github_repository.repository.name - branch = var.default_branch_name + repository_id = github_repository.repository.name + pattern = var.default_branch_name enforce_admins = var.enforce_admins required_status_checks { @@ -86,5 +87,7 @@ resource "github_actions_secret" "repository_secret" { repository = github_repository.repository.name secret_name = each.key plaintext_value = each.value + + } diff --git a/terraform.tf b/terraform.tf index 9551168..929377c 100644 --- a/terraform.tf +++ b/terraform.tf @@ -2,7 +2,7 @@ terraform { required_providers { github = { source = "integrations/github" - version = "4.26.1" + version = "4.31.0" } } required_version = ">= 1.0.0"