From 103c4e0389dac74d0fd867cd72f92d72ef79e7ee Mon Sep 17 00:00:00 2001
From: Don Olmstead <don.j.olmstead@gmail.com>
Date: Thu, 12 May 2022 06:56:01 -0700
Subject: [PATCH] Revert "Allow creating/updating the release discussion
 category (#89)"

This reverts commit ce75483751c965471d44397eb232efa877792a37.
---
 cmd/drone-github-release/config.go |  6 ------
 cmd/drone-github-release/main.go   |  2 +-
 plugin/impl.go                     |  2 --
 plugin/release.go                  | 28 +++++++---------------------
 4 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/cmd/drone-github-release/config.go b/cmd/drone-github-release/config.go
index b5c3da6a3..a09c40766 100644
--- a/cmd/drone-github-release/config.go
+++ b/cmd/drone-github-release/config.go
@@ -69,12 +69,6 @@ func settingsFlags(settings *plugin.Settings) []cli.Flag {
 			EnvVars:     []string{"PLUGIN_PRERELEASE", "GITHUB_RELEASE_PRERELEASE"},
 			Destination: &settings.Prerelease,
 		},
-		&cli.StringFlag{
-			Name:        "discussion-category",
-			Usage:       "create a discussion in the given category",
-			EnvVars:     []string{"PLUGIN_DISCUSSION_CATEGORY", "GITHUB_RELEASE_DISCUSSION_CATEGORY"},
-			Destination: &settings.DiscussionCategory,
-		},
 		&cli.StringFlag{
 			Name:        "base-url",
 			Usage:       "api url, needs to be changed for ghe",
diff --git a/cmd/drone-github-release/main.go b/cmd/drone-github-release/main.go
index fe4b69e9c..c415bc7af 100644
--- a/cmd/drone-github-release/main.go
+++ b/cmd/drone-github-release/main.go
@@ -10,11 +10,11 @@ package main
 import (
 	"os"
 
-	"github.com/drone-plugins/drone-github-release/plugin"
 	"github.com/drone-plugins/drone-plugin-lib/errors"
 	"github.com/drone-plugins/drone-plugin-lib/urfave"
 	"github.com/joho/godotenv"
 	"github.com/urfave/cli/v2"
+	"github.com/drone-plugins/drone-github-release/plugin"
 )
 
 var version = "unknown"
diff --git a/plugin/impl.go b/plugin/impl.go
index c7587bff5..49d8ca2bd 100644
--- a/plugin/impl.go
+++ b/plugin/impl.go
@@ -28,7 +28,6 @@ type Settings struct {
 	ChecksumFlatten      bool
 	Draft                bool
 	Prerelease           bool
-	DiscussionCategory   string
 	BaseURL              string
 	UploadURL            string
 	Title                string
@@ -144,7 +143,6 @@ func (p *Plugin) Execute() error {
 		Tag:                  strings.TrimPrefix(p.pipeline.Commit.Ref, "refs/tags/"),
 		Draft:                p.settings.Draft,
 		Prerelease:           p.settings.Prerelease,
-		DiscussionCategory:   p.settings.DiscussionCategory,
 		FileExists:           p.settings.FileExists,
 		Title:                p.settings.Title,
 		Note:                 p.settings.Note,
diff --git a/plugin/release.go b/plugin/release.go
index 7573ffdbf..17ba82aa8 100644
--- a/plugin/release.go
+++ b/plugin/release.go
@@ -24,7 +24,6 @@ type releaseClient struct {
 	Draft                bool
 	Prerelease           bool
 	FileExists           string
-	DiscussionCategory   string
 	Title                string
 	Note                 string
 	Overwrite            bool
@@ -97,19 +96,13 @@ func (rc *releaseClient) editRelease(targetRelease github.RepositoryRelease) (*g
 	// only potentially change the draft value, if it's a draft right now
 	// i.e. a drafted release will be published, but a release won't be unpublished
 	if targetRelease.GetDraft() {
+		fmt.Printf("DRAFT: %+v\n", rc.Draft)
 		if !rc.Draft {
 			fmt.Println("Publishing a release draft")
 		}
 		sourceRelease.Draft = &rc.Draft
 	}
 
-	// do not overwrite the discussion category
-	if targetRelease.GetDiscussionCategoryName() == "" {
-		if rc.DiscussionCategory != "" {
-			sourceRelease.DiscussionCategoryName = &rc.DiscussionCategory
-		}
-	}
-
 	modifiedRelease, _, err := rc.Client.Repositories.EditRelease(rc.Context, rc.Owner, rc.Repo, targetRelease.GetID(), sourceRelease)
 
 	if err != nil {
@@ -122,13 +115,12 @@ func (rc *releaseClient) editRelease(targetRelease github.RepositoryRelease) (*g
 
 func (rc *releaseClient) newRelease() (*github.RepositoryRelease, error) {
 	rr := &github.RepositoryRelease{
-		TagName:                github.String(rc.Tag),
-		Draft:                  &rc.Draft,
-		Prerelease:             &rc.Prerelease,
-		DiscussionCategoryName: &rc.DiscussionCategory,
-		Name:                   &rc.Title,
-		Body:                   &rc.Note,
-		GenerateReleaseNotes:   &rc.GenerateReleaseNotes,
+		TagName:              github.String(rc.Tag),
+		Draft:                &rc.Draft,
+		Prerelease:           &rc.Prerelease,
+		Name:                 &rc.Title,
+		Body:                 &rc.Note,
+		GenerateReleaseNotes: &rc.GenerateReleaseNotes,
 	}
 
 	if *rr.Prerelease {
@@ -147,12 +139,6 @@ func (rc *releaseClient) newRelease() (*github.RepositoryRelease, error) {
 		fmt.Printf("Release notes for %s will be automatically generated\n", rc.Tag)
 	}
 
-	if *rr.DiscussionCategoryName != "" {
-		fmt.Printf("Release discussion in category %s\n", *rr.DiscussionCategoryName)
-	} else {
-		fmt.Println("Not creating a discussion")
-	}
-
 	release, _, err := rc.Client.Repositories.CreateRelease(rc.Context, rc.Owner, rc.Repo, rr)
 
 	if err != nil {