prepare for Isucon 10 qualify

aws/aws.go

@@ -15,8 +15,8 @@ import (
 )
 
 const (
-	imageId      = string("ami-0796be4f4814fc3d5") // isucon競技用サーバーのAMI
-	InstanceType = types.InstanceTypeT2Medium      // isuconサーバーの種類(競技ごとにスペックが違う)
+	imageId      = string("ami-03bbe60df80bdccc0") // isucon競技用サーバーのAMI
+	InstanceType = types.InstanceTypeT2Small       // isuconサーバーの種類(競技ごとにスペックが違う)
 	region       = string("ap-northeast-1")        // isuconサーバーのリージョン
 )
 
@@ -77,7 +77,7 @@ useradd -m isucon
 echo "%s\n%s\n" | passwd isucon
 usermod -G sudo isucon
 sed -e "s/PasswordAuthentication no/PasswordAuthentication yes/g" -i /etc/ssh/sshd_config
-systemctl restart sshd	
+systemctl restart sshd
 	`, pwd, pwd)
 	enc := base64.StdEncoding.EncodeToString([]byte(startUpScript))
 	nispec := types.InstanceNetworkInterfaceSpecification{

router/handlers.go

@@ -6,9 +6,7 @@ import (
 	"log"
 	"math/rand"
 	"net/http"
-	"os"
 	"strconv"
-	"strings"
 
 	"github.com/labstack/echo/v4"
 	"github.com/traPtitech/piscon-portal/model"
@@ -51,10 +49,7 @@ func genPassword() string {
 func formatCommand(ip string, allAddresses []string) string {
 	// TODO: target, all-addressesを環境変数で渡すようにする
 	return fmt.Sprintf("/bench/bench "+
-		"-tls "+
-		"-target=%s "+
-		"-all-addresses=%s "+
-		"-jia-service-url=http://%s:5000", ip, strings.Join(allAddresses, ","), os.Getenv("BENCH_PRIVATE_IP"))
+		"--target-url=%s ", ip)
 }
 
 func (h *Handlers) GetNewer(c echo.Context) error {