WIP:リファクタとAWSへの対応

.dockerignore

@@ -0,0 +1,17 @@
+db/
+client/
+conoha/
+.git/
+docs/
+
+.dockerignore
+.gitignore
+log.json
+topology.drawio
+README.md
+docker-compose*.yml
+Dockerfile
+Makefile
+loop.sh
+piscon-portal.service
+refresh.yml

.gitignore

@@ -3,3 +3,5 @@ vendor
 db.db
 piscon-portal
 test
+.idea
+.vscode/

Dockerfile

@@ -0,0 +1,20 @@
+FROM golang:1.16-alpine AS build
+WORKDIR /go/src/github.com/traPtitech/piscon-portal
+COPY go.mod go.sum ./
+RUN --mount=type=cache,target=/go/pkg/mod go mod download
+COPY . .
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 go build -ldflags="-s -w" -o piscon_portal main.go
+
+FROM ubuntu:22.04
+WORKDIR /app
+EXPOSE 4000
+RUN apt update \
+&& apt install -y tzdata \
+&& apt install -y ca-certificates \
+&& rm -rf /var/lib/apt/lists/* \
+&& update-ca-certificates
+COPY --from=build /go/src/github.com/traPtitech/piscon-portal/piscon_portal \
+									/go/src/github.com/traPtitech/piscon-portal/.env  ./
+ENTRYPOINT ["/app/piscon_portal"]

Makefile

@@ -0,0 +1,40 @@
+# development
+.PHONY: up
+up:
+	docker compose -p piscon-portal-dev -f docker-compose-dev.yml up -d
+.PHONY: build-up
+build-up:
+	docker compose -p piscon-portal-dev -f docker-compose-dev.yml up -d --build
+.PHONY: build-front
+build-front:
+	docker compose -p piscon-portal-dev -f docker-compose-dev.yml up -d --build frontend
+.PHONY: build-back
+build-back:
+	docker compose -p piscon-portal-dev -f docker-compose-dev.yml up -d --build backend
+.PHONY: down
+down:
+	docker compose -p piscon-portal-dev -f docker-compose-dev.yml down
+.PHONY: down-v
+down-v:
+	docker compose -p piscon-portal-dev -f docker-compose-dev.yml down -v
+
+# production
+.PHONY: deploy
+deploy:
+	docker compose -f docker-compose-prod.yml up -d --build
+
+.PHONY: enter-backend
+enter-backend:
+	docker container exec -it piscon-portal-backend bash
+
+.PHONY: enter-frontend
+enter-frontend:
+	docker container exec -it piscon-portal-frontend bash
+
+.PHONY: enter-db
+enter-db:
+	docker container exec -it piscon-portal-db bash
+
+.PHONY: log-backend
+log-backend:
+	docker logs piscon-portal-backend -f

README.md

@@ -0,0 +1,55 @@
+# PISCON-PORTAL
+
+piscon 用のポータルサイト
+
+## デプロイ
+
+- 対象の過去問の競技鯖 AMI をとってきてベンチマーク鯖として建てる (AMI にベンチマーカーも一緒に入っているため)
+- Elastic IP、セキュリティグループなどを設定]
+- ssh で入って piscon-portal を `git clone`
+- nginx, mariadb 他常駐しているもの (ISUCON11 なら JIA-xxx があった) を停止する
+- `make deploy`
+
+で立つはず
+
+## 既知のバグ
+
+セッション周りがバグっていて他のユーザーでログインが発生する場合があります
+
+## 環境変数
+
+直下に`.env`を置いてそこに配置
+
+| key                | value                            |
+| ------------------ | -------------------------------- |
+| `ENV`              | `prod`or `""`                    |
+| `OAUTH_CLIENT_ID`  | traP の OAuth2 クライアントの ID |
+| `BENCH_PRIVATE_IP` | ベンチマーカーの Private IP      |
+| `MARIADB_USERNAME` | DB のユーザーネーム              |
+| `MARIADB_PASSWORD` | DB のパスワード                  |
+| `MARIADB_PORT`     | DB のポート番号                  |
+| `MARIADB_HOSTNAME` | DB のホスト名                    |
+| `MARIADB_DATABASE` | DB のデータベース名              |
+
+### AWS
+
+| key                     | value                   |
+| ----------------------- | ----------------------- |
+| `AWS_SUBNET_ID`         | VPC のサブネット ID     |
+| `AWS_SECURITY_GROUP_ID` | セキュリティグループ ID |
+| `AWS_ACCESS_KEY`        | AWS のアクセス ID       |
+| `AWS_ACCESS_SECRET`     | AWS のシークレットキー  |
+
+### conoha
+
+メンテナンスされていません
+
+### セットアップ
+
+Docker が入っていることが必要です
+
+## Client
+
+https://github.com/epicmaxco/vuestic-admin
+
+Vuestic admin ベースに構築されています

aws/aws.go

@@ -0,0 +1,175 @@
+package aws
+
+import (
+	"context"
+	"encoding/base64"
+	"fmt"
+	"os"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/credentials"
+	"github.com/aws/aws-sdk-go-v2/service/ec2"
+	"github.com/aws/aws-sdk-go-v2/service/ec2/types"
+	"github.com/traPtitech/piscon-portal/model"
+)
+
+const (
+	imageId      = string("ami-03bbe60df80bdccc0") // isucon競技用サーバーのAMI
+	InstanceType = types.InstanceTypeT2Small       // isuconサーバーの種類(競技ごとにスペックが違う)
+	region       = string("ap-northeast-1")        // isuconサーバーのリージョン
+)
+
+var (
+	defaultInstanceNum = int32(1)
+	InstanceNameKey    = "Name"
+	statusmap          = map[string]string{
+		string(types.InstanceStateNamePending):    model.STARTING, //TODO buildingと被っている
+		string(types.InstanceStateNameRunning):    model.ACTIVE,
+		string(types.InstanceStateNameTerminated): model.NOT_EXIST,
+		string(types.InstanceStateNameStopping):   model.SHUTDOWNING,
+		string(types.InstanceStateNameStopped):    model.SHUTOFF,
+	}
+)
+
+type Config aws.Config //TODO 苦肉の策、いい感じに分離したい
+
+type AwsClient struct {
+	c *ec2.Client
+}
+
+func New(cfg Config) (*AwsClient, error) {
+	a := &AwsClient{}
+	client := ec2.NewFromConfig(aws.Config(cfg))
+	a.c = client
+	return a, nil
+}
+
+func CreateDefaultConfig() (*Config, error) {
+	cfg, err := config.LoadDefaultConfig(context.TODO(),
+		config.WithCredentialsProvider(
+			credentials.StaticCredentialsProvider{
+				Value: aws.Credentials{
+					AccessKeyID:     os.Getenv("AWS_ACCESS_KEY"),
+					SecretAccessKey: os.Getenv("AWS_ACCESS_SECRET"),
+				},
+			},
+		), config.WithRegion(region),
+	)
+	if err != nil {
+		return nil, err
+	}
+	res := Config(cfg)
+	return &res, nil
+}
+
+func (a *AwsClient) CreateInstance(name string, privateIp string, pwd string) (*string, error) {
+	subnetId := os.Getenv("AWS_SUBNET_ID")
+	tspec := types.TagSpecification{
+		ResourceType: types.ResourceTypeInstance,
+		Tags: []types.Tag{{
+			Key:   aws.String("Name"),
+			Value: &name,
+		}},
+	}
+	startUpScript := fmt.Sprintf(`#!/bin/sh
+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
+	`, pwd, pwd)
+	enc := base64.StdEncoding.EncodeToString([]byte(startUpScript))
+	nispec := types.InstanceNetworkInterfaceSpecification{
+		AssociatePublicIpAddress: aws.Bool(true),
+		DeleteOnTermination:      aws.Bool(true),
+		DeviceIndex:              aws.Int32(0),
+		SubnetId:                 &subnetId,
+		PrivateIpAddress:         &privateIp,
+		Groups:                   []string{os.Getenv("AWS_SECURITY_GROUP_ID")},
+	}
+	i := &ec2.RunInstancesInput{
+		ImageId:           aws.String(imageId),
+		InstanceType:      InstanceType,
+		MinCount:          &defaultInstanceNum,
+		MaxCount:          &defaultInstanceNum,
+		TagSpecifications: []types.TagSpecification{tspec},
+		NetworkInterfaces: []types.InstanceNetworkInterfaceSpecification{nispec},
+		KeyName:           aws.String("piscon"),
+		UserData:          aws.String(enc),
+	}
+	res, err := a.c.RunInstances(context.TODO(), i)
+	if err != nil {
+		return nil, err
+	}
+	return res.Instances[0].InstanceId, nil
+}
+
+func (a *AwsClient) CreateTag(instanceId string, key string, value string) error {
+	i := &ec2.CreateTagsInput{
+		Resources: []string{instanceId},
+		Tags: []types.Tag{
+			{
+				Key:   &key,
+				Value: &value,
+			},
+		},
+	}
+	_, err := a.c.CreateTags(context.TODO(), i)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (a *AwsClient) DeleteInstance(instanceId string) error {
+	i := &ec2.TerminateInstancesInput{
+		InstanceIds: []string{instanceId},
+	}
+	_, err := a.c.TerminateInstances(context.TODO(), i)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (a *AwsClient) StartInstance(instanceId string) error {
+	i := &ec2.StartInstancesInput{
+		InstanceIds: []string{instanceId},
+	}
+	_, err := a.c.StartInstances(context.TODO(), i)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (a *AwsClient) StopInstance(instanceId string) error {
+	i := &ec2.StopInstancesInput{
+		InstanceIds: []string{instanceId},
+	}
+	_, err := a.c.StopInstances(context.TODO(), i)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (a *AwsClient) GetInstanceInfo(id string) (*model.Instance, error) {
+	i := &ec2.DescribeInstancesInput{
+		InstanceIds: []string{id},
+	}
+	res, err := a.c.DescribeInstances(context.TODO(), i)
+	if err != nil {
+		fmt.Println(err.Error())
+		return nil, err
+	}
+	instance := &model.Instance{
+		GlobalIPAddress:  aws.ToString(res.Reservations[0].Instances[0].PublicIpAddress),
+		PrivateIPAddress: aws.ToString(res.Reservations[0].Instances[0].PrivateIpAddress),
+		Status:           statusmap[string(res.Reservations[0].Instances[0].State.Name)],
+	}
+	fmt.Println(res.Reservations[0].Instances[0].State.Name)
+	fmt.Println(statusmap[string(res.Reservations[0].Instances[0].State.Name)])
+	return instance, nil
+}

client/.dockerignore

@@ -1,8 +1,11 @@
 node_modules/
 dist/
-.git/
+.idea/
+tests/
+scripts/
+docs/
+
 .dockerignore
-.gitattributes
 .gitignore
-Dockerfile
-README.md
+Dockerfile*
+openapitools.json

client/.env.example

@@ -0,0 +1,8 @@
+VUE_APP_GTM_KEY=
+VUE_APP_GOOGLE_MAPS_API_KEY=
+
+VUE_APP_INCLUDE_DEMOS=
+
+VUE_APP_ROUTER_MODE_HISTORY=
+
+VUE_APP_BUILD_VERSION=