feat: 🎸 Qualify->Contest(一部)

isucon · Nov 24, 2024 · d6e717f · d6e717f
1 parent a999dfd
commit d6e717f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/portal/app/controllers/api/admin/cloud_formations_controller.rb b/portal/app/controllers/api/admin/cloud_formations_controller.rb
@@ -10,7 +10,7 @@ def show
     when "test"
       CloudFormation.test_template(team)
     when "qualify"
-      CloudFormation.qualify_template(team)
+      CloudFormation.contest_template(team)
     else
       raise "Unexpected type: #{params[:type]}"
     end

diff --git a/portal/app/controllers/api/contestant/cloud_formations_controller.rb b/portal/app/controllers/api/contestant/cloud_formations_controller.rb
@@ -5,7 +5,7 @@ class Api::Contestant::CloudFormationsController < Api::Contestant::ApplicationC
   def show
     raise ActiveRecord::RecordNotFound, "no cloudformation template for final" if Rails.application.config.x.contest.final
 
-    template = CloudFormation.qualify_template(current_team)
+    template = CloudFormation.contest_template(current_team)
 
     render protobuf: Isuxportal::Proto::Services::Contestant::GetCloudFormationResponse.new(
       template: template,

diff --git a/portal/app/javascript/contestant/ContestantContestantInstanceList.tsx b/portal/app/javascript/contestant/ContestantContestantInstanceList.tsx
@@ -75,7 +75,7 @@ export const ContestantContestantInstanceList: React.FC<Props> = ({ session, cli
           <a
             className={`button is-info ${template === "" ? "is-loading" : ""}`}
             href={templateBase64}
-            download="qualify_cloudformation.yaml"
+            download="contest_cloudformation.yaml"
           >
             CloudFormation テンプレートをダウンロード
           </a>

diff --git a/.../app/models/cf_templates/qualify.yaml.erb → .../app/models/cf_templates/contest.yaml.erb b/.../app/models/cf_templates/qualify.yaml.erb → .../app/models/cf_templates/contest.yaml.erb
@@ -1,6 +1,6 @@
 AWSTemplateFormatVersion: 2010-09-09
 Description: >-
-  AWS CloudFormation for ISUCON14 Qualify
+  AWS CloudFormation for ISUCON14
 Resources:
   GetAvailabilityZoneFunctionExecutionRole:
     Type: AWS::IAM::Role
@@ -95,7 +95,7 @@ Resources:
     Type: AWS::EC2::SecurityGroup
     Properties:
       VpcId: !Ref VPC
-      GroupDescription: Security Group for ISUCON14 Qualify
+      GroupDescription: Security Group for ISUCON14
       SecurityGroupIngress:
         - IpProtocol: tcp
           FromPort: "22"
@@ -143,7 +143,7 @@ Resources:
       Roles:
         - !Ref InstanceRole
 
-  QualifyInstance1:
+  Instance1:
     Type: AWS::EC2::Instance
     Properties:
       ImageId: <%= ami_id %>
@@ -161,7 +161,7 @@ Resources:
             VolumeType: gp3
       Tags:
         - Key: Name
-          Value: isucon14-qualify-1
+          Value: isucon14-1
       UserData:
         Fn::Base64: |
           #cloud-config
@@ -173,12 +173,12 @@ Resources:
             content: '<%= portal_credentials %>'
           runcmd:
             - 'curl --retry 5 --retry-connrefused --max-time 10 --connect-timeout 5 "https://<%= portal_host %>/api/ssh_public_keys?token=<%= token %>" | sudo -u isucon sh -c "umask 077; cat > /home/isucon/.ssh/authorized_keys"'
-  QualifyInstanceIP1:
+  InstanceIP1:
     Type: AWS::EC2::EIP
     Properties:
       Domain: vpc
-      InstanceId: !Ref QualifyInstance1
-  QualifyInstance2:
+      InstanceId: !Ref Instance1
+  Instance2:
     Type: AWS::EC2::Instance
     Properties:
       ImageId: <%= ami_id %>
@@ -196,7 +196,7 @@ Resources:
             VolumeType: gp3
       Tags:
         - Key: Name
-          Value: isucon14-qualify-2
+          Value: isucon14-2
       UserData:
         Fn::Base64: |
           #cloud-config
@@ -208,12 +208,12 @@ Resources:
             content: '<%= portal_credentials %>'
           runcmd:
             - 'curl --retry 5 --retry-connrefused --max-time 10 --connect-timeout 5 "https://<%= portal_host %>/api/ssh_public_keys?token=<%= token %>" | sudo -u isucon sh -c "umask 077; cat > /home/isucon/.ssh/authorized_keys"'
-  QualifyInstanceIP2:
+  InstanceIP2:
     Type: AWS::EC2::EIP
     Properties:
       Domain: vpc
-      InstanceId: !Ref QualifyInstance2
-  QualifyInstance3:
+      InstanceId: !Ref Instance2
+  Instance3:
     Type: AWS::EC2::Instance
     Properties:
       ImageId: <%= ami_id %>
@@ -231,7 +231,7 @@ Resources:
             VolumeType: gp3
       Tags:
         - Key: Name
-          Value: isucon14-qualify-3
+          Value: isucon14-3
       UserData:
         Fn::Base64: |
           #cloud-config
@@ -243,8 +243,8 @@ Resources:
             content: '<%= portal_credentials %>'
           runcmd:
             - 'curl --retry 5 --retry-connrefused --max-time 10 --connect-timeout 5 "https://<%= portal_host %>/api/ssh_public_keys?token=<%= token %>" | sudo -u isucon sh -c "umask 077; cat > /home/isucon/.ssh/authorized_keys"'
-  QualifyInstanceIP3:
+  InstanceIP3:
     Type: AWS::EC2::EIP
     Properties:
       Domain: vpc
-      InstanceId: !Ref QualifyInstance3
+      InstanceId: !Ref Instance3
diff --git a/portal/app/models/cloud_formation.rb b/portal/app/models/cloud_formation.rb
@@ -4,7 +4,7 @@
 
 module CloudFormation
   TEST_ERB = ERB.new(File.read(File.join(File.dirname(__FILE__), './cf_templates/test.yaml.erb')))
-  QUALIFY_ERB = ERB.new(File.read(File.join(File.dirname(__FILE__), './cf_templates/qualify.yaml.erb')))
+  CONTEST_ERB = ERB.new(File.read(File.join(File.dirname(__FILE__), './cf_templates/contest.yaml.erb')))
 
   def self.template(erb, b)
     erb.result(b)
@@ -30,7 +30,7 @@ def self.test_template(team)
     end
   end
 
-  def self.qualify_template(team)
+  def self.contest_template(team)
     zone_id = team.availability_zone
     token = create_token(
       team,
@@ -41,7 +41,7 @@ def self.qualify_template(team)
     ami_id = Rails.application.config.x.qualify_ami_id
 
     unless zone_id.nil?
-      template(QUALIFY_ERB, binding)
+      template(CONTEST_ERB, binding)
     else
       raise "Availability Zone should be set to team"
     end