Merge pull request #441 from isucon/infra/420_move-jiaapi-mock

feat(infra): jiaapi-mock を extra 以下に移動
isucon · Jul 20, 2021 · 9946204 · 9946204
2 parents 2b3175d + 202f03e
commit 9946204
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 * bench/key/ec256-private.pem
 * bench/key/ec256-public.pem
 * webapp/ec256-public.pem (bench/key/ec256-public.pemのコピー)
-* webapp/jiaapi_mock/cmd/standalone/ec256-private.pem (bench/key/ec256-private.pemのコピー)
+* extra/jiaapi-mock/ec256-private.pem (bench/key/ec256-private.pemのコピー)
 
 となっています。
 

diff --git a/development/docker-compose-dev.yml b/development/docker-compose-dev.yml
@@ -57,4 +57,4 @@ services:
     ports:
       - "5000:5000"
     volumes:
-      - "../webapp/jiaapi_mock:/jiaapi"
+      - "../extra/jiaapi-mock:/jiaapi"
diff --git a/webapp/jiaapi_mock/.gitignore → extra/jiaapi-mock/.gitignore b/webapp/jiaapi_mock/.gitignore → extra/jiaapi-mock/.gitignore
diff --git a/webapp/jiaapi_mock/Makefile → extra/jiaapi-mock/Makefile b/webapp/jiaapi_mock/Makefile → extra/jiaapi-mock/Makefile
diff --git a/webapp/jiaapi_mock/controller/activation.go → extra/jiaapi-mock/controller/activation.go b/webapp/jiaapi_mock/controller/activation.go → extra/jiaapi-mock/controller/activation.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"net/http"
 
-	"github.com/isucon/isucon11-qualify/jiaapi_mock/model"
+	"github.com/isucon/isucon11-qualify/jiaapi-mock/model"
 	"github.com/labstack/echo/v4"
 )
 

diff --git a/webapp/jiaapi_mock/controller/auth.go → extra/jiaapi-mock/controller/auth.go b/webapp/jiaapi_mock/controller/auth.go → extra/jiaapi-mock/controller/auth.go
diff --git a/webapp/jiaapi_mock/controller/catalog.go → extra/jiaapi-mock/controller/catalog.go b/webapp/jiaapi_mock/controller/catalog.go → extra/jiaapi-mock/controller/catalog.go
diff --git a/webapp/jiaapi_mock/ec256-private.pem → extra/jiaapi-mock/ec256-private.pem b/webapp/jiaapi_mock/ec256-private.pem → extra/jiaapi-mock/ec256-private.pem
diff --git a/webapp/jiaapi_mock/go.mod → extra/jiaapi-mock/go.mod b/webapp/jiaapi_mock/go.mod → extra/jiaapi-mock/go.mod
@@ -1,4 +1,4 @@
-module github.com/isucon/isucon11-qualify/jiaapi_mock
+module github.com/isucon/isucon11-qualify/jiaapi-mock
 
 go 1.16
 

diff --git a/webapp/jiaapi_mock/go.sum → extra/jiaapi-mock/go.sum b/webapp/jiaapi_mock/go.sum → extra/jiaapi-mock/go.sum
diff --git a/webapp/jiaapi_mock/index.html → extra/jiaapi-mock/index.html b/webapp/jiaapi_mock/index.html → extra/jiaapi-mock/index.html
diff --git a/webapp/jiaapi_mock/main.go → extra/jiaapi-mock/main.go b/webapp/jiaapi_mock/main.go → extra/jiaapi-mock/main.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/isucon/isucon11-qualify/jiaapi_mock/controller"
+	"github.com/isucon/isucon11-qualify/jiaapi-mock/controller"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/labstack/gommon/log"

diff --git a/webapp/jiaapi_mock/model/isu_poster.go → extra/jiaapi-mock/model/isu_poster.go b/webapp/jiaapi_mock/model/isu_poster.go → extra/jiaapi-mock/model/isu_poster.go
diff --git a/...p/jiaapi_mock/model/isu_poster_manager.go → ...a/jiaapi-mock/model/isu_poster_manager.go b/...p/jiaapi_mock/model/isu_poster_manager.go → ...a/jiaapi-mock/model/isu_poster_manager.go
diff --git a/webapp/jiaapi_mock/model/utils.go → extra/jiaapi-mock/model/utils.go b/webapp/jiaapi_mock/model/utils.go → extra/jiaapi-mock/model/utils.go
diff --git a/provisioning/ansible/roles/contestant/tasks/jiaapi_mock.yml b/provisioning/ansible/roles/contestant/tasks/jiaapi_mock.yml
@@ -2,7 +2,7 @@
 - name: "roles/contestant/tasks/jiaapi_mock: Build jiaapi-mock"
   become_user: isucon
   args:
-    chdir: /tmp/isucon11-qualify/webapp/jiaapi_mock
+    chdir: /tmp/isucon11-qualify/extra/jiaapi-mock
   environment:
     PATH: "/home/isucon/local/go/bin:{{ ansible_env.PATH }}"
   command: make
@@ -11,7 +11,7 @@
   become_user: root
   copy:
     remote_src: yes
-    src: /tmp/isucon11-qualify/webapp/jiaapi_mock/jiaapi-mock
+    src: /tmp/isucon11-qualify/extra/jiaapi-mock/jiaapi-mock
     dest: /usr/local/bin/
     owner: "root"
     group: "root"
@@ -28,7 +28,7 @@
   with_items:
     - etc/systemd/system/jiaapi-mock.service
 
-- name: "roles/contestant/tasks/jiaapi_mock: Disable jiaapi-mock.service"
+- name: "roles/contestant/tasks/jiaapi_mock: Enable jiaapi-mock.service"
   become_user: root
   systemd:
     daemon_reload: "yes"