From abfd484ec0c0a95ea15d20ea86f6af28767a47a6 Mon Sep 17 00:00:00 2001
From: Jin Dong <jindon@amazon.com>
Date: Mon, 27 Feb 2023 03:42:57 +0000
Subject: [PATCH] Change issue template from markdown to issue form

Signed-off-by: Jin Dong <jindon@amazon.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md        | 29 -----------------
 .github/ISSUE_TEMPLATE/bug_report.yaml      | 36 +++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml           |  9 ++++++
 .github/ISSUE_TEMPLATE/feature_request.md   | 20 ------------
 .github/ISSUE_TEMPLATE/feature_request.yaml | 24 ++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md            |  6 ++--
 6 files changed, 72 insertions(+), 52 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yaml
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yaml

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index de5fa7614..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG]"
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-
-**Steps To Reproduce**
-How to reproduce the bug. 
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-
-
-**Configuration (please complete the following information):**
- - OS: 
- - Snapshotter Version:
- - Containerd Version: 
-
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 000000000..57ba30ebd
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,36 @@
+name: Bug report
+description: Create a bug report to help improve soci-snapshotter
+title: "[Bug] "
+labels: ["bug"]
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        Briefly describe the problem/bug you are having.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce the bug
+
+  - type: textarea
+    attributes:
+      label: Describe the results you expected
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Host information
+      value: |
+        1. OS: 
+        2. Snapshotter Version: 
+        3. Containerd Version: 
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Any additional context or information about the bug
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..e7c4f48e4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,9 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Ask a question (GitHub Discussions)
+    url: https://github.com/awslabs/soci-snapshotter/discussions
+    about: |
+      In most cases, GitHub Discussions is the preferred place to ask a question, 
+      and visible to more users. If you encountered a bug or request a feature, 
+      please use the issue template. Otherwise, please consider asking in GitHub
+      Discussions first.
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 3d8a23ac2..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: "[FEATURE]"
-labels: feature
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. 
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 000000000..7d05a7cd8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,24 @@
+name: Feature request
+description: Suggest an idea or new feature for this project
+title: "[FEATURE] "
+labels: ["feature"]
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: |
+        Briefly describe the feature request and, if related to a problem, what the problem is.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+
+  - type: textarea
+    attributes:
+      label: Describe any alternative solutions/features you've considered
+
+  - type: textarea
+    attributes:
+      label: Any additional context or information about the feature request
\ No newline at end of file
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b0f277f5a..85e670bcb 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
-*Issue #, if available:*
+**Issue #, if available:**
 
-*Description of changes:*
+**Description of changes:**
 
-*Testing performed:*
+**Testing performed:**
 
 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.