From 481f73c0668d6213a4f42ec97862d94c510301de Mon Sep 17 00:00:00 2001
From: Marek Siarkowicz <siarkowicz@google.com>
Date: Tue, 13 Sep 2022 15:14:20 +0200
Subject: [PATCH] github: Improve issue templates to speed up issue triage

Add feature request and test flake template to stop users from using wrong or empty
template
Redirect questions to discuss page to remove load from maintainers.
Remove distributors appliations as they are not used at all.

Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
---
 .../{bug-report.yaml => bug-report.yml}       |  2 +-
 .github/ISSUE_TEMPLATE/config.yml             |  5 +++
 .../distributors-application.md               | 28 ----------------
 .github/ISSUE_TEMPLATE/feature-request.yml    | 18 ++++++++++
 .github/ISSUE_TEMPLATE/test-flake.yml         | 33 +++++++++++++++++++
 5 files changed, 57 insertions(+), 29 deletions(-)
 rename .github/ISSUE_TEMPLATE/{bug-report.yaml => bug-report.yml} (99%)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/distributors-application.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature-request.yml
 create mode 100644 .github/ISSUE_TEMPLATE/test-flake.yml

diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yml
similarity index 99%
rename from .github/ISSUE_TEMPLATE/bug-report.yaml
rename to .github/ISSUE_TEMPLATE/bug-report.yml
index 77f5acb58..4b79a5567 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,7 +1,7 @@
 name: Bug Report
 description: Report a bug encountered while operating Etcd
 labels:
-- area/bug
+- type/bug
 body:
 - type: markdown
   attributes:
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..232cdb8e8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+- name: Question
+  url: https://github.com/etcd-io/etcd/discussions
+  about: Question relating to Etcd
diff --git a/.github/ISSUE_TEMPLATE/distributors-application.md b/.github/ISSUE_TEMPLATE/distributors-application.md
deleted file mode 100644
index 2f65c6afa..000000000
--- a/.github/ISSUE_TEMPLATE/distributors-application.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: Distributors Application
-title: Distributors Application for <YOUR DISTRIBUTION HERE>
-about: Apply for membership of security@etcd.io
----
-
-<!--
-Please answer the following questions and provide supporting evidence for
-meeting the membership criteria.
--->
-
-**Actively monitored security email alias for our project:**
-
-**1. Have a user base not limited to your own organization.**
-
-**2. Have a publicly verifiable track record up to present day of fixing security issues.**
-
-**3. Not be a downstream or rebuild of another distribution.**
-
-**4. Be a participant and active contributor in the community.**
-
-**5. Accept the Embargo Policy.**
-<!-- https://github.com/etcd-io/etcd/blob/main/security/security-release-process.md#disclosures -->
-
-**6. Be willing to contribute back.**
-<!-- Per https://github.com/etcd-io/etcd/blob/main/security/security-release-process.md#patch-release-and-public-communication -->
-
-**7. Have someone already on the list vouch for the person requesting membership on behalf of your distribution.**
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 000000000..6adfe60c7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,18 @@
+name: Feature request
+description: Provide idea for a new feature
+labels:
+- type/feature
+body:
+- type: textarea
+  id: feature
+  attributes:
+    label: What would you like to be added?
+  validations:
+    required: true
+
+- type: textarea
+  id: rationale
+  attributes:
+    label: Why is this needed?
+  validations:
+    required: true
diff --git a/.github/ISSUE_TEMPLATE/test-flake.yml b/.github/ISSUE_TEMPLATE/test-flake.yml
new file mode 100644
index 000000000..2e12b2177
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/test-flake.yml
@@ -0,0 +1,33 @@
+name: Flaking Test
+description: Report flaky tests
+labels:
+- type/flake
+body:
+- type: textarea
+  id: workflows
+  attributes:
+    label: Which github workflows are flaking?
+  validations:
+    required: true
+
+- type: textarea
+  id: tests
+  attributes:
+    label: Which tests are flaking?
+  validations:
+    required: true
+
+- type: input
+  id: link
+  attributes:
+    label: Github Action link
+
+- type: textarea
+  id: reason
+  attributes:
+    label: Reason for failure (if possible)
+
+- type: textarea
+  id: additional
+  attributes:
+    label: Anything else we need to know?