Add support for configuring default squash and merge commit titles and messages by soerenmartius · Pull Request #137 · mineiros-io/terraform-github-repository

soerenmartius · 2022-10-25T18:40:17Z

No description provided.

mariux

lgtm

mariux

please fix tests
please fix commit messages

waxb

lgtm

dismissed

soerenmartius · 2022-11-02T11:52:59Z

@mariux is this good to go?

dismissed

mariux

defaults added.. please also adjust docs..

soerenmartius · 2022-11-04T14:58:19Z

@mariux the tests are failing after applying your provided suggestions ... not a priority though https://github.com/mineiros-io/terraform-github-repository/actions/runs/3394710192/jobs/5643646371

…tle and messages

mariux

lgtm

mariux · 2022-11-06T14:24:10Z

+  squash_merge_commit_title   = local.allow_squash_merge ? var.squash_merge_commit_title == null ? try(var.defaults.squash_merge_commit_title, null) : var.squash_merge_commit_title : null
+  squash_merge_commit_message = local.allow_squash_merge ? var.squash_merge_commit_title == null ? try(var.defaults.squash_merge_commit_title, null) : var.squash_merge_commit_title : null
+  merge_commit_title          = local.allow_merge_commit ? var.merge_commit_title == null ? try(var.defaults.merge_commit_title, null) : var.merge_commit_title : null
+  merge_commit_message        = local.allow_merge_commit ? var.merge_commit_message == null ? try(var.merge_commit_message, null) : var.merge_commit_message : null
+


there is no condition when setting the fields.. we can always set them.

nope that's not correct, as you can see in this test run, allow_squash_merge xor allow_merge_commit need to be set to true for setting those values otherwise the API returns an error https://github.com/mineiros-io/terraform-github-repository/actions/runs/3394517816/jobs/5643205775#step:4:1092

the error is based on typos in the variable names.

Not sure if that's correct, did you see the error

Error: POST https://api.github.com/orgs/***/repos: 422 Repository creation failed. [{Resource:Repository Field: Code:custom Message:Sorry, you need to allow the squash merge strategy in order to set the default squash commit message title or message. (no_squash_merge_strategy)}]

comitted suggested changes to test... works ;) .... conflicts would need to be resolves and default set to null again... or remove the complex default handling as it's deprectaed now anyway.. ;)

anthr76 · 2022-12-29T17:33:13Z

Is this ready to be merged?

gaima8 · 2023-04-12T09:52:09Z

Is this PR still actually a draft, or once conflicts are resolved, is it ready for approval and merging?
Githubs default squash strategy grinds my gears.

Thanks

bodgit · 2023-07-27T13:02:09Z

Would be good to get this over the line. I can't even manually tweak the repository settings as the current release of this module resets the squash settings back to the defaults.

marcjay · 2023-08-21T16:52:23Z

I think this PR might be ready to review?

marko-fabry · 2023-10-09T10:20:04Z

Hello all! What is the ETA on merging this one? We forked it for the time being just for this PR and it seems to work as expected.

soerenmartius force-pushed the soerenmartius/commit-titles branch 5 times, most recently from 023855a to 3426b72 Compare October 25, 2022 20:59

soerenmartius marked this pull request as ready for review October 25, 2022 20:59

soerenmartius requested review from a team and mariux as code owners October 25, 2022 20:59

soerenmartius force-pushed the soerenmartius/commit-titles branch from f104e90 to 2c7fb4d Compare October 25, 2022 21:14

soerenmartius mentioned this pull request Oct 25, 2022

Add support for use_squash_pr_title_as_default #136

Open

mariux approved these changes Oct 25, 2022

View reviewed changes

mariux previously requested changes Oct 25, 2022

View reviewed changes

mariux marked this pull request as draft October 25, 2022 22:43

soerenmartius force-pushed the soerenmartius/commit-titles branch 3 times, most recently from 4300586 to 3ac0c9f Compare October 26, 2022 02:53

soerenmartius changed the title ~~Add support for configuring defailt squash and merge commit titles and messages~~ Add support for configuring default squash and merge commit titles and messages Oct 26, 2022

soerenmartius force-pushed the soerenmartius/commit-titles branch 6 times, most recently from a37c872 to 8104872 Compare October 26, 2022 14:00

soerenmartius marked this pull request as ready for review October 26, 2022 15:57

soerenmartius requested review from a team and mariux October 26, 2022 16:20

waxb previously approved these changes Nov 1, 2022

View reviewed changes

mariux previously requested changes Nov 2, 2022

View reviewed changes

Comment thread README.md Outdated

Comment thread README.md Outdated

mariux requested changes Nov 3, 2022

View reviewed changes

Comment thread variables.tf Outdated

Comment thread variables.tf Outdated

Comment thread variables.tf Outdated

Comment thread variables.tf Outdated

mariux requested changes Nov 3, 2022

View reviewed changes

Comment thread CHANGELOG.md Outdated

soerenmartius force-pushed the soerenmartius/commit-titles branch 2 times, most recently from 0e7c90a to 5a49d0b Compare November 4, 2022 14:14

soerenmartius requested a review from mariux November 4, 2022 14:14

soerenmartius force-pushed the soerenmartius/commit-titles branch 4 times, most recently from 621847c to 76b9485 Compare November 4, 2022 14:43

soerenmartius force-pushed the soerenmartius/commit-titles branch from 76b9485 to 90b27c1 Compare November 4, 2022 16:16

soerenmartius added 4 commits November 4, 2022 10:16

feat!: add support for configuring default squash and merge commit ti…

3be6354

…tle and messages

feat: add support for ignore_vulnerability_alerts_during_read

854465c

docs: add missing default options to README.md

8b85b12

chore: prepare v0.18.0 release

bcda3f9

soerenmartius force-pushed the soerenmartius/commit-titles branch from 90b27c1 to bcda3f9 Compare November 4, 2022 16:16

mariux closed this Nov 6, 2022

mariux reopened this Nov 6, 2022

mariux approved these changes Nov 6, 2022

View reviewed changes

mariux marked this pull request as draft November 6, 2022 14:12

mariux requested changes Nov 6, 2022

View reviewed changes

Comment thread main.tf Outdated

soerenmartius requested a review from mariux November 6, 2022 16:19

fix: squash commit message

fe7c4a9

Conversation

soerenmartius commented Oct 25, 2022

Uh oh!

mariux left a comment

Choose a reason for hiding this comment

Uh oh!

mariux left a comment

Choose a reason for hiding this comment

Uh oh!

waxb left a comment

Choose a reason for hiding this comment

Uh oh!

soerenmartius commented Nov 2, 2022

Uh oh!

Uh oh!

Uh oh!

mariux left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

soerenmartius commented Nov 4, 2022

Uh oh!

mariux left a comment

Choose a reason for hiding this comment

Uh oh!

mariux Nov 6, 2022

Choose a reason for hiding this comment

Uh oh!

soerenmartius Nov 6, 2022

Choose a reason for hiding this comment

Uh oh!

mariux Nov 6, 2022

Choose a reason for hiding this comment

Uh oh!

soerenmartius Nov 6, 2022

Choose a reason for hiding this comment

Uh oh!

mariux Nov 6, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

anthr76 commented Dec 29, 2022

Uh oh!

gaima8 commented Apr 12, 2023

Uh oh!

bodgit commented Jul 27, 2023

Uh oh!

marcjay commented Aug 21, 2023

Uh oh!

marko-fabry commented Oct 9, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

marko-fabry commented Oct 9, 2023 •

edited

Loading