Merge pull request #27 from SonicGarden/fix-yaml-parse

[review] Use Rails.application.config_for

lib/sg_fargate_rails/event_bridge_schedule.rb

@@ -70,7 +70,7 @@ def input_overrides_json
     end
 
     def convert_container_type
-      CONTAINER_TYPES[@container_type]
+      @container_type ? CONTAINER_TYPES.fetch(@container_type) : nil
     end
 
     def container_command
@@ -93,9 +93,8 @@ def client
     end
 
     class << self
-      def parse(filename)
-        schedules = YAML.unsafe_load(File.open(filename))[environment]
-        schedules.filter_map { |name, info| EventBridgeSchedule.new(name, info['cron'], info['command'], info['container_type']) if name != '<<' }
+      def convert(schedules)
+        schedules.map { |name, info| EventBridgeSchedule.new(name.to_s, info[:cron], info[:command], info[:container_type]) }
       end
 
       def delete_all!(group_name)
@@ -109,10 +108,6 @@ def client
         @client ||= Aws::Scheduler::Client.new(region: region, credentials: credentials)
       end
 
-      def environment
-        ENV['RAILS_ENV']
-      end
-
       def region
         ENV['AWS_REGION'] || 'ap-northeast-1'
       end

lib/tasks/sg_fargate_rails.rake

@@ -12,8 +12,7 @@ namespace :sg_fargate_rails do
     SgFargateRails::EventBridgeSchedule.delete_all!(group_name)
 
     Rails.logger.info "[EventBridgeSchedule] Register schedules in #{group_name}"
-    config_file = Rails.root.join('config/eventbridge_schedules.yml')
-    SgFargateRails::EventBridgeSchedule.parse(config_file).each do |schedule|
+    SgFargateRails::EventBridgeSchedule.convert(Rails.application.config_for('eventbridge_schedules')).each do |schedule|
       Rails.logger.info "[EventBridgeSchedule] Register schedule #{schedule.name} in #{group_name}"
       # TODO: この辺で AWS の API Limit などのエラーが発生するとスケジュールが消えたままとなるので、エラーの内容に応じてリトライなどのエラー処理が必要
       schedule.create_run_task(

spec/sg_fargate_rails/event_bridge_schedule_spec.rb

@@ -48,26 +48,24 @@
     end
   end
 
-  describe '#parse' do
+  describe '.convert' do
     context 'scheduleの登録がない場合' do
-      let(:filename) { 'spec/fixtures/event_bridge_schedule/blank_schedule.yml' }
-
       it do
-        allow(ENV).to receive(:[]).and_call_original
-        allow(ENV).to receive(:[]).with('RAILS_ENV').and_return('staging')
-
-        expect(SgFargateRails::EventBridgeSchedule.parse(filename)).to eq []
+        expect(SgFargateRails::EventBridgeSchedule.convert({})).to eq []
       end
     end
 
     context 'scheduleの登録が複数存在する場合' do
       let(:filename) { 'spec/fixtures/event_bridge_schedule/schedule.yml' }
 
       it do
-        allow(ENV).to receive(:[]).and_call_original
-        allow(ENV).to receive(:[]).with('RAILS_ENV').and_return('staging')
-
-        results = SgFargateRails::EventBridgeSchedule.parse(filename)
+        results = SgFargateRails::EventBridgeSchedule.convert({
+          daily_backup_to_s3: {
+            command: 'jobmon --estimate-time=3000 sg_tiny_backup:backup',
+            cron: 'cron(30 1 * * ? *)',
+            container_type: 'medium',
+          }
+        })
         expect(results.size).to eq 1
         expect(results.first.name).to eq 'daily_backup_to_s3'
       end

spec/spec_helper.rb

@@ -1,4 +1,3 @@
 require 'sg_fargate_rails'
 require 'rubygems'
 require 'rspec'
-require 'yaml'