From 838d6413918631dcd18226683c068589f192bdb8 Mon Sep 17 00:00:00 2001
From: David Graham <dpgraham4401@gmail.com>
Date: Mon, 12 Jun 2023 11:44:25 -0400
Subject: [PATCH 1/3] fix labels in issue templates

---
 .github/ISSUE_TEMPLATE/bug.md     | 6 +++---
 .github/ISSUE_TEMPLATE/feature.md | 4 ++--
 .github/ISSUE_TEMPLATE/other.md   | 4 +++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index af70fd5ec..463b5d2f6 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,11 +1,11 @@
 ---
-name: '🐞 Bug Report'
+name: ':bug: Bug Report'
 about: 'Report an issue.'
 title: ''
-labels: 'Type: bug'
+labels: 'bug'
 ---
 
-# 🐞 Bug Report
+# :bug: Bug Report
 
 <!--
 Please provide a clear and concise description, steps to reproduce, and any other information you believe may be useful.
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 781183bc6..954924e8d 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -2,10 +2,10 @@
 name: '🚀 Feature Request'
 about: 'Suggest an idea or possible new feature.'
 title: ''
-labels: 'Type: feature'
+labels: 'enhancement'
 ---
 
-# 🚀 Feature Request
+# :rocket: Feature Request
 
 <!--
 Please provide a clear and concise description of what you'd like to see. Things like...
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index b57cf45bd..091d7ba1c 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -1,8 +1,10 @@
 ---
-name: 'Something else'
+name: ':nut_and_bolt: Something else'
 about: 'Questions, discussion, or other'
 title: ''
 labels: ''
 ---
 
+# :nut_and_bolt: Something else
+
 <!-- The floor is yours... -->

From 62cf24a7342e72448dfe0abb334ad14b2ed4472b Mon Sep 17 00:00:00 2001
From: David Graham <dpgraham4401@gmail.com>
Date: Mon, 12 Jun 2023 12:03:02 -0400
Subject: [PATCH 2/3] conform PR labeler to current issue labels in GH

---
 .github/labeler.yml                           |  9 +++++---
 .postman/api                                  |  4 ----
 .../api_ef9401d4-9ba5-4d17-9d1e-fa19efcc52d3  | 22 -------------------
 3 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 .postman/api
 delete mode 100644 .postman/api_ef9401d4-9ba5-4d17-9d1e-fa19efcc52d3

diff --git a/.github/labeler.yml b/.github/labeler.yml
index fbb5f84ed..51ac736cd 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -4,14 +4,17 @@ test:
   - client/src/**/*.spec.tsx
   - server/apps/trak/tests/**/*
 
-django:
+server:
   - server/**/*
 
-reactjs:
+client:
   - client/**/*
 
+infrastructure:
+  - any: ['docker-compose.yaml', 'infra/**/*.tf']
+
 CI/CD:
-  - any: ['.github/workflows/**.yaml', '**/*Dockerfile', '**/*.dockerignore']
+  - any: ['.github/**/*', '**/*Dockerfile', '**/*.dockerignore']
 
 documentation:
   - any: ['docs/**/*', 'docs/haztrak_book/**/*', '**/README.md']
diff --git a/.postman/api b/.postman/api
deleted file mode 100644
index b79f0e4dc..000000000
--- a/.postman/api
+++ /dev/null
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
-apis[] = {"apiId":"ef9401d4-9ba5-4d17-9d1e-fa19efcc52d3"}
-configVersion = 1.0.0
-type = api
diff --git a/.postman/api_ef9401d4-9ba5-4d17-9d1e-fa19efcc52d3 b/.postman/api_ef9401d4-9ba5-4d17-9d1e-fa19efcc52d3
deleted file mode 100644
index 42b2c74b7..000000000
--- a/.postman/api_ef9401d4-9ba5-4d17-9d1e-fa19efcc52d3
+++ /dev/null
@@ -1,22 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY
-configVersion = 1.0.0
-type = apiEntityData
-
-[config]
-id = ef9401d4-9ba5-4d17-9d1e-fa19efcc52d3
-
-[config.relations]
-
-[config.relations.collections]
-rootDirectory = docs/api/postman/collections
-files[] = {"id":"15928187-d4087567-913b-42d2-a616-551e001f1dff","path":"Haztrak API.json","metaData":{}}
-
-[config.relations.collections.metaData]
-
-[config.relations.apiDefinition]
-rootDirectory = docs/api/postman/schemas
-files[] = {"path":"openapi-schema.yaml","metaData":{}}
-
-[config.relations.apiDefinition.metaData]
-type = openapi:3
-rootFiles[] = openapi-schema.yaml

From 8dc9249c053c78d4068ee0b24297b050a584fc4d Mon Sep 17 00:00:00 2001
From: David Graham <dpgraham4401@gmail.com>
Date: Mon, 12 Jun 2023 13:53:47 -0400
Subject: [PATCH 3/3] update the release drafter to use new labels

---
 .github/ISSUE_TEMPLATE/other.md        |  6 ++----
 .github/release-drafter.yml            | 28 ++++++++++++++++++++++++++
 .github/workflows/release-drafter.yaml |  3 +++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
index 091d7ba1c..cd13edb7e 100644
--- a/.github/ISSUE_TEMPLATE/other.md
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -1,10 +1,8 @@
 ---
 name: ':nut_and_bolt: Something else'
-about: 'Questions, discussion, or other'
+about: 'Questions, discussions, chores, or other'
 title: ''
-labels: ''
+labels: 'chore'
 ---
 
 # :nut_and_bolt: Something else
-
-<!-- The floor is yours... -->
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 63045503b..4a3ce740b 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,6 +1,34 @@
 name-template: 'v$RESOLVED_VERSION'
 tag-template: 'v$RESOLVED_VERSION'
 change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+categories:
+  - title: '🚀 Features'
+    labels:
+      - 'feature'
+      - 'enhancement'
+  - title: '🐛 Bug Fixes'
+    labels:
+      - 'bug'
+  - title: ':nut_and_bolt: Maintenance'
+    labels:
+      - 'chore'
+      - 'infrastructure'
+      - 'documentation'
+exclude-labels:
+  - 'skip-changelog'
+version-resolver:
+  major:
+    labels:
+      - 'major'
+  minor:
+    labels:
+      - 'enhancement'
+  patch:
+    labels:
+      - 'bug'
+      - 'chore'
+      - 'infrastructure'
+  default: patch
 template: |
   ## Changes
 
diff --git a/.github/workflows/release-drafter.yaml b/.github/workflows/release-drafter.yaml
index b3e48d552..9c2e2d272 100644
--- a/.github/workflows/release-drafter.yaml
+++ b/.github/workflows/release-drafter.yaml
@@ -8,6 +8,9 @@ on:
   pull_request:
     # Only following types are handled by the action, but one can default to all as well
     types: [opened, reopened, synchronize]
+  # pull_request_target event is required for autolabeler to support PRs from forks
+  pull_request_target:
+    types: [opened, reopened, synchronize]
 
 permissions:
   contents: read