BlueGit

timfa bluegit

Merged

Lege groepen verwijderen

!101 · merged 3 weeks ago

timfa wants to merge 1 commit from cursor/group-delete into stage

Pipeline

#443 Passed
Stage: build

Reviews

  • No reviews yet.

Merged by timfa on 27 October 2026 bdc89df4

Overview Commits 1 Pipelines 2 Changes 11

Changes

11 files changed +384 −97
internal/i18n/catalog_secret.go +132 −96
@@ -8,109 +8,145 @@ func init() {
8 8 }
9 9
10 10 var secretEN = map[string]string{
11 "err.secretForm": "secret name %q must match [A-Za-z_][A-Za-z0-9_]*",
12 "err.secretExists": "secret %q already exists",
13 "err.secretHidden": "secret %q is invisible and cannot be viewed or edited",
14 "err.secretVisible": "secret %q is visible; edit it instead of replacing it",
15 "wh.tokenHint": "Choose a secret. The value stays hidden.",
16 "wh.noSecret": "None",
17 "wh.secretSearch": "Search secrets",
18 "wh.src.repo": "Repository %s",
19 "wh.src.group": "Group %s",
20 "wh.edit": "Edit webhook",
21 "wh.update": "Save changes",
22 "wh.events": "Events",
23 "wh.flags": "Flags",
24 "wh.actions": "Actions",
25 "action.edit": "Edit",
26 "action.show": "Show",
27 "action.replace": "Replace",
28 "set.invisible": "Invisible",
29 "set.expand": "Expand variables in the value ($NAME)",
30 "set.expandPill": "Variable expansion",
31 "set.expandTip": "Off by default. When on, $NAME and ${NAME} in the value are replaced at job time by other variables (group, project, job, CI_*). Write $$ for a literal $. Unknown names stay as written, like GitLab. Cycles are not expanded.",
32 "set.invisibleHint": "An invisible secret cannot be viewed or edited afterwards. You can only delete it or replace the value.",
33 "set.valuesHidden": "Values stay hidden until you choose Show. An invisible secret cannot be shown.",
34 "flash.secretReplaced": "Secret replaced",
11 "err.secretForm": "secret name %q must match [A-Za-z_][A-Za-z0-9_]*",
12 "err.secretExists": "secret %q already exists",
13 "err.secretHidden": "secret %q is invisible and cannot be viewed or edited",
14 "err.secretVisible": "secret %q is visible; edit it instead of replacing it",
15 "wh.tokenHint": "Choose a secret. The value stays hidden.",
16 "wh.noSecret": "None",
17 "wh.secretSearch": "Search secrets",
18 "wh.src.repo": "Repository %s",
19 "wh.src.group": "Group %s",
20 "wh.edit": "Edit webhook",
21 "wh.update": "Save changes",
22 "wh.events": "Events",
23 "wh.flags": "Flags",
24 "wh.actions": "Actions",
25 "action.edit": "Edit",
26 "action.show": "Show",
27 "action.replace": "Replace",
28 "set.invisible": "Invisible",
29 "set.expand": "Expand variables in the value ($NAME)",
30 "set.expandPill": "Variable expansion",
31 "set.expandTip": "Off by default. When on, $NAME and ${NAME} in the value are replaced at job time by other variables (group, project, job, CI_*). Write $$ for a literal $. Unknown names stay as written, like GitLab. Cycles are not expanded.",
32 "gdel.title": "Delete group",
33 "gdel.button": "Delete group",
34 "gdel.tip": "Only possible when the group has no repositories left. Move or delete them first; there is no force option. Members, invitations, group secrets, webhooks and approval rules are removed and group runners are revoked. This cannot be undone.",
35 "gdel.lead": "This group is empty and can be deleted.",
36 "gdel.blocked": "This group still has %d repositories. Move or delete them first.",
37 "gdel.confirm": "Delete group %s permanently? Members, group secrets and webhooks go with it.",
38 "err.confirmGroupDelete": "type the group name or path to delete it",
39 "err.groupNotEmpty": "the group still has %d repositories; move or delete them first",
40 "flash.groupDeleted": "Group deleted",
41 "set.invisibleHint": "An invisible secret cannot be viewed or edited afterwards. You can only delete it or replace the value.",
42 "set.valuesHidden": "Values stay hidden until you choose Show. An invisible secret cannot be shown.",
43 "flash.secretReplaced": "Secret replaced",
35 44 }
36 45
37 46 var secretNL = map[string]string{
38 "err.secretForm": "geheimnaam %q moet [A-Za-z_][A-Za-z0-9_]* zijn",
39 "err.secretExists": "geheim %q bestaat al",
40 "err.secretHidden": "geheim %q is onzichtbaar en kan niet bekeken of bewerkt worden",
41 "err.secretVisible": "geheim %q is zichtbaar; bewerk het in plaats van het te vervangen",
42 "wh.tokenHint": "Kies een geheim. De waarde blijft verborgen.",
43 "wh.noSecret": "Geen",
44 "wh.secretSearch": "Zoek een geheim",
45 "wh.src.repo": "Repository %s",
46 "wh.src.group": "Groep %s",
47 "wh.edit": "Webhook bewerken",
48 "wh.update": "Wijzigingen opslaan",
49 "wh.events": "Gebeurtenissen",
50 "wh.flags": "Vlaggen",
51 "wh.actions": "Acties",
52 "action.edit": "Bewerken",
53 "action.show": "Toon",
54 "action.replace": "Vervangen",
55 "set.invisible": "Onzichtbaar",
56 "set.expand": "Variabelen in de waarde uitbreiden ($NAAM)",
57 "set.expandPill": "Variabelen uitbreiden",
58 "set.expandTip": "Standaard uit. Aan: $NAAM en ${NAAM} in de waarde worden bij de job vervangen door andere variabelen (groep, project, job, CI_*). Schrijf $$ voor een letterlijke $. Onbekende namen blijven staan zoals geschreven, net als bij GitLab. Kringverwijzingen worden niet uitgebreid.",
59 "set.invisibleHint": "Een onzichtbaar geheim is daarna niet meer te bekijken of te bewerken. Je kunt het alleen verwijderen of de waarde vervangen.",
60 "set.valuesHidden": "Waarden blijven verborgen tot je Toon kiest. Een onzichtbaar geheim kan niet getoond worden.",
61 "flash.secretReplaced": "Geheim vervangen",
47 "err.secretForm": "geheimnaam %q moet [A-Za-z_][A-Za-z0-9_]* zijn",
48 "err.secretExists": "geheim %q bestaat al",
49 "err.secretHidden": "geheim %q is onzichtbaar en kan niet bekeken of bewerkt worden",
50 "err.secretVisible": "geheim %q is zichtbaar; bewerk het in plaats van het te vervangen",
51 "wh.tokenHint": "Kies een geheim. De waarde blijft verborgen.",
52 "wh.noSecret": "Geen",
53 "wh.secretSearch": "Zoek een geheim",
54 "wh.src.repo": "Repository %s",
55 "wh.src.group": "Groep %s",
56 "wh.edit": "Webhook bewerken",
57 "wh.update": "Wijzigingen opslaan",
58 "wh.events": "Gebeurtenissen",
59 "wh.flags": "Vlaggen",
60 "wh.actions": "Acties",
61 "action.edit": "Bewerken",
62 "action.show": "Toon",
63 "action.replace": "Vervangen",
64 "set.invisible": "Onzichtbaar",
65 "set.expand": "Variabelen in de waarde uitbreiden ($NAAM)",
66 "set.expandPill": "Variabelen uitbreiden",
67 "set.expandTip": "Standaard uit. Aan: $NAAM en ${NAAM} in de waarde worden bij de job vervangen door andere variabelen (groep, project, job, CI_*). Schrijf $$ voor een letterlijke $. Onbekende namen blijven staan zoals geschreven, net als bij GitLab. Kringverwijzingen worden niet uitgebreid.",
68 "gdel.title": "Groep verwijderen",
69 "gdel.button": "Groep verwijderen",
70 "gdel.tip": "Kan alleen als de groep geen repositories meer heeft. Verplaats of verwijder die eerst; er is geen force-optie. Leden, uitnodigingen, groepsgeheimen, webhooks en goedkeuringsregels worden verwijderd en groepsrunners ingetrokken. Dit is niet terug te draaien.",
71 "gdel.lead": "Deze groep is leeg en kan verwijderd worden.",
72 "gdel.blocked": "Deze groep bevat nog %d repositories. Verplaats of verwijder die eerst.",
73 "gdel.confirm": "Groep %s definitief verwijderen? Leden, groepsgeheimen en webhooks gaan mee.",
74 "err.confirmGroupDelete": "typ de groepsnaam of het pad om te verwijderen",
75 "err.groupNotEmpty": "de groep bevat nog %d repositories; verplaats of verwijder die eerst",
76 "flash.groupDeleted": "Groep verwijderd",
77 "set.invisibleHint": "Een onzichtbaar geheim is daarna niet meer te bekijken of te bewerken. Je kunt het alleen verwijderen of de waarde vervangen.",
78 "set.valuesHidden": "Waarden blijven verborgen tot je Toon kiest. Een onzichtbaar geheim kan niet getoond worden.",
79 "flash.secretReplaced": "Geheim vervangen",
62 80 }
63 81
64 82 var secretDE = map[string]string{
65 "err.secretForm": "Geheimnisname %q muss [A-Za-z_][A-Za-z0-9_]* entsprechen",
66 "err.secretHidden": "Geheimnis %q ist unsichtbar und kann nicht angesehen oder bearbeitet werden",
67 "err.secretExists": "Geheimnis %q existiert bereits",
68 "err.secretVisible": "Geheimnis %q ist sichtbar; bearbeite es, statt es zu ersetzen",
69 "wh.tokenHint": "Wähle ein Geheimnis. Der Wert bleibt verborgen.",
70 "wh.noSecret": "Keins",
71 "wh.secretSearch": "Geheimnis suchen",
72 "wh.src.repo": "Repository %s",
73 "wh.src.group": "Gruppe %s",
74 "wh.edit": "Webhook bearbeiten",
75 "wh.update": "Änderungen speichern",
76 "wh.events": "Ereignisse",
77 "wh.flags": "Merkmale",
78 "wh.actions": "Aktionen",
79 "action.edit": "Bearbeiten",
80 "action.show": "Anzeigen",
81 "action.replace": "Ersetzen",
82 "set.invisible": "Unsichtbar",
83 "set.expand": "Variablen im Wert erweitern ($NAME)",
84 "set.expandPill": "Variablenerweiterung",
85 "set.expandTip": "Standardmäßig aus. Wenn an, werden $NAME und ${NAME} im Wert zur Jobzeit durch andere Variablen ersetzt (Gruppe, Projekt, Job, CI_*). $$ ergibt ein wörtliches $. Unbekannte Namen bleiben unverändert, wie bei GitLab. Zyklen werden nicht erweitert.",
86 "set.invisibleHint": "Ein unsichtbares Geheimnis kann danach nicht mehr angesehen oder bearbeitet werden. Du kannst es nur löschen oder den Wert ersetzen.",
87 "set.valuesHidden": "Werte bleiben verborgen, bis du Anzeigen wählst. Ein unsichtbares Geheimnis kann nicht angezeigt werden.",
88 "flash.secretReplaced": "Geheimnis ersetzt",
83 "err.secretForm": "Geheimnisname %q muss [A-Za-z_][A-Za-z0-9_]* entsprechen",
84 "err.secretHidden": "Geheimnis %q ist unsichtbar und kann nicht angesehen oder bearbeitet werden",
85 "err.secretExists": "Geheimnis %q existiert bereits",
86 "err.secretVisible": "Geheimnis %q ist sichtbar; bearbeite es, statt es zu ersetzen",
87 "wh.tokenHint": "Wähle ein Geheimnis. Der Wert bleibt verborgen.",
88 "wh.noSecret": "Keins",
89 "wh.secretSearch": "Geheimnis suchen",
90 "wh.src.repo": "Repository %s",
91 "wh.src.group": "Gruppe %s",
92 "wh.edit": "Webhook bearbeiten",
93 "wh.update": "Änderungen speichern",
94 "wh.events": "Ereignisse",
95 "wh.flags": "Merkmale",
96 "wh.actions": "Aktionen",
97 "action.edit": "Bearbeiten",
98 "action.show": "Anzeigen",
99 "action.replace": "Ersetzen",
100 "set.invisible": "Unsichtbar",
101 "set.expand": "Variablen im Wert erweitern ($NAME)",
102 "set.expandPill": "Variablenerweiterung",
103 "set.expandTip": "Standardmäßig aus. Wenn an, werden $NAME und ${NAME} im Wert zur Jobzeit durch andere Variablen ersetzt (Gruppe, Projekt, Job, CI_*). $$ ergibt ein wörtliches $. Unbekannte Namen bleiben unverändert, wie bei GitLab. Zyklen werden nicht erweitert.",
104 "gdel.title": "Gruppe löschen",
105 "gdel.button": "Gruppe löschen",
106 "gdel.tip": "Nur möglich, wenn die Gruppe keine Repositories mehr hat. Verschiebe oder lösche sie zuerst; es gibt keine Force-Option. Mitglieder, Einladungen, Gruppengeheimnisse, Webhooks und Freigaberegeln werden entfernt, Gruppenrunner widerrufen. Das lässt sich nicht rückgängig machen.",
107 "gdel.lead": "Diese Gruppe ist leer und kann gelöscht werden.",
108 "gdel.blocked": "Diese Gruppe enthält noch %d Repositories. Verschiebe oder lösche sie zuerst.",
109 "gdel.confirm": "Gruppe %s endgültig löschen? Mitglieder, Gruppengeheimnisse und Webhooks werden mitgelöscht.",
110 "err.confirmGroupDelete": "tippe den Gruppennamen oder Pfad, um zu löschen",
111 "err.groupNotEmpty": "die Gruppe enthält noch %d Repositories; verschiebe oder lösche sie zuerst",
112 "flash.groupDeleted": "Gruppe gelöscht",
113 "set.invisibleHint": "Ein unsichtbares Geheimnis kann danach nicht mehr angesehen oder bearbeitet werden. Du kannst es nur löschen oder den Wert ersetzen.",
114 "set.valuesHidden": "Werte bleiben verborgen, bis du Anzeigen wählst. Ein unsichtbares Geheimnis kann nicht angezeigt werden.",
115 "flash.secretReplaced": "Geheimnis ersetzt",
89 116 }
90 117
91 118 var secretFR = map[string]string{
92 "err.secretForm": "le nom de secret %q doit correspondre à [A-Za-z_][A-Za-z0-9_]*",
93 "err.secretExists": "le secret %q existe déjà",
94 "err.secretHidden": "le secret %q est invisible et ne peut pas être consulté ni modifié",
95 "err.secretVisible": "le secret %q est visible ; modifie-le au lieu de le remplacer",
96 "wh.tokenHint": "Choisis un secret. La valeur reste cachée.",
97 "wh.noSecret": "Aucun",
98 "wh.secretSearch": "Chercher un secret",
99 "wh.src.repo": "Dépôt %s",
100 "wh.src.group": "Groupe %s",
101 "wh.edit": "Modifier le webhook",
102 "wh.update": "Enregistrer les modifications",
103 "wh.events": "Événements",
104 "wh.flags": "Drapeaux",
105 "wh.actions": "Actions",
106 "action.edit": "Modifier",
107 "action.show": "Afficher",
108 "action.replace": "Remplacer",
109 "set.invisible": "Invisible",
110 "set.expand": "Développer les variables dans la valeur ($NOM)",
111 "set.expandPill": "Expansion de variables",
112 "set.expandTip": "Désactivé par défaut. Activé : $NOM et ${NOM} dans la valeur sont remplacés au moment du job par d'autres variables (groupe, projet, job, CI_*). Écrivez $$ pour un $ littéral. Les noms inconnus restent tels quels, comme sur GitLab. Les cycles ne sont pas développés.",
113 "set.invisibleHint": "Un secret invisible ne peut plus être consulté ni modifié ensuite. Tu peux seulement le supprimer ou remplacer la valeur.",
114 "set.valuesHidden": "Les valeurs restent cachées jusqu'au choix Afficher. Un secret invisible ne peut pas être affiché.",
115 "flash.secretReplaced": "Secret remplacé",
119 "err.secretForm": "le nom de secret %q doit correspondre à [A-Za-z_][A-Za-z0-9_]*",
120 "err.secretExists": "le secret %q existe déjà",
121 "err.secretHidden": "le secret %q est invisible et ne peut pas être consulté ni modifié",
122 "err.secretVisible": "le secret %q est visible ; modifie-le au lieu de le remplacer",
123 "wh.tokenHint": "Choisis un secret. La valeur reste cachée.",
124 "wh.noSecret": "Aucun",
125 "wh.secretSearch": "Chercher un secret",
126 "wh.src.repo": "Dépôt %s",
127 "wh.src.group": "Groupe %s",
128 "wh.edit": "Modifier le webhook",
129 "wh.update": "Enregistrer les modifications",
130 "wh.events": "Événements",
131 "wh.flags": "Drapeaux",
132 "wh.actions": "Actions",
133 "action.edit": "Modifier",
134 "action.show": "Afficher",
135 "action.replace": "Remplacer",
136 "set.invisible": "Invisible",
137 "set.expand": "Développer les variables dans la valeur ($NOM)",
138 "set.expandPill": "Expansion de variables",
139 "set.expandTip": "Désactivé par défaut. Activé : $NOM et ${NOM} dans la valeur sont remplacés au moment du job par d'autres variables (groupe, projet, job, CI_*). Écrivez $$ pour un $ littéral. Les noms inconnus restent tels quels, comme sur GitLab. Les cycles ne sont pas développés.",
140 "gdel.title": "Supprimer le groupe",
141 "gdel.button": "Supprimer le groupe",
142 "gdel.tip": "Possible uniquement si le groupe n'a plus de dépôts. Déplace-les ou supprime-les d'abord ; il n'y a pas d'option forcée. Membres, invitations, secrets de groupe, webhooks et règles d'approbation sont supprimés et les runners du groupe révoqués. Action irréversible.",
143 "gdel.lead": "Ce groupe est vide et peut être supprimé.",
144 "gdel.blocked": "Ce groupe contient encore %d dépôts. Déplace-les ou supprime-les d'abord.",
145 "gdel.confirm": "Supprimer définitivement le groupe %s ? Membres, secrets de groupe et webhooks seront supprimés.",
146 "err.confirmGroupDelete": "saisis le nom ou le chemin du groupe pour le supprimer",
147 "err.groupNotEmpty": "le groupe contient encore %d dépôts ; déplace-les ou supprime-les d'abord",
148 "flash.groupDeleted": "Groupe supprimé",
149 "set.invisibleHint": "Un secret invisible ne peut plus être consulté ni modifié ensuite. Tu peux seulement le supprimer ou remplacer la valeur.",
150 "set.valuesHidden": "Les valeurs restent cachées jusqu'au choix Afficher. Un secret invisible ne peut pas être affiché.",
151 "flash.secretReplaced": "Secret remplacé",
116 152 }
@@ -8,109 +8,145 @@ func init() {
8}
8}
9
9
10var secretEN = map[string]string{
10var secretEN = map[string]string{
11 "err.secretForm": "secret name %q must match [A-Za-z_][A-Za-z0-9_]*",
11 "err.secretForm": "secret name %q must match [A-Za-z_][A-Za-z0-9_]*",
12 "err.secretExists": "secret %q already exists",
12 "err.secretExists": "secret %q already exists",
13 "err.secretHidden": "secret %q is invisible and cannot be viewed or edited",
13 "err.secretHidden": "secret %q is invisible and cannot be viewed or edited",
14 "err.secretVisible": "secret %q is visible; edit it instead of replacing it",
14 "err.secretVisible": "secret %q is visible; edit it instead of replacing it",
15 "wh.tokenHint": "Choose a secret. The value stays hidden.",
15 "wh.tokenHint": "Choose a secret. The value stays hidden.",
16 "wh.noSecret": "None",
16 "wh.noSecret": "None",
17 "wh.secretSearch": "Search secrets",
17 "wh.secretSearch": "Search secrets",
18 "wh.src.repo": "Repository %s",
18 "wh.src.repo": "Repository %s",
19 "wh.src.group": "Group %s",
19 "wh.src.group": "Group %s",
20 "wh.edit": "Edit webhook",
20 "wh.edit": "Edit webhook",
21 "wh.update": "Save changes",
21 "wh.update": "Save changes",
22 "wh.events": "Events",
22 "wh.events": "Events",
23 "wh.flags": "Flags",
23 "wh.flags": "Flags",
24 "wh.actions": "Actions",
24 "wh.actions": "Actions",
25 "action.edit": "Edit",
25 "action.edit": "Edit",
26 "action.show": "Show",
26 "action.show": "Show",
27 "action.replace": "Replace",
27 "action.replace": "Replace",
28 "set.invisible": "Invisible",
28 "set.invisible": "Invisible",
29 "set.expand": "Expand variables in the value ($NAME)",
29 "set.expand": "Expand variables in the value ($NAME)",
30 "set.expandPill": "Variable expansion",
30 "set.expandPill": "Variable expansion",
31 "set.expandTip": "Off by default. When on, $NAME and ${NAME} in the value are replaced at job time by other variables (group, project, job, CI_*). Write $$ for a literal $. Unknown names stay as written, like GitLab. Cycles are not expanded.",
31 "set.expandTip": "Off by default. When on, $NAME and ${NAME} in the value are replaced at job time by other variables (group, project, job, CI_*). Write $$ for a literal $. Unknown names stay as written, like GitLab. Cycles are not expanded.",
32 "set.invisibleHint": "An invisible secret cannot be viewed or edited afterwards. You can only delete it or replace the value.",
32 "gdel.title": "Delete group",
33 "set.valuesHidden": "Values stay hidden until you choose Show. An invisible secret cannot be shown.",
33 "gdel.button": "Delete group",
34 "flash.secretReplaced": "Secret replaced",
34 "gdel.tip": "Only possible when the group has no repositories left. Move or delete them first; there is no force option. Members, invitations, group secrets, webhooks and approval rules are removed and group runners are revoked. This cannot be undone.",
35 "gdel.lead": "This group is empty and can be deleted.",
36 "gdel.blocked": "This group still has %d repositories. Move or delete them first.",
37 "gdel.confirm": "Delete group %s permanently? Members, group secrets and webhooks go with it.",
38 "err.confirmGroupDelete": "type the group name or path to delete it",
39 "err.groupNotEmpty": "the group still has %d repositories; move or delete them first",
40 "flash.groupDeleted": "Group deleted",
41 "set.invisibleHint": "An invisible secret cannot be viewed or edited afterwards. You can only delete it or replace the value.",
42 "set.valuesHidden": "Values stay hidden until you choose Show. An invisible secret cannot be shown.",
43 "flash.secretReplaced": "Secret replaced",
35}
44}
36
45
37var secretNL = map[string]string{
46var secretNL = map[string]string{
38 "err.secretForm": "geheimnaam %q moet [A-Za-z_][A-Za-z0-9_]* zijn",
47 "err.secretForm": "geheimnaam %q moet [A-Za-z_][A-Za-z0-9_]* zijn",
39 "err.secretExists": "geheim %q bestaat al",
48 "err.secretExists": "geheim %q bestaat al",
40 "err.secretHidden": "geheim %q is onzichtbaar en kan niet bekeken of bewerkt worden",
49 "err.secretHidden": "geheim %q is onzichtbaar en kan niet bekeken of bewerkt worden",
41 "err.secretVisible": "geheim %q is zichtbaar; bewerk het in plaats van het te vervangen",
50 "err.secretVisible": "geheim %q is zichtbaar; bewerk het in plaats van het te vervangen",
42 "wh.tokenHint": "Kies een geheim. De waarde blijft verborgen.",
51 "wh.tokenHint": "Kies een geheim. De waarde blijft verborgen.",
43 "wh.noSecret": "Geen",
52 "wh.noSecret": "Geen",
44 "wh.secretSearch": "Zoek een geheim",
53 "wh.secretSearch": "Zoek een geheim",
45 "wh.src.repo": "Repository %s",
54 "wh.src.repo": "Repository %s",
46 "wh.src.group": "Groep %s",
55 "wh.src.group": "Groep %s",
47 "wh.edit": "Webhook bewerken",
56 "wh.edit": "Webhook bewerken",
48 "wh.update": "Wijzigingen opslaan",
57 "wh.update": "Wijzigingen opslaan",
49 "wh.events": "Gebeurtenissen",
58 "wh.events": "Gebeurtenissen",
50 "wh.flags": "Vlaggen",
59 "wh.flags": "Vlaggen",
51 "wh.actions": "Acties",
60 "wh.actions": "Acties",
52 "action.edit": "Bewerken",
61 "action.edit": "Bewerken",
53 "action.show": "Toon",
62 "action.show": "Toon",
54 "action.replace": "Vervangen",
63 "action.replace": "Vervangen",
55 "set.invisible": "Onzichtbaar",
64 "set.invisible": "Onzichtbaar",
56 "set.expand": "Variabelen in de waarde uitbreiden ($NAAM)",
65 "set.expand": "Variabelen in de waarde uitbreiden ($NAAM)",
57 "set.expandPill": "Variabelen uitbreiden",
66 "set.expandPill": "Variabelen uitbreiden",
58 "set.expandTip": "Standaard uit. Aan: $NAAM en ${NAAM} in de waarde worden bij de job vervangen door andere variabelen (groep, project, job, CI_*). Schrijf $$ voor een letterlijke $. Onbekende namen blijven staan zoals geschreven, net als bij GitLab. Kringverwijzingen worden niet uitgebreid.",
67 "set.expandTip": "Standaard uit. Aan: $NAAM en ${NAAM} in de waarde worden bij de job vervangen door andere variabelen (groep, project, job, CI_*). Schrijf $$ voor een letterlijke $. Onbekende namen blijven staan zoals geschreven, net als bij GitLab. Kringverwijzingen worden niet uitgebreid.",
59 "set.invisibleHint": "Een onzichtbaar geheim is daarna niet meer te bekijken of te bewerken. Je kunt het alleen verwijderen of de waarde vervangen.",
68 "gdel.title": "Groep verwijderen",
60 "set.valuesHidden": "Waarden blijven verborgen tot je Toon kiest. Een onzichtbaar geheim kan niet getoond worden.",
69 "gdel.button": "Groep verwijderen",
61 "flash.secretReplaced": "Geheim vervangen",
70 "gdel.tip": "Kan alleen als de groep geen repositories meer heeft. Verplaats of verwijder die eerst; er is geen force-optie. Leden, uitnodigingen, groepsgeheimen, webhooks en goedkeuringsregels worden verwijderd en groepsrunners ingetrokken. Dit is niet terug te draaien.",
71 "gdel.lead": "Deze groep is leeg en kan verwijderd worden.",
72 "gdel.blocked": "Deze groep bevat nog %d repositories. Verplaats of verwijder die eerst.",
73 "gdel.confirm": "Groep %s definitief verwijderen? Leden, groepsgeheimen en webhooks gaan mee.",
74 "err.confirmGroupDelete": "typ de groepsnaam of het pad om te verwijderen",
75 "err.groupNotEmpty": "de groep bevat nog %d repositories; verplaats of verwijder die eerst",
76 "flash.groupDeleted": "Groep verwijderd",
77 "set.invisibleHint": "Een onzichtbaar geheim is daarna niet meer te bekijken of te bewerken. Je kunt het alleen verwijderen of de waarde vervangen.",
78 "set.valuesHidden": "Waarden blijven verborgen tot je Toon kiest. Een onzichtbaar geheim kan niet getoond worden.",
79 "flash.secretReplaced": "Geheim vervangen",
62}
80}
63
81
64var secretDE = map[string]string{
82var secretDE = map[string]string{
65 "err.secretForm": "Geheimnisname %q muss [A-Za-z_][A-Za-z0-9_]* entsprechen",
83 "err.secretForm": "Geheimnisname %q muss [A-Za-z_][A-Za-z0-9_]* entsprechen",
66 "err.secretHidden": "Geheimnis %q ist unsichtbar und kann nicht angesehen oder bearbeitet werden",
84 "err.secretHidden": "Geheimnis %q ist unsichtbar und kann nicht angesehen oder bearbeitet werden",
67 "err.secretExists": "Geheimnis %q existiert bereits",
85 "err.secretExists": "Geheimnis %q existiert bereits",
68 "err.secretVisible": "Geheimnis %q ist sichtbar; bearbeite es, statt es zu ersetzen",
86 "err.secretVisible": "Geheimnis %q ist sichtbar; bearbeite es, statt es zu ersetzen",
69 "wh.tokenHint": "Wähle ein Geheimnis. Der Wert bleibt verborgen.",
87 "wh.tokenHint": "Wähle ein Geheimnis. Der Wert bleibt verborgen.",
70 "wh.noSecret": "Keins",
88 "wh.noSecret": "Keins",
71 "wh.secretSearch": "Geheimnis suchen",
89 "wh.secretSearch": "Geheimnis suchen",
72 "wh.src.repo": "Repository %s",
90 "wh.src.repo": "Repository %s",
73 "wh.src.group": "Gruppe %s",
91 "wh.src.group": "Gruppe %s",
74 "wh.edit": "Webhook bearbeiten",
92 "wh.edit": "Webhook bearbeiten",
75 "wh.update": "Änderungen speichern",
93 "wh.update": "Änderungen speichern",
76 "wh.events": "Ereignisse",
94 "wh.events": "Ereignisse",
77 "wh.flags": "Merkmale",
95 "wh.flags": "Merkmale",
78 "wh.actions": "Aktionen",
96 "wh.actions": "Aktionen",
79 "action.edit": "Bearbeiten",
97 "action.edit": "Bearbeiten",
80 "action.show": "Anzeigen",
98 "action.show": "Anzeigen",
81 "action.replace": "Ersetzen",
99 "action.replace": "Ersetzen",
82 "set.invisible": "Unsichtbar",
100 "set.invisible": "Unsichtbar",
83 "set.expand": "Variablen im Wert erweitern ($NAME)",
101 "set.expand": "Variablen im Wert erweitern ($NAME)",
84 "set.expandPill": "Variablenerweiterung",
102 "set.expandPill": "Variablenerweiterung",
85 "set.expandTip": "Standardmäßig aus. Wenn an, werden $NAME und ${NAME} im Wert zur Jobzeit durch andere Variablen ersetzt (Gruppe, Projekt, Job, CI_*). $$ ergibt ein wörtliches $. Unbekannte Namen bleiben unverändert, wie bei GitLab. Zyklen werden nicht erweitert.",
103 "set.expandTip": "Standardmäßig aus. Wenn an, werden $NAME und ${NAME} im Wert zur Jobzeit durch andere Variablen ersetzt (Gruppe, Projekt, Job, CI_*). $$ ergibt ein wörtliches $. Unbekannte Namen bleiben unverändert, wie bei GitLab. Zyklen werden nicht erweitert.",
86 "set.invisibleHint": "Ein unsichtbares Geheimnis kann danach nicht mehr angesehen oder bearbeitet werden. Du kannst es nur löschen oder den Wert ersetzen.",
104 "gdel.title": "Gruppe löschen",
87 "set.valuesHidden": "Werte bleiben verborgen, bis du Anzeigen wählst. Ein unsichtbares Geheimnis kann nicht angezeigt werden.",
105 "gdel.button": "Gruppe löschen",
88 "flash.secretReplaced": "Geheimnis ersetzt",
106 "gdel.tip": "Nur möglich, wenn die Gruppe keine Repositories mehr hat. Verschiebe oder lösche sie zuerst; es gibt keine Force-Option. Mitglieder, Einladungen, Gruppengeheimnisse, Webhooks und Freigaberegeln werden entfernt, Gruppenrunner widerrufen. Das lässt sich nicht rückgängig machen.",
107 "gdel.lead": "Diese Gruppe ist leer und kann gelöscht werden.",
108 "gdel.blocked": "Diese Gruppe enthält noch %d Repositories. Verschiebe oder lösche sie zuerst.",
109 "gdel.confirm": "Gruppe %s endgültig löschen? Mitglieder, Gruppengeheimnisse und Webhooks werden mitgelöscht.",
110 "err.confirmGroupDelete": "tippe den Gruppennamen oder Pfad, um zu löschen",
111 "err.groupNotEmpty": "die Gruppe enthält noch %d Repositories; verschiebe oder lösche sie zuerst",
112 "flash.groupDeleted": "Gruppe gelöscht",
113 "set.invisibleHint": "Ein unsichtbares Geheimnis kann danach nicht mehr angesehen oder bearbeitet werden. Du kannst es nur löschen oder den Wert ersetzen.",
114 "set.valuesHidden": "Werte bleiben verborgen, bis du Anzeigen wählst. Ein unsichtbares Geheimnis kann nicht angezeigt werden.",
115 "flash.secretReplaced": "Geheimnis ersetzt",
89}
116}
90
117
91var secretFR = map[string]string{
118var secretFR = map[string]string{
92 "err.secretForm": "le nom de secret %q doit correspondre à [A-Za-z_][A-Za-z0-9_]*",
119 "err.secretForm": "le nom de secret %q doit correspondre à [A-Za-z_][A-Za-z0-9_]*",
93 "err.secretExists": "le secret %q existe déjà",
120 "err.secretExists": "le secret %q existe déjà",
94 "err.secretHidden": "le secret %q est invisible et ne peut pas être consulté ni modifié",
121 "err.secretHidden": "le secret %q est invisible et ne peut pas être consulté ni modifié",
95 "err.secretVisible": "le secret %q est visible ; modifie-le au lieu de le remplacer",
122 "err.secretVisible": "le secret %q est visible ; modifie-le au lieu de le remplacer",
96 "wh.tokenHint": "Choisis un secret. La valeur reste cachée.",
123 "wh.tokenHint": "Choisis un secret. La valeur reste cachée.",
97 "wh.noSecret": "Aucun",
124 "wh.noSecret": "Aucun",
98 "wh.secretSearch": "Chercher un secret",
125 "wh.secretSearch": "Chercher un secret",
99 "wh.src.repo": "Dépôt %s",
126 "wh.src.repo": "Dépôt %s",
100 "wh.src.group": "Groupe %s",
127 "wh.src.group": "Groupe %s",
101 "wh.edit": "Modifier le webhook",
128 "wh.edit": "Modifier le webhook",
102 "wh.update": "Enregistrer les modifications",
129 "wh.update": "Enregistrer les modifications",
103 "wh.events": "Événements",
130 "wh.events": "Événements",
104 "wh.flags": "Drapeaux",
131 "wh.flags": "Drapeaux",
105 "wh.actions": "Actions",
132 "wh.actions": "Actions",
106 "action.edit": "Modifier",
133 "action.edit": "Modifier",
107 "action.show": "Afficher",
134 "action.show": "Afficher",
108 "action.replace": "Remplacer",
135 "action.replace": "Remplacer",
109 "set.invisible": "Invisible",
136 "set.invisible": "Invisible",
110 "set.expand": "Développer les variables dans la valeur ($NOM)",
137 "set.expand": "Développer les variables dans la valeur ($NOM)",
111 "set.expandPill": "Expansion de variables",
138 "set.expandPill": "Expansion de variables",
112 "set.expandTip": "Désactivé par défaut. Activé : $NOM et ${NOM} dans la valeur sont remplacés au moment du job par d'autres variables (groupe, projet, job, CI_*). Écrivez $$ pour un $ littéral. Les noms inconnus restent tels quels, comme sur GitLab. Les cycles ne sont pas développés.",
139 "set.expandTip": "Désactivé par défaut. Activé : $NOM et ${NOM} dans la valeur sont remplacés au moment du job par d'autres variables (groupe, projet, job, CI_*). Écrivez $$ pour un $ littéral. Les noms inconnus restent tels quels, comme sur GitLab. Les cycles ne sont pas développés.",
113 "set.invisibleHint": "Un secret invisible ne peut plus être consulté ni modifié ensuite. Tu peux seulement le supprimer ou remplacer la valeur.",
140 "gdel.title": "Supprimer le groupe",
114 "set.valuesHidden": "Les valeurs restent cachées jusqu'au choix Afficher. Un secret invisible ne peut pas être affiché.",
141 "gdel.button": "Supprimer le groupe",
115 "flash.secretReplaced": "Secret remplacé",
142 "gdel.tip": "Possible uniquement si le groupe n'a plus de dépôts. Déplace-les ou supprime-les d'abord ; il n'y a pas d'option forcée. Membres, invitations, secrets de groupe, webhooks et règles d'approbation sont supprimés et les runners du groupe révoqués. Action irréversible.",
143 "gdel.lead": "Ce groupe est vide et peut être supprimé.",
144 "gdel.blocked": "Ce groupe contient encore %d dépôts. Déplace-les ou supprime-les d'abord.",
145 "gdel.confirm": "Supprimer définitivement le groupe %s ? Membres, secrets de groupe et webhooks seront supprimés.",
146 "err.confirmGroupDelete": "saisis le nom ou le chemin du groupe pour le supprimer",
147 "err.groupNotEmpty": "le groupe contient encore %d dépôts ; déplace-les ou supprime-les d'abord",
148 "flash.groupDeleted": "Groupe supprimé",
149 "set.invisibleHint": "Un secret invisible ne peut plus être consulté ni modifié ensuite. Tu peux seulement le supprimer ou remplacer la valeur.",
150 "set.valuesHidden": "Les valeurs restent cachées jusqu'au choix Afficher. Un secret invisible ne peut pas être affiché.",
151 "flash.secretReplaced": "Secret remplacé",
116}
152}
internal/server/api_collab.go +18 −0
@@ -114,6 +114,24 @@ func (s *Server) apiPutGroup(w http.ResponseWriter, r *http.Request) {
114 114 writeJSON(w, http.StatusOK, groupJSON(g))
115 115 }
116 116
117 func (s *Server) apiDeleteGroup(w http.ResponseWriter, r *http.Request) {
118 g, ok := s.apiGroup(w, r, access.RoleMaintainer)
119 if !ok {
120 return
121 }
122 var body struct {
123 Confirm string `json:"confirm"`
124 }
125 if err := readJSON(r, &body); err != nil {
126 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
127 return
128 }
129 if !s.apiOK(w, r, s.opDeleteGroup(r.Context(), apiUser(r), g, body.Confirm)) {
130 return
131 }
132 writeJSON(w, http.StatusNoContent, nil)
133 }
134
117 135 func (s *Server) apiTransferGroup(w http.ResponseWriter, r *http.Request) {
118 136 g, ok := s.apiGroup(w, r, access.RoleMaintainer)
119 137 if !ok {
@@ -114,6 +114,24 @@ func (s *Server) apiPutGroup(w http.ResponseWriter, r *http.Request) {
114 writeJSON(w, http.StatusOK, groupJSON(g))
114 writeJSON(w, http.StatusOK, groupJSON(g))
115}
115}
116
116
117func (s *Server) apiDeleteGroup(w http.ResponseWriter, r *http.Request) {
118 g, ok := s.apiGroup(w, r, access.RoleMaintainer)
119 if !ok {
120 return
121 }
122 var body struct {
123 Confirm string `json:"confirm"`
124 }
125 if err := readJSON(r, &body); err != nil {
126 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
127 return
128 }
129 if !s.apiOK(w, r, s.opDeleteGroup(r.Context(), apiUser(r), g, body.Confirm)) {
130 return
131 }
132 writeJSON(w, http.StatusNoContent, nil)
133}
134
117func (s *Server) apiTransferGroup(w http.ResponseWriter, r *http.Request) {
135func (s *Server) apiTransferGroup(w http.ResponseWriter, r *http.Request) {
118 g, ok := s.apiGroup(w, r, access.RoleMaintainer)
136 g, ok := s.apiGroup(w, r, access.RoleMaintainer)
119 if !ok {
137 if !ok {
internal/server/api_openapi.go +4 −0
@@ -127,6 +127,7 @@ func apiBinds() []apiBind {
127 127 {path: branch, method: "PUT", code: "200", body: "BranchUpdate", resp: "Branch"},
128 128 {path: branch, method: "DELETE", code: "204", body: "BranchDelete", empty: true},
129 129
130 {path: "/groups/{path}", method: "DELETE", code: "204", body: "GroupDelete", empty: true},
130 131 {path: "/groups/{path}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
131 132 {path: "/groups/{path}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
132 133 {path: "/projects/{owner}/{repo}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
@@ -387,6 +388,9 @@ func apiSchemas() map[string]any {
387 388 "headers": str("Extra headers. Empty keeps the current headers."),
388 389 "body": str("Body template."),
389 390 }),
391 "GroupDelete": obj("Delete an empty group. Fails with 409 while the group still has repositories (no force). Removes members, invitations, group secrets, webhooks and approval rules, and revokes group runners. Group maintainers and admins only.", map[string]any{
392 "confirm": str("Group name or path, to confirm."),
393 }),
390 394 "Secret": obj("A secret. Values are never returned.", map[string]any{
391 395 "name": str("Secret name."),
392 396 "protected": boolean("Only injected on protected refs."),
@@ -127,6 +127,7 @@ func apiBinds() []apiBind {
127 {path: branch, method: "PUT", code: "200", body: "BranchUpdate", resp: "Branch"},
127 {path: branch, method: "PUT", code: "200", body: "BranchUpdate", resp: "Branch"},
128 {path: branch, method: "DELETE", code: "204", body: "BranchDelete", empty: true},
128 {path: branch, method: "DELETE", code: "204", body: "BranchDelete", empty: true},
129
129
130 {path: "/groups/{path}", method: "DELETE", code: "204", body: "GroupDelete", empty: true},
130 {path: "/groups/{path}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
131 {path: "/groups/{path}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
131 {path: "/groups/{path}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
132 {path: "/groups/{path}/webhooks", method: "POST", code: "201", body: "WebhookCreate", resp: "Webhook"},
132 {path: "/projects/{owner}/{repo}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
133 {path: "/projects/{owner}/{repo}/webhooks", method: "GET", code: "200", resp: "Webhook", array: true},
@@ -387,6 +388,9 @@ func apiSchemas() map[string]any {
387 "headers": str("Extra headers. Empty keeps the current headers."),
388 "headers": str("Extra headers. Empty keeps the current headers."),
388 "body": str("Body template."),
389 "body": str("Body template."),
389 }),
390 }),
391 "GroupDelete": obj("Delete an empty group. Fails with 409 while the group still has repositories (no force). Removes members, invitations, group secrets, webhooks and approval rules, and revokes group runners. Group maintainers and admins only.", map[string]any{
392 "confirm": str("Group name or path, to confirm."),
393 }),
390 "Secret": obj("A secret. Values are never returned.", map[string]any{
394 "Secret": obj("A secret. Values are never returned.", map[string]any{
391 "name": str("Secret name."),
395 "name": str("Secret name."),
392 "protected": boolean("Only injected on protected refs."),
396 "protected": boolean("Only injected on protected refs."),
internal/server/api_routes.go +1 −0
@@ -64,6 +64,7 @@ var apiCatalog = []apiRoute{
64 64 {http.MethodPost, "/api/v1/groups", access.ScopeWrite, authUser, "Create group", (*Server).apiCreateGroup},
65 65 {http.MethodGet, "/api/v1/groups/{path}", access.ScopeRead, authUser, "Get group", (*Server).apiGetGroup},
66 66 {http.MethodPut, "/api/v1/groups/{path}", access.ScopeWrite, authUser, "Update group", (*Server).apiPutGroup},
67 {http.MethodDelete, "/api/v1/groups/{path}", access.ScopeWrite, authUser, "Delete an empty group. Body {\"confirm\": name or path}. 409 while the group still has repositories; no force. Members, invitations, group secrets, webhooks and approval rules are removed; group runners are revoked.", (*Server).apiDeleteGroup},
67 68 {http.MethodPost, "/api/v1/groups/{path}/transfer", access.ScopeWrite, authUser, "Transfer group owner", (*Server).apiTransferGroup},
68 69 {http.MethodGet, "/api/v1/groups/{path}/projects", access.ScopeRead, authUser, "List group projects", (*Server).apiGroupProjects},
69 70 {http.MethodGet, "/api/v1/groups/{path}/members", access.ScopeRead, authUser, "List group members", (*Server).apiGroupMembers},
@@ -64,6 +64,7 @@ var apiCatalog = []apiRoute{
64 {http.MethodPost, "/api/v1/groups", access.ScopeWrite, authUser, "Create group", (*Server).apiCreateGroup},
64 {http.MethodPost, "/api/v1/groups", access.ScopeWrite, authUser, "Create group", (*Server).apiCreateGroup},
65 {http.MethodGet, "/api/v1/groups/{path}", access.ScopeRead, authUser, "Get group", (*Server).apiGetGroup},
65 {http.MethodGet, "/api/v1/groups/{path}", access.ScopeRead, authUser, "Get group", (*Server).apiGetGroup},
66 {http.MethodPut, "/api/v1/groups/{path}", access.ScopeWrite, authUser, "Update group", (*Server).apiPutGroup},
66 {http.MethodPut, "/api/v1/groups/{path}", access.ScopeWrite, authUser, "Update group", (*Server).apiPutGroup},
67 {http.MethodDelete, "/api/v1/groups/{path}", access.ScopeWrite, authUser, "Delete an empty group. Body {\"confirm\": name or path}. 409 while the group still has repositories; no force. Members, invitations, group secrets, webhooks and approval rules are removed; group runners are revoked.", (*Server).apiDeleteGroup},
67 {http.MethodPost, "/api/v1/groups/{path}/transfer", access.ScopeWrite, authUser, "Transfer group owner", (*Server).apiTransferGroup},
68 {http.MethodPost, "/api/v1/groups/{path}/transfer", access.ScopeWrite, authUser, "Transfer group owner", (*Server).apiTransferGroup},
68 {http.MethodGet, "/api/v1/groups/{path}/projects", access.ScopeRead, authUser, "List group projects", (*Server).apiGroupProjects},
69 {http.MethodGet, "/api/v1/groups/{path}/projects", access.ScopeRead, authUser, "List group projects", (*Server).apiGroupProjects},
69 {http.MethodGet, "/api/v1/groups/{path}/members", access.ScopeRead, authUser, "List group members", (*Server).apiGroupMembers},
70 {http.MethodGet, "/api/v1/groups/{path}/members", access.ScopeRead, authUser, "List group members", (*Server).apiGroupMembers},
internal/server/group_delete_test.go added +104 −0
@@ -0,0 +1,104 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "net/http/httptest"
7 "os/exec"
8 "path/filepath"
9 "strings"
10 "testing"
11 "time"
12
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16 )
17
18 func TestDeleteGroup(t *testing.T) {
19 if _, err := exec.LookPath("git"); err != nil {
20 t.Skip("git ontbreekt")
21 }
22 storage := t.TempDir()
23 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
24 if err != nil {
25 t.Fatal(err)
26 }
27 t.Cleanup(func() { _ = st.Close() })
28 ctx := context.Background()
29 ada, err := st.UpsertUser(ctx, 1, "ada", "", false)
30 if err != nil {
31 t.Fatal(err)
32 }
33 dev, err := st.UpsertUser(ctx, 2, "dev", "", false)
34 if err != nil {
35 t.Fatal(err)
36 }
37 issue := func(u store.User) string {
38 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: u.Username, Scopes: "api", ExpiresAt: time.Time{}})
39 if err != nil {
40 t.Fatal(err)
41 }
42 return plain
43 }
44 adaTok, devTok := issue(ada), issue(dev)
45 cfg := config.Config{
46 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
47 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
48 Git: config.Git{Binary: "git", DefaultBranch: "master"},
49 }
50 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
51 ts := httptest.NewServer(srv.Handler())
52 t.Cleanup(ts.Close)
53
54 call := func(method, path, token, body string) (int, string) {
55 t.Helper()
56 req, _ := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
57 if body != "" {
58 req.Header.Set("Content-Type", "application/json")
59 }
60 req.Header.Set("Authorization", "Bearer "+token)
61 res, err := http.DefaultClient.Do(req)
62 if err != nil {
63 t.Fatal(err)
64 }
65 return res.StatusCode, read(t, res)
66 }
67 if code, body := call(http.MethodPost, "/api/v1/groups", adaTok, `{"name":"Team"}`); code != 201 {
68 t.Fatalf("groep %d %s", code, body)
69 }
70 if code, body := call(http.MethodPost, "/api/v1/projects", adaTok, `{"name":"App","group":"team","visibility":"private"}`); code != 201 {
71 t.Fatalf("project %d %s", code, body)
72 }
73 team, _ := st.GroupByPath(ctx, "team")
74 _ = st.SetMember(ctx, "group", team.ID, "dev", "developer")
75 _ = st.PutSecret(ctx, "group", team.ID, "TOKEN", "x", false)
76 // developer mag niet
77 if code, _ := call(http.MethodDelete, "/api/v1/groups/team", devTok, `{"confirm":"Team"}`); code != 403 {
78 t.Fatalf("dev: %d", code)
79 }
80 // met repo: 409 met aantal
81 if code, body := call(http.MethodDelete, "/api/v1/groups/team", adaTok, `{"confirm":"Team"}`); code != 409 || !strings.Contains(body, "1") {
82 t.Fatalf("met repo: %d %s", code, body)
83 }
84 app, _ := st.RepoByPath(ctx, "team", "app")
85 if code, _ := call(http.MethodDelete, "/api/v1/projects/team/app", adaTok, `{"confirm":"`+app.Name+`"}`); code != 204 {
86 t.Fatalf("repo weg: %d", code)
87 }
88 // verkeerde bevestiging
89 if code, _ := call(http.MethodDelete, "/api/v1/groups/team", adaTok, `{"confirm":"nope"}`); code != 400 {
90 t.Fatalf("confirm: %d", code)
91 }
92 if code, body := call(http.MethodDelete, "/api/v1/groups/team", adaTok, `{"confirm":"team"}`); code != 204 {
93 t.Fatalf("leeg: %d %s", code, body)
94 }
95 if _, err := st.GroupByPath(ctx, "team"); err == nil {
96 t.Fatal("groep bestaat nog")
97 }
98 if list, _ := st.ListSecrets(ctx, "group", team.ID); len(list) != 0 {
99 t.Fatal("groepsgeheimen niet opgeruimd")
100 }
101 if m, _ := st.ListMembers(ctx, "group", team.ID); len(m) != 0 {
102 t.Fatal("leden niet opgeruimd")
103 }
104 }
@@ -0,0 +1,104 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/http/httptest"
7 "os/exec"
8 "path/filepath"
9 "strings"
10 "testing"
11 "time"
12
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16)
17
18func TestDeleteGroup(t *testing.T) {
19 if _, err := exec.LookPath("git"); err != nil {
20 t.Skip("git ontbreekt")
21 }
22 storage := t.TempDir()
23 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
24 if err != nil {
25 t.Fatal(err)
26 }
27 t.Cleanup(func() { _ = st.Close() })
28 ctx := context.Background()
29 ada, err := st.UpsertUser(ctx, 1, "ada", "", false)
30 if err != nil {
31 t.Fatal(err)
32 }
33 dev, err := st.UpsertUser(ctx, 2, "dev", "", false)
34 if err != nil {
35 t.Fatal(err)
36 }
37 issue := func(u store.User) string {
38 plain, _, err := st.IssueToken(ctx, u.ID, store.TokenRequest{Name: u.Username, Scopes: "api", ExpiresAt: time.Time{}})
39 if err != nil {
40 t.Fatal(err)
41 }
42 return plain
43 }
44 adaTok, devTok := issue(ada), issue(dev)
45 cfg := config.Config{
46 BaseURL: "http://127.0.0.1:9", StoragePath: storage,
47 Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
48 Git: config.Git{Binary: "git", DefaultBranch: "master"},
49 }
50 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
51 ts := httptest.NewServer(srv.Handler())
52 t.Cleanup(ts.Close)
53
54 call := func(method, path, token, body string) (int, string) {
55 t.Helper()
56 req, _ := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
57 if body != "" {
58 req.Header.Set("Content-Type", "application/json")
59 }
60 req.Header.Set("Authorization", "Bearer "+token)
61 res, err := http.DefaultClient.Do(req)
62 if err != nil {
63 t.Fatal(err)
64 }
65 return res.StatusCode, read(t, res)
66 }
67 if code, body := call(http.MethodPost, "/api/v1/groups", adaTok, `{"name":"Team"}`); code != 201 {
68 t.Fatalf("groep %d %s", code, body)
69 }
70 if code, body := call(http.MethodPost, "/api/v1/projects", adaTok, `{"name":"App","group":"team","visibility":"private"}`); code != 201 {
71 t.Fatalf("project %d %s", code, body)
72 }
73 team, _ := st.GroupByPath(ctx, "team")
74 _ = st.SetMember(ctx, "group", team.ID, "dev", "developer")
75 _ = st.PutSecret(ctx, "group", team.ID, "TOKEN", "x", false)
76 // developer mag niet
77 if code, _ := call(http.MethodDelete, "/api/v1/groups/team", devTok, `{"confirm":"Team"}`); code != 403 {
78 t.Fatalf("dev: %d", code)
79 }
80 // met repo: 409 met aantal
81 if code, body := call(http.MethodDelete, "/api/v1/groups/team", adaTok, `{"confirm":"Team"}`); code != 409 || !strings.Contains(body, "1") {
82 t.Fatalf("met repo: %d %s", code, body)
83 }
84 app, _ := st.RepoByPath(ctx, "team", "app")
85 if code, _ := call(http.MethodDelete, "/api/v1/projects/team/app", adaTok, `{"confirm":"`+app.Name+`"}`); code != 204 {
86 t.Fatalf("repo weg: %d", code)
87 }
88 // verkeerde bevestiging
89 if code, _ := call(http.MethodDelete, "/api/v1/groups/team", adaTok, `{"confirm":"nope"}`); code != 400 {
90 t.Fatalf("confirm: %d", code)
91 }
92 if code, body := call(http.MethodDelete, "/api/v1/groups/team", adaTok, `{"confirm":"team"}`); code != 204 {
93 t.Fatalf("leeg: %d %s", code, body)
94 }
95 if _, err := st.GroupByPath(ctx, "team"); err == nil {
96 t.Fatal("groep bestaat nog")
97 }
98 if list, _ := st.ListSecrets(ctx, "group", team.ID); len(list) != 0 {
99 t.Fatal("groepsgeheimen niet opgeruimd")
100 }
101 if m, _ := st.ListMembers(ctx, "group", team.ID); len(m) != 0 {
102 t.Fatal("leden niet opgeruimd")
103 }
104}
internal/server/ops_collab.go +21 −0
@@ -2,6 +2,7 @@ package server
2 2
3 3 import (
4 4 "context"
5 "errors"
5 6 "os"
6 7 "strings"
7 8
@@ -176,6 +177,26 @@ func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.R
176 177 return nil
177 178 }
178 179
180 // opDeleteGroup verwijdert een lege groep. Alleen groepsbeheerders en
181 // admins; confirm is de groepsnaam of het pad. Een groep met repositories
182 // geeft 409 met het aantal; er is geen force.
183 func (s *Server) opDeleteGroup(ctx context.Context, user store.User, g store.Group, confirm string) error {
184 if err := s.manageScope(ctx, user, "group", g.ID); err != nil {
185 return err
186 }
187 if c := strings.TrimSpace(confirm); c == "" || (c != g.Name && c != g.Path) {
188 return fail(400, i18n.E("err.confirmGroupDelete"))
189 }
190 if err := s.Store.DeleteGroup(ctx, g.ID); err != nil {
191 var ne store.ErrGroupNotEmpty
192 if errors.As(err, &ne) {
193 return fail(409, i18n.E("err.groupNotEmpty", ne.Repos))
194 }
195 return fail(500, err)
196 }
197 return nil
198 }
199
179 200 func (s *Server) manageScope(ctx context.Context, user store.User, kind string, id int64) error {
180 201 if kind == "group" {
181 202 role, err := s.Store.GroupRole(ctx, id, user.ID)
@@ -2,6 +2,7 @@ package server
2
2
3import (
3import (
4 "context"
4 "context"
5 "errors"
5 "os"
6 "os"
6 "strings"
7 "strings"
7
8
@@ -176,6 +177,26 @@ func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.R
176 return nil
177 return nil
177}
178}
178
179
180// opDeleteGroup verwijdert een lege groep. Alleen groepsbeheerders en
181// admins; confirm is de groepsnaam of het pad. Een groep met repositories
182// geeft 409 met het aantal; er is geen force.
183func (s *Server) opDeleteGroup(ctx context.Context, user store.User, g store.Group, confirm string) error {
184 if err := s.manageScope(ctx, user, "group", g.ID); err != nil {
185 return err
186 }
187 if c := strings.TrimSpace(confirm); c == "" || (c != g.Name && c != g.Path) {
188 return fail(400, i18n.E("err.confirmGroupDelete"))
189 }
190 if err := s.Store.DeleteGroup(ctx, g.ID); err != nil {
191 var ne store.ErrGroupNotEmpty
192 if errors.As(err, &ne) {
193 return fail(409, i18n.E("err.groupNotEmpty", ne.Repos))
194 }
195 return fail(500, err)
196 }
197 return nil
198}
199
179func (s *Server) manageScope(ctx context.Context, user store.User, kind string, id int64) error {
200func (s *Server) manageScope(ctx context.Context, user store.User, kind string, id int64) error {
180 if kind == "group" {
201 if kind == "group" {
181 role, err := s.Store.GroupRole(ctx, id, user.ID)
202 role, err := s.Store.GroupRole(ctx, id, user.ID)
internal/server/server.go +2 −0
@@ -130,6 +130,7 @@ func (s *Server) Handler() http.Handler {
130 130 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
131 131 mux.HandleFunc("POST /groups/{path}/approvals", s.saveGroupApproval)
132 132 mux.HandleFunc("POST /groups/{path}/owner", s.transferGroup)
133 mux.HandleFunc("POST /groups/{path}/delete", s.deleteGroup)
133 134 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
134 135 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
135 136 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
@@ -586,6 +587,7 @@ type View struct {
586 587 NewRunnerToken string
587 588 BuiltinFirst bool
588 589 RunnerOptIn bool
590 GroupRepoCount int
589 591 OptInNames []string
590 592 Title string
591 593 BaseURL string
@@ -130,6 +130,7 @@ func (s *Server) Handler() http.Handler {
130 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
130 mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
131 mux.HandleFunc("POST /groups/{path}/approvals", s.saveGroupApproval)
131 mux.HandleFunc("POST /groups/{path}/approvals", s.saveGroupApproval)
132 mux.HandleFunc("POST /groups/{path}/owner", s.transferGroup)
132 mux.HandleFunc("POST /groups/{path}/owner", s.transferGroup)
133 mux.HandleFunc("POST /groups/{path}/delete", s.deleteGroup)
133 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
134 mux.HandleFunc("POST /groups/{path}/logo", s.uploadGroupLogo)
134 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
135 mux.HandleFunc("POST /groups/{path}/members", s.groupMember)
135 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
136 mux.HandleFunc("POST /groups/{path}/members/remove", s.groupMemberRemove)
@@ -586,6 +587,7 @@ type View struct {
586 NewRunnerToken string
587 NewRunnerToken string
587 BuiltinFirst bool
588 BuiltinFirst bool
588 RunnerOptIn bool
589 RunnerOptIn bool
590 GroupRepoCount int
589 OptInNames []string
591 OptInNames []string
590 Title string
592 Title string
591 BaseURL string
593 BaseURL string
internal/server/settings_handlers.go +13 −0
@@ -503,6 +503,18 @@ func (s *Server) deleteRepo(w http.ResponseWriter, r *http.Request) {
503 503 s.redirect(w, r, "/", s.tr(r, "flash.repoDeleted"), "")
504 504 }
505 505
506 func (s *Server) deleteGroup(w http.ResponseWriter, r *http.Request) {
507 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
508 if !ok || !s.csrfOK(w, r) {
509 return
510 }
511 if err := s.opDeleteGroup(r.Context(), s.who(r).User, g, r.FormValue("confirm")); err != nil {
512 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.commitProblem(r, err))
513 return
514 }
515 s.redirect(w, r, "/", s.tr(r, "flash.groupDeleted"), "")
516 }
517
506 518 func (s *Server) guardGroup(w http.ResponseWriter, r *http.Request, min access.Role) (store.Group, access.Role, bool) {
507 519 g, err := s.Store.GroupByPath(r.Context(), r.PathValue("path"))
508 520 if err != nil {
@@ -637,6 +649,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
637 649 })
638 650 }
639 651 v.Repos = repos
652 v.GroupRepoCount = len(all)
640 653 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), uid, repos), lang)
641 654 if tab == "members" && role.CanRead() {
642 655 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
@@ -503,6 +503,18 @@ func (s *Server) deleteRepo(w http.ResponseWriter, r *http.Request) {
503 s.redirect(w, r, "/", s.tr(r, "flash.repoDeleted"), "")
503 s.redirect(w, r, "/", s.tr(r, "flash.repoDeleted"), "")
504}
504}
505
505
506func (s *Server) deleteGroup(w http.ResponseWriter, r *http.Request) {
507 g, _, ok := s.guardGroup(w, r, access.RoleMaintainer)
508 if !ok || !s.csrfOK(w, r) {
509 return
510 }
511 if err := s.opDeleteGroup(r.Context(), s.who(r).User, g, r.FormValue("confirm")); err != nil {
512 s.redirect(w, r, "/groups/"+g.Path+"?tab=settings", "", s.commitProblem(r, err))
513 return
514 }
515 s.redirect(w, r, "/", s.tr(r, "flash.groupDeleted"), "")
516}
517
506func (s *Server) guardGroup(w http.ResponseWriter, r *http.Request, min access.Role) (store.Group, access.Role, bool) {
518func (s *Server) guardGroup(w http.ResponseWriter, r *http.Request, min access.Role) (store.Group, access.Role, bool) {
507 g, err := s.Store.GroupByPath(r.Context(), r.PathValue("path"))
519 g, err := s.Store.GroupByPath(r.Context(), r.PathValue("path"))
508 if err != nil {
520 if err != nil {
@@ -637,6 +649,7 @@ func (s *Server) groupPage(w http.ResponseWriter, r *http.Request) {
637 })
649 })
638 }
650 }
639 v.Repos = repos
651 v.Repos = repos
652 v.GroupRepoCount = len(all)
640 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), uid, repos), lang)
653 v.Heat = s.heatmap(r.Context(), 0, s.visibleIDs(r.Context(), uid, repos), lang)
641 if tab == "members" && role.CanRead() {
654 if tab == "members" && role.CanRead() {
642 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
655 v.Members, _ = s.Store.ListMembers(r.Context(), "group", g.ID)
internal/server/static/transfer.js +25 −0
@@ -41,3 +41,28 @@
41 41 }
42 42 sync();
43 43 })();
44
45 // Groep verwijderen: eigen modal, knop pas actief na de groepsnaam.
46 (function () {
47 var open = document.querySelector("[data-gdel-open]");
48 var dialog = document.querySelector("[data-gdel-dialog]");
49 if (!open || !dialog) {
50 return;
51 }
52 var input = dialog.querySelector("[data-gdel-confirm]");
53 var button = dialog.querySelector("[data-gdel-submit]");
54 function sync() {
55 var v = input.value.trim();
56 button.disabled = v !== input.getAttribute("data-name") && v !== input.getAttribute("data-path");
57 }
58 open.addEventListener("click", function () {
59 input.value = "";
60 sync();
61 dialog.showModal();
62 input.focus();
63 });
64 input.addEventListener("input", sync);
65 dialog.querySelector("[data-gdel-cancel]").addEventListener("click", function () {
66 dialog.close();
67 });
68 })();
@@ -41,3 +41,28 @@
41 }
41 }
42 sync();
42 sync();
43})();
43})();
44
45// Groep verwijderen: eigen modal, knop pas actief na de groepsnaam.
46(function () {
47 var open = document.querySelector("[data-gdel-open]");
48 var dialog = document.querySelector("[data-gdel-dialog]");
49 if (!open || !dialog) {
50 return;
51 }
52 var input = dialog.querySelector("[data-gdel-confirm]");
53 var button = dialog.querySelector("[data-gdel-submit]");
54 function sync() {
55 var v = input.value.trim();
56 button.disabled = v !== input.getAttribute("data-name") && v !== input.getAttribute("data-path");
57 }
58 open.addEventListener("click", function () {
59 input.value = "";
60 sync();
61 dialog.showModal();
62 input.focus();
63 });
64 input.addEventListener("input", sync);
65 dialog.querySelector("[data-gdel-cancel]").addEventListener("click", function () {
66 dialog.close();
67 });
68})();
internal/server/templates/collab.html +22 −1
@@ -974,7 +974,6 @@
974 974 </div>
975 975 </form>
976 976 </dialog>
977 <script src="/assets/transfer.js"></script>
978 977 {{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
979 978 {{end}}
980 979 <h2 id="runners">{{t "runner.title"}}</h2>
@@ -995,6 +994,28 @@
995 994 <h2>{{t "set.webhooks"}}</h2>
996 995 <p class="muted">{{t "group.secretsNote"}}</p>
997 996 {{template "webhookform" .}}
997 <section class="panel" id="danger">
998 <h2 class="tiphost">{{t "gdel.title"}} {{tip "gdel.tip"}}</h2>
999 {{if .GroupRepoCount}}
1000 <p class="muted">{{t "gdel.blocked" .GroupRepoCount}}</p>
1001 <button type="button" class="danger" disabled>{{t "gdel.button"}}</button>
1002 {{else}}
1003 <p class="muted">{{t "gdel.lead"}}</p>
1004 <button type="button" class="danger" data-gdel-open>{{t "gdel.button"}}</button>
1005 <dialog class="danger-modal" data-gdel-dialog>
1006 <form method="post" action="/groups/{{.Group.Path}}/delete">
1007 <input type="hidden" name="csrf" value="{{.CSRF}}">
1008 <p>{{t "gdel.confirm" .Group.Name}}</p>
1009 <label>{{t "set.typeName" .Group.Name}} <input name="confirm" data-gdel-confirm data-name="{{.Group.Name}}" data-path="{{.Group.Path}}" autocomplete="off"></label>
1010 <div class="row">
1011 <button type="submit" class="danger" data-gdel-submit disabled>{{t "gdel.button"}}</button>
1012 <button type="button" class="ghost" data-gdel-cancel>{{t "action.cancel"}}</button>
1013 </div>
1014 </form>
1015 </dialog>
1016 {{end}}
1017 </section>
1018 <script src="/assets/transfer.js"></script>
998 1019 {{else}}
999 1020 {{if .Heat}}{{template "heatmap" .Heat}}{{end}}
1000 1021 <form class="bar" method="get" action="/groups/{{.Group.Path}}">
@@ -974,7 +974,6 @@
974 </div>
974 </div>
975 </form>
975 </form>
976</dialog>
976</dialog>
977<script src="/assets/transfer.js"></script>
978{{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
977{{else}}<p class="muted">{{t "own.needMember"}}</p>{{end}}
979{{end}}
978{{end}}
980<h2 id="runners">{{t "runner.title"}}</h2>
979<h2 id="runners">{{t "runner.title"}}</h2>
@@ -995,6 +994,28 @@
995<h2>{{t "set.webhooks"}}</h2>
994<h2>{{t "set.webhooks"}}</h2>
996<p class="muted">{{t "group.secretsNote"}}</p>
995<p class="muted">{{t "group.secretsNote"}}</p>
997{{template "webhookform" .}}
996{{template "webhookform" .}}
997<section class="panel" id="danger">
998 <h2 class="tiphost">{{t "gdel.title"}} {{tip "gdel.tip"}}</h2>
999 {{if .GroupRepoCount}}
1000 <p class="muted">{{t "gdel.blocked" .GroupRepoCount}}</p>
1001 <button type="button" class="danger" disabled>{{t "gdel.button"}}</button>
1002 {{else}}
1003 <p class="muted">{{t "gdel.lead"}}</p>
1004 <button type="button" class="danger" data-gdel-open>{{t "gdel.button"}}</button>
1005 <dialog class="danger-modal" data-gdel-dialog>
1006 <form method="post" action="/groups/{{.Group.Path}}/delete">
1007 <input type="hidden" name="csrf" value="{{.CSRF}}">
1008 <p>{{t "gdel.confirm" .Group.Name}}</p>
1009 <label>{{t "set.typeName" .Group.Name}} <input name="confirm" data-gdel-confirm data-name="{{.Group.Name}}" data-path="{{.Group.Path}}" autocomplete="off"></label>
1010 <div class="row">
1011 <button type="submit" class="danger" data-gdel-submit disabled>{{t "gdel.button"}}</button>
1012 <button type="button" class="ghost" data-gdel-cancel>{{t "action.cancel"}}</button>
1013 </div>
1014 </form>
1015 </dialog>
1016 {{end}}
1017</section>
1018<script src="/assets/transfer.js"></script>
998{{else}}
1019{{else}}
999{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
1020{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
1000<form class="bar" method="get" action="/groups/{{.Group.Path}}">
1021<form class="bar" method="get" action="/groups/{{.Group.Path}}">
internal/store/repos.go +42 −0
@@ -4,6 +4,7 @@ import (
4 4 "context"
5 5 "database/sql"
6 6 "errors"
7 "fmt"
7 8 "sort"
8 9 "strings"
9 10 "time"
@@ -970,3 +971,44 @@ func (s *Store) SecretExpandFlags(ctx context.Context, scopeKind string, scopeID
970 971 }
971 972 return out, rows.Err()
972 973 }
974
975 // ErrGroupNotEmpty: een groep met repositories kan niet weg.
976 type ErrGroupNotEmpty struct{ Repos int }
977
978 func (e ErrGroupNotEmpty) Error() string {
979 return fmt.Sprintf("group still has %d repositories", e.Repos)
980 }
981
982 // DeleteGroup verwijdert een lege groep met leden, uitnodigingen, geheimen,
983 // webhooks, goedkeuringsregels en groepsrunners. Een groep met repositories
984 // geeft ErrGroupNotEmpty; er is geen force.
985 func (s *Store) DeleteGroup(ctx context.Context, id int64) error {
986 tx, err := s.db.BeginTx(ctx, nil)
987 if err != nil {
988 return err
989 }
990 defer tx.Rollback()
991 var n int
992 if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM repos WHERE owner_kind = 'group' AND owner_id = ?`, id).Scan(&n); err != nil {
993 return err
994 }
995 if n > 0 {
996 return ErrGroupNotEmpty{Repos: n}
997 }
998 for _, q := range []string{
999 `DELETE FROM group_members WHERE group_id = ?`,
1000 `DELETE FROM group_runner_optin WHERE group_id = ?`,
1001 `DELETE FROM pending_members WHERE scope_kind = 'group' AND scope_id = ?`,
1002 `DELETE FROM secrets WHERE scope_kind = 'group' AND scope_id = ?`,
1003 `DELETE FROM webhooks WHERE scope_kind = 'group' AND scope_id = ?`,
1004 `DELETE FROM approval_rules WHERE scope_kind = 'group' AND scope_id = ?`,
1005 `DELETE FROM runner_reg_tokens WHERE owner_kind = 'group' AND owner_id = ?`,
1006 `UPDATE runners SET revoked = 1 WHERE owner_kind = 'group' AND owner_id = ?`,
1007 `DELETE FROM groups WHERE id = ?`,
1008 } {
1009 if _, err := tx.ExecContext(ctx, q, id); err != nil {
1010 return err
1011 }
1012 }
1013 return tx.Commit()
1014 }
@@ -4,6 +4,7 @@ import (
4 "context"
4 "context"
5 "database/sql"
5 "database/sql"
6 "errors"
6 "errors"
7 "fmt"
7 "sort"
8 "sort"
8 "strings"
9 "strings"
9 "time"
10 "time"
@@ -970,3 +971,44 @@ func (s *Store) SecretExpandFlags(ctx context.Context, scopeKind string, scopeID
970 }
971 }
971 return out, rows.Err()
972 return out, rows.Err()
972}
973}
974
975// ErrGroupNotEmpty: een groep met repositories kan niet weg.
976type ErrGroupNotEmpty struct{ Repos int }
977
978func (e ErrGroupNotEmpty) Error() string {
979 return fmt.Sprintf("group still has %d repositories", e.Repos)
980}
981
982// DeleteGroup verwijdert een lege groep met leden, uitnodigingen, geheimen,
983// webhooks, goedkeuringsregels en groepsrunners. Een groep met repositories
984// geeft ErrGroupNotEmpty; er is geen force.
985func (s *Store) DeleteGroup(ctx context.Context, id int64) error {
986 tx, err := s.db.BeginTx(ctx, nil)
987 if err != nil {
988 return err
989 }
990 defer tx.Rollback()
991 var n int
992 if err := tx.QueryRowContext(ctx, `SELECT COUNT(*) FROM repos WHERE owner_kind = 'group' AND owner_id = ?`, id).Scan(&n); err != nil {
993 return err
994 }
995 if n > 0 {
996 return ErrGroupNotEmpty{Repos: n}
997 }
998 for _, q := range []string{
999 `DELETE FROM group_members WHERE group_id = ?`,
1000 `DELETE FROM group_runner_optin WHERE group_id = ?`,
1001 `DELETE FROM pending_members WHERE scope_kind = 'group' AND scope_id = ?`,
1002 `DELETE FROM secrets WHERE scope_kind = 'group' AND scope_id = ?`,
1003 `DELETE FROM webhooks WHERE scope_kind = 'group' AND scope_id = ?`,
1004 `DELETE FROM approval_rules WHERE scope_kind = 'group' AND scope_id = ?`,
1005 `DELETE FROM runner_reg_tokens WHERE owner_kind = 'group' AND owner_id = ?`,
1006 `UPDATE runners SET revoked = 1 WHERE owner_kind = 'group' AND owner_id = ?`,
1007 `DELETE FROM groups WHERE id = ?`,
1008 } {
1009 if _, err := tx.ExecContext(ctx, q, id); err != nil {
1010 return err
1011 }
1012 }
1013 return tx.Commit()
1014}