Set secure: true

TicketsBot · Jul 3, 2024 · 3c44350 · 3c44350
1 parent f7485e0
commit 3c44350
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 10 deletions.
diff --git a/cmd/cleanuser/main.go b/cmd/cleanuser/main.go
@@ -39,7 +39,8 @@ func main() {
 	}
 
 	client, err := minio.New(cfg.Endpoint, &minio.Options{
-		Creds: credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
+		Creds:  credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
+		Secure: true,
 	})
 
 	if err != nil {

diff --git a/cmd/deletetranscript/main.go b/cmd/deletetranscript/main.go
@@ -27,7 +27,8 @@ func main() {
 	}
 
 	m, err := minio.New(cfg.Endpoint, &minio.Options{
-		Creds: credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
+		Creds:  credentials.NewStaticV4(cfg.AccessKey, cfg.SecretKey, ""),
+		Secure: true,
 	})
 
 	if err != nil {

diff --git a/cmd/exportguild/main.go b/cmd/exportguild/main.go
@@ -38,7 +38,8 @@ func main() {
 
 	// create minio client
 	m, err := minio.New(conf.Endpoint, &minio.Options{
-		Creds: credentials.NewStaticV4(conf.AccessKey, conf.SecretKey, ""),
+		Creds:  credentials.NewStaticV4(conf.AccessKey, conf.SecretKey, ""),
+		Secure: true,
 	})
 	if err != nil {
 		panic(err)

diff --git a/cmd/exportuser/main.go b/cmd/exportuser/main.go
@@ -127,7 +127,8 @@ func main() {
 func getTranscripts(conf config.Config, tickets map[uint64][]int) {
 	// create minio client
 	m, err := minio.New(conf.Endpoint, &minio.Options{
-		Creds: credentials.NewStaticV4(conf.AccessKey, conf.SecretKey, ""),
+		Creds:  credentials.NewStaticV4(conf.AccessKey, conf.SecretKey, ""),
+		Secure: true,
 	})
 	if err != nil {
 		panic(err)

diff --git a/cmd/fix-file-names/main.go b/cmd/fix-file-names/main.go
@@ -20,7 +20,8 @@ func main() {
 
 	// create minio client
 	client, err := minio.New(conf.Endpoint, &minio.Options{
-		Creds: credentials.NewStaticV4(conf.AccessKey, conf.SecretKey, ""),
+		Creds:  credentials.NewStaticV4(conf.AccessKey, conf.SecretKey, ""),
+		Secure: true,
 	})
 	if err != nil {
 		panic(err)
@@ -31,11 +32,8 @@ func main() {
 		panic(err)
 	}
 
-	doneCh := make(chan struct{})
-	defer close(doneCh)
-
 	ch := client.ListObjects(context.Background(), conf.Bucket, minio.ListObjectsOptions{
-		Prefix:    "",
+		Prefix:    "8",
 		Recursive: true,
 	})
 

diff --git a/cmd/logarchiver/main.go b/cmd/logarchiver/main.go
@@ -45,7 +45,8 @@ func main() {
 
 	// create minio client
 	client, err := minio.New(conf.Endpoint, &minio.Options{
-		Creds: credentials.NewStaticV4(conf.AccessKey, conf.SecretKey, ""),
+		Creds:  credentials.NewStaticV4(conf.AccessKey, conf.SecretKey, ""),
+		Secure: true,
 	})
 	if err != nil {
 		logger.Fatal("Failed to create minio client", zap.Error(err), zap.String("endpoint", conf.Endpoint))

diff --git a/pkg/http/server.go b/pkg/http/server.go
@@ -37,6 +37,7 @@ func (s *Server) RegisterRoutes() {
 
 	s.router.GET("/", s.ticketGetHandler)
 	s.router.POST("/", s.ticketUploadHandler)
+	s.router.DELETE("/", s.ticketDeleteHandler)
 
 	s.router.GET("/guild/status/:id", s.purgeStatusHandler)
 	s.router.DELETE("/guild/:id", s.purgeGuildHandler)

diff --git a/pkg/http/ticketdelete.go b/pkg/http/ticketdelete.go
@@ -0,0 +1,33 @@
+package http
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http"
+	"strconv"
+)
+
+func (s *Server) ticketDeleteHandler(ctx *gin.Context) {
+	guild, err := strconv.ParseUint(ctx.Query("guild"), 10, 64)
+	if err != nil {
+		ctx.JSON(400, gin.H{
+			"message": "missing guild ID",
+		})
+		return
+	}
+
+	id, err := strconv.Atoi(ctx.Query("id"))
+	if err != nil {
+		ctx.JSON(400, gin.H{
+			"message": "missing ticket ID",
+		})
+		return
+	}
+
+	if err := s.s3.DeleteTicket(ctx, guild, id); err != nil {
+		ctx.JSON(500, gin.H{
+			"message": err.Error(),
+		})
+	}
+
+	ctx.Status(http.StatusNoContent)
+}