remove get5 and rcon stuff

Dockerfile

@@ -9,7 +9,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -ldflags="-s -w
 # Runtime image
 FROM redhat/ubi9-minimal:9.3
 
-RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
+RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
 RUN microdnf -y update && microdnf -y install ca-certificates inotify-tools && microdnf reinstall -y tzdata
 
 COPY --from=build-env /app/app /

cmd/unwindia_pterodactyl/environment/environment.go

@@ -32,8 +32,6 @@ type environment struct {
 	PteroClientApiURL        url.URL       `env:"PTERODACTYL_CLIENT_API_URL,notEmpty"`
 	PteroClientApiToken      string        `env:"PTERODACTYL_CLIENT_API_TOKEN,notEmpty"`
 	PteroFetchInterval       time.Duration `env:"PTERODACTYL_FETCH_INTERVAL" envDefault:"15s"`
-
-	RconRetries int `env:"RCON_RETRIES" envDefault:"10" envDescription:"How often to retry"`
 }
 
 // Environment holds all environment configuration with more advanced typing and validation

cmd/unwindia_pterodactyl/jobs/worker.go

@@ -9,9 +9,7 @@ import (
 	"github.com/GSH-LAN/Unwindia_common/src/go/workitemLock"
 	"github.com/GSH-LAN/Unwindia_pterodactyl/cmd/unwindia_pterodactyl/database"
 	"github.com/GSH-LAN/Unwindia_pterodactyl/cmd/unwindia_pterodactyl/pterodactyl"
-	"github.com/GSH-LAN/Unwindia_pterodactyl/cmd/unwindia_pterodactyl/template"
 	"github.com/ThreeDotsLabs/watermill/message"
-	rcon "github.com/forewing/csgo-rcon"
 	"github.com/gammazero/workerpool"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/modern-go/reflect2"
@@ -33,11 +31,10 @@ type Worker struct {
 	semaphore      *semaphore.Weighted
 	jobLock        workitemLock.WorkItemLock
 	config         config.ConfigClient
-	rconRetries    int
 	baseTopic      string
 }
 
-func NewWorker(ctx context.Context, db database.DatabaseClient, pool *workerpool.WorkerPool, pteroClient pterodactyl.Client, matchPublisher message.Publisher, config config.ConfigClient, rconRetries int, baseTopic string) *Worker {
+func NewWorker(ctx context.Context, db database.DatabaseClient, pool *workerpool.WorkerPool, pteroClient pterodactyl.Client, matchPublisher message.Publisher, config config.ConfigClient, baseTopic string) *Worker {
 	w := Worker{
 		ctx:            ctx,
 		db:             db,
@@ -47,7 +44,6 @@ func NewWorker(ctx context.Context, db database.DatabaseClient, pool *workerpool
 		semaphore:      semaphore.NewWeighted(int64(1)),
 		jobLock:        workitemLock.NewMemoryWorkItemLock(),
 		config:         config,
-		rconRetries:    rconRetries,
 		baseTopic:      baseTopic,
 	}
 	return &w
@@ -177,33 +173,6 @@ func (w *Worker) processJob(ctx context.Context, job *database.Job) error {
 			return err
 		}
 
-		rconClient := rcon.New(job.MatchInfo.ServerAddress, servermgmtpass, time.Second*10)
-		go func() {
-			time.Sleep(gsTemplate.ServerReadyRconWaitTime.Duration)
-
-			for _, command := range gsTemplate.ServerReadyRconCommands {
-				for i := 0; i < w.rconRetries; i++ {
-					parsedCommand, err := template.ParseTemplateForMatch(command, &job.MatchInfo)
-					if err != nil {
-						log.Error().Err(err).Str("jobid", job.ID.String()).Str("command", command).Msg("Error parsing rcon command template")
-						continue
-					}
-
-					_, err = rconClient.Execute(parsedCommand)
-					if err != nil {
-						log.Error().Err(err).Str("jobid", job.ID.String()).Str("command", parsedCommand).Str("address", job.MatchInfo.ServerAddress).Msg("Error executing rcon command")
-						continue
-					}
-
-					log.Debug().Str("command", parsedCommand).Msg("Successfully executed command")
-					time.Sleep(time.Second)
-					break
-				}
-			}
-		}()
-
-		// We now need to publish to message queue
-
 		msg := messagebroker.Message{
 			Type:    messagebroker.MessageTypeUpdated,
 			SubType: messagebroker.UNWINDIA_MATCH_SERVER_READY.String(),

cmd/unwindia_pterodactyl/server/server.go

@@ -13,7 +13,6 @@ import (
 	"github.com/GSH-LAN/Unwindia_pterodactyl/cmd/unwindia_pterodactyl/messagequeue"
 	"github.com/GSH-LAN/Unwindia_pterodactyl/cmd/unwindia_pterodactyl/pterodactyl"
 	"github.com/GSH-LAN/Unwindia_pterodactyl/cmd/unwindia_pterodactyl/router"
-	"github.com/GSH-LAN/Unwindia_pterodactyl/cmd/unwindia_pterodactyl/template"
 	"github.com/ThreeDotsLabs/watermill/message"
 	"github.com/gammazero/workerpool"
 	"github.com/gin-gonic/gin"
@@ -63,7 +62,7 @@ func NewServer(ctx context.Context, env *environment.Environment, cfgClient conf
 		return nil, err
 	}
 
-	jobHandler := jobs.NewWorker(ctx, dbClient, wp, pteroClient, matchPublisher, cfgClient, env.RconRetries, env.PulsarBaseTopic)
+	jobHandler := jobs.NewWorker(ctx, dbClient, wp, pteroClient, matchPublisher, cfgClient, env.PulsarBaseTopic)
 
 	srv := Server{
 		ctx:            ctx,
@@ -223,11 +222,7 @@ func (s *Server) setupRouter() {
 	// GinErrorHandler middleware for handle problem details error on gin
 	s.router.Use(func(c *gin.Context) {
 		c.Next()
-
 		for _, err := range c.Errors {
-
-			// add custom map problem details here...
-
 			if _, err := problem.ResolveProblemDetails(c.Writer, c.Request, err); err != nil {
 				log.Error().Err(err).Msg("gin error")
 			}
@@ -240,14 +235,9 @@ func (s *Server) setupRouter() {
 	//internal.GET("/health", gin.WrapF(handlers.NewJSONHandlerFunc(health.Health, nil)))
 	internal.GET("/metrics", gin.WrapH(promhttp.Handler()))
 
-	//serverApi := s.router.Group("/api/v1/server")
-	//serverApi.POST("/")
-
 	v1Api := s.router.Group("/api/v1")
 	v1Api.POST("/jobs", s.handleCreateJob)
 	v1Api.POST("/preinstall/:game/:amount", s.handlePreinstall)
-
-	v1Api.GET("/match/:matchid/:template", s.handleMatchTemplate)
 }
 
 func (s *Server) handleCreateJob(ctx *gin.Context) {
@@ -321,40 +311,3 @@ func (s *Server) handlePreinstall(ctx *gin.Context) {
 		ctx.JSON(http.StatusCreated, gin.H{"servers": createdJobs})
 	}
 }
-
-func (s *Server) handleMatchTemplate(ctx *gin.Context) {
-	matchid := ctx.Param("matchid")
-	templateName := ctx.Param("template")
-
-	matchInfo, err := s.dbClient.GetMatchInfoForMatchId(s.ctx, matchid)
-	if err != nil {
-		log.Error().Err(err).Msg("error getting info for match")
-		ctx.JSON(http.StatusInternalServerError, gin.H{
-			"error": err.Error(),
-		})
-		return
-	}
-
-	templateText, ok := s.config.GetConfig().Templates[fmt.Sprintf("PTERODACTYL_%s.gohtml", templateName)]
-	if !ok {
-		log.Error().Str("template", templateName).Msg("template not found")
-		ctx.JSON(http.StatusBadRequest, gin.H{
-			"error": fmt.Errorf("template %s not found", templateName),
-		})
-		return
-	}
-
-	parsedMatchTemplate, err := template.ParseTemplateForMatch(templateText, &matchInfo.MatchInfo)
-	if err != nil {
-		log.Error().Err(err).Msg("Error parsing template")
-		ctx.JSON(http.StatusInternalServerError, gin.H{
-			"error": err.Error(),
-		})
-		return
-	}
-	log.Debug().Str("commentText", parsedMatchTemplate).Msg("parsed Template")
-
-	log.Info().Str("matchid", matchid).Str("template", templateName).Msg("creating template for match")
-
-	ctx.String(http.StatusOK, parsedMatchTemplate)
-}