Skip to content

Commit d929498

Browse files
cunlacunla
authored
Merge branch 'main' into add-user
2 parents a6a01f1 + d138f79 commit d929498

File tree

3 files changed

+68
-62
lines changed

3 files changed

+68
-62
lines changed

‎terraform/resources-repos.tf‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,28 @@ resource "github_repository" "this" {
88

99
for_each = var.repositories
1010

11-
allow_auto_merge = each.value.allow_auto_merge
12-
allow_merge_commit = each.value.allow_merge_commit
13-
merge_commit_title = "MERGE_MESSAGE"
14-
merge_commit_message = "PR_BODY"
15-
allow_rebase_merge = each.value.allow_rebase_merge
16-
allow_squash_merge = each.value.allow_squash_merge
17-
squash_merge_commit_title = "COMMIT_OR_PR_TITLE"
18-
squash_merge_commit_message = "COMMIT_MESSAGES"
19-
allow_update_branch = each.value.allow_update_branch
20-
archive_on_destroy = true
21-
delete_branch_on_merge = each.value.delete_branch_on_merge
22-
description = each.value.description
23-
has_downloads = each.value.has_downloads
24-
has_discussions = each.value.has_discussions
25-
has_issues = true
26-
has_projects = true
27-
has_wiki = each.value.has_wiki
28-
is_template = each.value.is_template
29-
name = each.key
30-
topics = each.value.topics
31-
visibility = each.value.visibility
32-
vulnerability_alerts = true
11+
allow_auto_merge = each.value.allow_auto_merge
12+
allow_merge_commit = each.value.allow_merge_commit
13+
merge_commit_title = each.value.merge_commit_title
14+
merge_commit_message = each.value.merge_commit_message
15+
allow_rebase_merge = each.value.allow_rebase_merge
16+
allow_squash_merge = each.value.allow_squash_merge
17+
squash_merge_commit_title = each.value.squash_merge_commit_title
18+
squash_merge_commit_message = each.value.squash_merge_commit_message
19+
allow_update_branch = each.value.allow_update_branch
20+
archive_on_destroy = true
21+
delete_branch_on_merge = each.value.delete_branch_on_merge
22+
description = each.value.description
23+
has_downloads = each.value.has_downloads
24+
has_discussions = each.value.has_discussions
25+
has_issues = true
26+
has_projects = true
27+
has_wiki = each.value.has_wiki
28+
is_template = each.value.is_template
29+
name = each.key
30+
topics = each.value.topics
31+
visibility = each.value.visibility
32+
vulnerability_alerts = true
3333

3434
dynamic "template" {
3535
for_each = each.value.template != null ? [each.value.template] : []

‎terraform/tfstate.json‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": 4,
33
"terraform_version": "1.9.3",
4-
"serial": 106,
4+
"serial": 121,
55
"lineage": "425397de-8394-a003-8a6c-bce854d9cc53",
66
"outputs": {},
77
"resources": [
@@ -16,7 +16,7 @@
1616
"schema_version": 0,
1717
"attributes": {
1818
"downgrade_on_destroy": null,
19-
"etag": "W/\"6bddefdd485cc3e7d7d71b817620a92ef6a239dd68e1ffc07ed428f79af49ddc\"",
19+
"etag": "W/\"6fd5d8f720014dd48fcf1c46153acfba522b63940c91b59858110623e8398986\"",
2020
"id": "django-commons:Natim",
2121
"role": "member",
2222
"username": "Natim"
@@ -29,7 +29,7 @@
2929
"schema_version": 0,
3030
"attributes": {
3131
"downgrade_on_destroy": null,
32-
"etag": "W/\"4d7841c6aab7ce944dfc02d946e3f1145888796a59cfb28cb1977ab537d7e366\"",
32+
"etag": "W/\"2a0c3f113c3c391dd2e570f3d2c310faa3913c6d3b044e5d1332846e8cb14bdd\"",
3333
"id": "django-commons:Stormheg",
3434
"role": "admin",
3535
"username": "Stormheg"
@@ -42,7 +42,7 @@
4242
"schema_version": 0,
4343
"attributes": {
4444
"downgrade_on_destroy": null,
45-
"etag": "W/\"0d98ef003185335dd007fa3ca1ca67d3d8a54a7e7ba27dbae90c3407643ac83b\"",
45+
"etag": "W/\"a3c10fc75649b3e5e48c8279e7e7c51d1ea69eda1ece022200317e226a312071\"",
4646
"id": "django-commons:cunla",
4747
"role": "admin",
4848
"username": "cunla"
@@ -55,7 +55,7 @@
5555
"schema_version": 0,
5656
"attributes": {
5757
"downgrade_on_destroy": null,
58-
"etag": "W/\"1830da984aeaf0a633c85b2627cb608869421f092d9fb887728b05cd89982d1a\"",
58+
"etag": "W/\"9567d31fa1587885214042bb836419552aa0626b3b12004f06a023e7e4d05b94\"",
5959
"id": "django-commons:gav-fyi",
6060
"role": "member",
6161
"username": "gav-fyi"
@@ -68,7 +68,7 @@
6868
"schema_version": 0,
6969
"attributes": {
7070
"downgrade_on_destroy": null,
71-
"etag": "W/\"24fb076ac584c86eeb0c5e7ec603a9185d3a2d40b416b65f825bf10be8c050ff\"",
71+
"etag": "W/\"120214bdad851e35a35db5f478f95218ad1e9716cc2898d207627ce686451dbc\"",
7272
"id": "django-commons:jcjudkins",
7373
"role": "member",
7474
"username": "jcjudkins"
@@ -81,7 +81,7 @@
8181
"schema_version": 0,
8282
"attributes": {
8383
"downgrade_on_destroy": null,
84-
"etag": "W/\"141fd5e4541af50720cb3d6f8cc0191f26f5518bceaaf92f9ebc01749b540376\"",
84+
"etag": "W/\"472ca67b6a77605e75ce0176d5d1973315336d7953d03deccf27be97c8b9c9a1\"",
8585
"id": "django-commons:joshuadavidthomas",
8686
"role": "member",
8787
"username": "joshuadavidthomas"
@@ -94,7 +94,7 @@
9494
"schema_version": 0,
9595
"attributes": {
9696
"downgrade_on_destroy": false,
97-
"etag": "W/\"6da4c0ad04dc5ff2e82f25a6c570e15bd72bc6e05daf976fbf17eb4636f5848b\"",
97+
"etag": "W/\"bc6c8cd7644606fff4e5e6e4ac9be2980249a8a29f2bfec87fc1be52a0a4c0f8\"",
9898
"id": "django-commons:maerteijn",
9999
"role": "member",
100100
"username": "maerteijn"
@@ -107,7 +107,7 @@
107107
"schema_version": 0,
108108
"attributes": {
109109
"downgrade_on_destroy": null,
110-
"etag": "W/\"cb2003f6c210c7858946e46479b28a510ddca2f64106a2b4e86a8d256c215927\"",
110+
"etag": "W/\"f5c48cbaa30bcc6f24130e870d5b7a17438804f93944a25866e082a806fe408c\"",
111111
"id": "django-commons:matthiask",
112112
"role": "member",
113113
"username": "matthiask"
@@ -120,7 +120,7 @@
120120
"schema_version": 0,
121121
"attributes": {
122122
"downgrade_on_destroy": null,
123-
"etag": "W/\"669d5435881b535771e5e25c0b7500845fea31b3eb3349e307f6881198d5ca4b\"",
123+
"etag": "W/\"90aa34d56320bccba1b230cf83f083741d3b628e4a53dc4b6501e11737de2bb7\"",
124124
"id": "django-commons:nanorepublica",
125125
"role": "member",
126126
"username": "nanorepublica"
@@ -133,7 +133,7 @@
133133
"schema_version": 0,
134134
"attributes": {
135135
"downgrade_on_destroy": null,
136-
"etag": "W/\"ae8a138292059fd499c0044e875de1e3c871b880b96535b722e2b2a6d6a00df9\"",
136+
"etag": "W/\"6cf68db52f17f985b9a194f44f7960f6327a4c4597c5d2046b93a388cecc217c\"",
137137
"id": "django-commons:pfouque",
138138
"role": "member",
139139
"username": "pfouque"
@@ -146,7 +146,7 @@
146146
"schema_version": 0,
147147
"attributes": {
148148
"downgrade_on_destroy": null,
149-
"etag": "W/\"688dc8b5a9b8f987593e77eb2d3fe8d8861dc0fce9b0458b6d7c1581cc3babdd\"",
149+
"etag": "W/\"2771ecea10a1124901f2a8f9eb1b4a682da0d531c514a2f1e04bb45a65297926\"",
150150
"id": "django-commons:priyapahwa",
151151
"role": "member",
152152
"username": "priyapahwa"
@@ -159,7 +159,7 @@
159159
"schema_version": 0,
160160
"attributes": {
161161
"downgrade_on_destroy": null,
162-
"etag": "W/\"08e589e6ff74319709d6dd179eeb9d86cb8d685e059b20e69490407ddfc240f6\"",
162+
"etag": "W/\"c76df4ee75da5c7dfb80147f0105564d2bd971e0d0009c1951de58b8cc265fef\"",
163163
"id": "django-commons:ryancheley",
164164
"role": "admin",
165165
"username": "ryancheley"
@@ -172,7 +172,7 @@
172172
"schema_version": 0,
173173
"attributes": {
174174
"downgrade_on_destroy": null,
175-
"etag": "W/\"3fc5e97f2d799e0e02dc2a98f0729696826e98c2dc36f2187d07bb51ac092a54\"",
175+
"etag": "W/\"82cd5e50d842e40b67e012cc543d511651cc95ef4b1acfc0a2b0d76a004525eb\"",
176176
"id": "django-commons:testSchilling",
177177
"role": "member",
178178
"username": "testSchilling"
@@ -185,7 +185,7 @@
185185
"schema_version": 0,
186186
"attributes": {
187187
"downgrade_on_destroy": null,
188-
"etag": "W/\"243b05b7a75268aec1bde3c541b2f20799076e7579f6a6196ec5d6a15c555cea\"",
188+
"etag": "W/\"3e0f1264752f25dbf6ca43ecb381b03dc8623251cedbcf0e900dcdb7f3d744a0\"",
189189
"id": "django-commons:tim-schilling",
190190
"role": "admin",
191191
"username": "tim-schilling"
@@ -198,7 +198,7 @@
198198
"schema_version": 0,
199199
"attributes": {
200200
"downgrade_on_destroy": null,
201-
"etag": "W/\"75b58b81b087d561124eaa9cc36e231a5d43fd5daeb21b95b0b8758c2afa5abd\"",
201+
"etag": "W/\"0fb7a97ee78d9b4282447813247a4ff786b4628597f2cf7dcc6c195a01835c61\"",
202202
"id": "django-commons:williln",
203203
"role": "admin",
204204
"username": "williln"
@@ -249,7 +249,7 @@
249249
"default_branch": "main",
250250
"delete_branch_on_merge": true,
251251
"description": "A Special Repository.",
252-
"etag": "W/\"5a0c60c08fe82868cb7686e70ebc7af0da27c1fc9f1e0dbf9bf6ee06799a3a49\"",
252+
"etag": "W/\"6e8d1b409822b71df44cf88ea993127bf3178aea2dedf34fe5079fef96216de5\"",
253253
"full_name": "django-commons/.github",
254254
"git_clone_url": "git://github.com/django-commons/.github.git",
255255
"gitignore_template": null,
@@ -266,7 +266,7 @@
266266
"is_template": false,
267267
"license_template": null,
268268
"merge_commit_message": "PR_BODY",
269-
"merge_commit_title": "MERGE_MESSAGE",
269+
"merge_commit_title": "PR_TITLE",
270270
"name": ".github",
271271
"node_id": "R_kgDOLkyRSQ",
272272
"pages": [],
@@ -288,8 +288,8 @@
288288
]
289289
}
290290
],
291-
"squash_merge_commit_message": "COMMIT_MESSAGES",
292-
"squash_merge_commit_title": "COMMIT_OR_PR_TITLE",
291+
"squash_merge_commit_message": "PR_BODY",
292+
"squash_merge_commit_title": "PR_TITLE",
293293
"ssh_clone_url": "git@github.com:django-commons/.github.git",
294294
"svn_url": "https://github.com/django-commons/.github",
295295
"template": [],
@@ -316,7 +316,7 @@
316316
"default_branch": "main",
317317
"delete_branch_on_merge": true,
318318
"description": "The controls for managing Django Commons projects",
319-
"etag": "W/\"f21535f354352d4b0866f09e46da800223b87f556d5273c34d4313beb23f79f8\"",
319+
"etag": "W/\"e198948ed435bc3714c6d35f4c81bde66977c572a9ae886effe8a3a0a71927ad\"",
320320
"full_name": "django-commons/controls",
321321
"git_clone_url": "git://github.com/django-commons/controls.git",
322322
"gitignore_template": null,
@@ -333,7 +333,7 @@
333333
"is_template": false,
334334
"license_template": null,
335335
"merge_commit_message": "PR_BODY",
336-
"merge_commit_title": "MERGE_MESSAGE",
336+
"merge_commit_title": "PR_TITLE",
337337
"name": "controls",
338338
"node_id": "R_kgDOLkDK8g",
339339
"pages": [],
@@ -355,8 +355,8 @@
355355
]
356356
}
357357
],
358-
"squash_merge_commit_message": "COMMIT_MESSAGES",
359-
"squash_merge_commit_title": "COMMIT_OR_PR_TITLE",
358+
"squash_merge_commit_message": "PR_BODY",
359+
"squash_merge_commit_title": "PR_TITLE",
360360
"ssh_clone_url": "git@github.com:django-commons/controls.git",
361361
"svn_url": "https://github.com/django-commons/controls",
362362
"template": [],
@@ -383,7 +383,7 @@
383383
"default_branch": "main",
384384
"delete_branch_on_merge": true,
385385
"description": "A sample project to test things out",
386-
"etag": "W/\"0eebf545a46a1bb36ece7cef57f8d80a85c4c015f0ecbf5270b57c9a9af46f1b\"",
386+
"etag": "W/\"2b033ab9a5ea7736097c8cdf1b49b4744ef00ad68525ebe0faa0756cae00e4d1\"",
387387
"full_name": "django-commons/django-commons-playground",
388388
"git_clone_url": "git://github.com/django-commons/django-commons-playground.git",
389389
"gitignore_template": null,
@@ -400,7 +400,7 @@
400400
"is_template": false,
401401
"license_template": null,
402402
"merge_commit_message": "PR_BODY",
403-
"merge_commit_title": "MERGE_MESSAGE",
403+
"merge_commit_title": "PR_TITLE",
404404
"name": "django-commons-playground",
405405
"node_id": "R_kgDOLkANrg",
406406
"pages": [],
@@ -422,8 +422,8 @@
422422
]
423423
}
424424
],
425-
"squash_merge_commit_message": "COMMIT_MESSAGES",
426-
"squash_merge_commit_title": "COMMIT_OR_PR_TITLE",
425+
"squash_merge_commit_message": "PR_BODY",
426+
"squash_merge_commit_title": "PR_TITLE",
427427
"ssh_clone_url": "git@github.com:django-commons/django-commons-playground.git",
428428
"svn_url": "https://github.com/django-commons/django-commons-playground",
429429
"template": [],
@@ -450,7 +450,7 @@
450450
"default_branch": "main",
451451
"delete_branch_on_merge": true,
452452
"description": "Membership repository for the django-commons organization.",
453-
"etag": "W/\"6c755c191beaa31c597f04acf81d7860da7806f9518e7fff801e308e73e99d44\"",
453+
"etag": "W/\"94e6602af3cda921560b63edbd52aa061219cdf59e4c0f8b43a9c1d0b5d278f2\"",
454454
"full_name": "django-commons/membership",
455455
"git_clone_url": "git://github.com/django-commons/membership.git",
456456
"gitignore_template": null,
@@ -467,7 +467,7 @@
467467
"is_template": false,
468468
"license_template": null,
469469
"merge_commit_message": "PR_BODY",
470-
"merge_commit_title": "MERGE_MESSAGE",
470+
"merge_commit_title": "PR_TITLE",
471471
"name": "membership",
472472
"node_id": "R_kgDOLklIpA",
473473
"pages": [],
@@ -489,8 +489,8 @@
489489
]
490490
}
491491
],
492-
"squash_merge_commit_message": "COMMIT_MESSAGES",
493-
"squash_merge_commit_title": "COMMIT_OR_PR_TITLE",
492+
"squash_merge_commit_message": "PR_BODY",
493+
"squash_merge_commit_title": "PR_TITLE",
494494
"ssh_clone_url": "git@github.com:django-commons/membership.git",
495495
"svn_url": "https://github.com/django-commons/membership",
496496
"template": [],
@@ -516,7 +516,7 @@
516516
"attributes": {
517517
"create_default_maintainer": false,
518518
"description": "django-commons administrators",
519-
"etag": "W/\"48d9dfe6bea4ca491be0c1c5475e3195d56aeeaf28f87faa8fdc88c4417bc9cf\"",
519+
"etag": "W/\"a260a69e8f0ac71aae9fd15b98f318640adf30e9174af462aa734ca1872fadf6\"",
520520
"id": "9763562",
521521
"ldap_dn": "",
522522
"members_count": 5,
@@ -537,7 +537,7 @@
537537
"attributes": {
538538
"create_default_maintainer": false,
539539
"description": "django-commons security team",
540-
"etag": "W/\"771f934df9368b01faf230ad1e9f94f1578bf2d0f13b3f7b457f548969752170\"",
540+
"etag": "W/\"e7196c4655cc4c85656aed02fa84ae029b1bed9feb097ee10fe469c9cad2bfff\"",
541541
"id": "10641823",
542542
"ldap_dn": "",
543543
"members_count": 2,
@@ -566,7 +566,7 @@
566566
"attributes": {
567567
"create_default_maintainer": false,
568568
"description": "Admin team for the django-commons-playground repository",
569-
"etag": "W/\"2ebdfdb6ce050a64492ba5b464fd5a9cfdf71fc84fe42147722e22e7b2c53d76\"",
569+
"etag": "W/\"6b8cb5f8172fafde445ff434226bcf0075cfbcb78757c3ecf45a11ce07ba6566\"",
570570
"id": "9757650",
571571
"ldap_dn": "",
572572
"members_count": 5,
@@ -598,7 +598,7 @@
598598
"attributes": {
599599
"create_default_maintainer": false,
600600
"description": "Committers team for the django-commons-playground repository",
601-
"etag": "W/\"7a225b3af7ad39a1cd4b14291a082767f146dc2a0cbd1e59422e22be3e48164f\"",
601+
"etag": "W/\"eb63b08b8f7272cb4ddc3056d26613fffaf9d792cc91f5d9f953c07c18f5778c\"",
602602
"id": "9757668",
603603
"ldap_dn": "",
604604
"members_count": 1,
@@ -630,7 +630,7 @@
630630
"attributes": {
631631
"create_default_maintainer": false,
632632
"description": "Main team for the django-commons-playground repository",
633-
"etag": "W/\"2511a591bdb9c45f8814ce01b3811d3df7b6d64c9df8e22537b2421eac2ba7a1\"",
633+
"etag": "W/\"c0759d17499a3e6ef05253e716caeb165823b4aaa7baad6d75a5f69b378c33c2\"",
634634
"id": "9757678",
635635
"ldap_dn": "",
636636
"members_count": 6,
@@ -842,7 +842,7 @@
842842
"index_key": "django-commons-playground",
843843
"schema_version": 0,
844844
"attributes": {
845-
"etag": "W/\"f3f2c3292d90b378cb14ac13c5c91d7b5a371a0247d19cd517473fbd00524ab7\"",
845+
"etag": "W/\"1d64f0e65e2f687d6d6e42d2e840afaf180f412e41cdb3d186b18b454d8bf753\"",
846846
"id": "9757650:django-commons-playground",
847847
"permission": "admin",
848848
"repository": "django-commons-playground",
@@ -867,7 +867,7 @@
867867
"index_key": "django-commons-playground",
868868
"schema_version": 0,
869869
"attributes": {
870-
"etag": "W/\"fa6687687849d31f400cf3efe59388f4720050ddf8cb8ac977cbf0aac2550d21\"",
870+
"etag": "W/\"9e46b89963f17bd4ed0599f7810012f34d0c85996509949311d86cefb8ae8d0c\"",
871871
"id": "9757668:django-commons-playground",
872872
"permission": "maintain",
873873
"repository": "django-commons-playground",
@@ -892,7 +892,7 @@
892892
"index_key": "django-commons-playground",
893893
"schema_version": 0,
894894
"attributes": {
895-
"etag": "W/\"4def4b5914ffd1ab0f21e8982a925ccb781eaec2132e3ebb3613036756e9e571\"",
895+
"etag": "W/\"627cb78d48f172f21bc73e89090788dc3fe62cd20edecb0192c85871d1d7f0ad\"",
896896
"id": "9757678:django-commons-playground",
897897
"permission": "triage",
898898
"repository": "django-commons-playground",

‎terraform/variables.tf‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ variable "repositories" {
4343
committers = optional(set(string), [])
4444
# Members of the repository's committers and repository teams. Have write permissions
4545
members = optional(set(string), []) # Members of the repository team. Have triage permissions
46+
47+
# The following are valid combinations for the merge commit title and message: PR_TITLE and PR_BODY, PR_TITLE and BLANK, MERGE_MESAGE and PR_TITLE. (invalid_merge_commit_setting_combo)}]
48+
merge_commit_title = optional(string, "PR_TITLE")
49+
merge_commit_message = optional(string, "PR_BODY")
50+
squash_merge_commit_title = optional(string, "PR_TITLE")
51+
squash_merge_commit_message = optional(string, "PR_BODY")
4652
}))
4753
}
4854

0 commit comments

Comments
 (0)