Simplify file name

server/cmd/mmctl/commands/system.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"time"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -80,7 +79,7 @@ func init() {
 	SystemSetBusyCmd.Flags().UintP("seconds", "s", 3600, "Number of seconds until server is automatically marked as not busy.")
 	_ = SystemSetBusyCmd.MarkFlagRequired("seconds")
 
-	SystemSupportPacketCmd.Flags().StringP("output-file", "o", fmt.Sprintf("mattermost_support_packet_%s.zip", time.Now().Format("2006-01-02-03-04")), "Output file name")
+	SystemSupportPacketCmd.Flags().StringP("output-file", "o", "mattermost_support_packet.zip", "Output file name")
 
 	SystemCmd.AddCommand(
 		SystemGetBusyCmd,

server/cmd/mmctl/commands/system_e2e_test.go

@@ -5,7 +5,6 @@ package commands
 
 import (
 	"os"
-	"strings"
 	"time"
 
 	"github.com/mattermost/mattermost/server/v8/cmd/mmctl/client"
@@ -115,7 +114,9 @@ func (s *MmctlE2ETestSuite) TestSupportPacketCmdF() {
 	s.Run("Download support packet with default filename", func() {
 		printer.Clean()
 
-		s.T().Cleanup(cleanupSupportPacket(s.T()))
+		s.T().Cleanup(func() {
+			s.Require().NoError(os.Remove("mattermost_support_packet.zip"))
+		})
 
 		err := systemSupportPacketCmdF(s.th.SystemAdminClient, SystemSupportPacketCmd, []string{})
 		s.Require().NoError(err)
@@ -124,21 +125,9 @@ func (s *MmctlE2ETestSuite) TestSupportPacketCmdF() {
 		s.Require().Contains(printer.GetLines()[1], "Downloaded Support Packet to ")
 		s.Require().Len(printer.GetErrorLines(), 0)
 
-		var found bool
-
-		entries, err := os.ReadDir(".")
+		b, err := os.ReadFile("mattermost_support_packet.zip")
 		s.Require().NoError(err)
-		for _, e := range entries {
-			if strings.HasPrefix(e.Name(), "mattermost_support_packet_") && strings.HasSuffix(e.Name(), ".zip") {
-				b, err := os.ReadFile(e.Name())
-				s.NoError(err)
-
-				s.NotEmpty(b, b)
-
-				found = true
-			}
-		}
-		s.True(found)
+		s.NotNil(b, b)
 	})
 
 	s.Run("Download support packet with custom filename", func() {

server/cmd/mmctl/commands/system_test.go

@@ -8,15 +8,11 @@ import (
 	"net/http"
 	"os"
 	"strconv"
-	"strings"
-	"testing"
 	"time"
 
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 
 	"github.com/mattermost/mattermost/server/v8/cmd/mmctl/printer"
 )
@@ -215,19 +211,6 @@ func (s *MmctlUnitTestSuite) TestServerStatusCmd() {
 	})
 }
 
-func cleanupSupportPacket(t *testing.T) func() {
-	return func() {
-		entries, err := os.ReadDir(".")
-		require.NoError(t, err)
-		for _, e := range entries {
-			if strings.HasPrefix(e.Name(), "mattermost_support_packet_") && strings.HasSuffix(e.Name(), ".zip") {
-				err = os.Remove(e.Name())
-				assert.NoError(t, err)
-			}
-		}
-	}
-}
-
 func (s *MmctlUnitTestSuite) TestSupportPacketCmdF() {
 	printer.SetFormat(printer.FormatPlain)
 	s.T().Cleanup(func() { printer.SetFormat(printer.FormatJSON) })
@@ -235,7 +218,9 @@ func (s *MmctlUnitTestSuite) TestSupportPacketCmdF() {
 	s.Run("Download support packet with default filename", func() {
 		printer.Clean()
 
-		s.T().Cleanup(cleanupSupportPacket(s.T()))
+		s.T().Cleanup(func() {
+			s.Require().NoError(os.Remove("mattermost_support_packet.zip"))
+		})
 
 		data := []byte("some bytes")
 		s.client.
@@ -251,21 +236,9 @@ func (s *MmctlUnitTestSuite) TestSupportPacketCmdF() {
 		s.Require().Equal(printer.GetLines()[0], "Downloading Support Packet")
 		s.Require().Contains(printer.GetLines()[1], "Downloaded Support Packet to ")
 
-		var found bool
-
-		entries, err := os.ReadDir(".")
+		b, err := os.ReadFile("mattermost_support_packet.zip")
 		s.Require().NoError(err)
-		for _, e := range entries {
-			if strings.HasPrefix(e.Name(), "mattermost_support_packet_") && strings.HasSuffix(e.Name(), ".zip") {
-				b, err := os.ReadFile(e.Name())
-				s.NoError(err)
-				s.Equal(b, data)
-
-				found = true
-			}
-		}
-
-		s.True(found)
+		s.NotNil(b, b)
 	})
 
 	s.Run("Download support packet with custom filename", func() {

server/cmd/mmctl/docs/mmctl_system_supportpacket.rst

@@ -28,7 +28,7 @@ Options
 ::
 
   -h, --help                 help for supportpacket
-  -o, --output-file string   Output file name (default "mattermost_support_packet_2023-11-13-02-28.zip")
+  -o, --output-file string   Output file name (default "mattermost_support_packet.zip")
 
 Options inherited from parent commands
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~