exercism-config 0.75.0 → 0.79.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20f0049e610db0735f9d7384583f08e043b7d90ab3821bee7897e0403c37c4d
-  data.tar.gz: 0a7f8922dd4caad2bd6a4759220c520764ed1363b996d554c2d25421243a0377
+  metadata.gz: 75f1646a6035b52f15adf8009bd1813142aacb183dd292586103ac92a3eb8bcf
+  data.tar.gz: e3f6555dfcce9300b2f228288e78b7024530729a84cc801e988329f76a7bc47e
 SHA512:
-  metadata.gz: 56ebc394087d29d4c38d49683a41d2898ef3334b3a49156f3713262ad5615379e94ffb659b6a12dbedca42f3cd9b5f4c426ccd894149e37a06c80cdb962c4d6d
-  data.tar.gz: fb765b9f842512a3d1eb1f396736f9858ae337817acb718b45867a4775c955470590385505232185fc878c95f4302e3a1c6f96c71076531b56e63b8e2c4762e8
+  metadata.gz: abd507cb222e44902547f311245120a37a8ac82418dbeb405b4ffe5ca314d3d8e209c15f167e4cb358137b4406c200cbb9b83760d977bce881a22fe8ba13b0f2
+  data.tar.gz: f1321cdebd33b7ade32c9e7245fb48b18a2f5162aa87492a9fe9a66e24749c5155ae37ea4f2bb9d5bd94aff1578e88dd0b466ad525bb6a7ea609d1542dfe5daf

data/README.md

@@ -23,6 +23,7 @@ Exercism.config.mysql_port
 Exercism.config.spi_url
 Exercism.config.tooling_orchestrator_url
 Exercism.config.language_server_url
+Exercism.config.opensearch_host
 
 # Secrets
 Exercism.secrets.github_access_token
@@ -37,6 +38,7 @@ Exercism.dynamodb_client
 Exercism.s3_client
 Exercism.ecr_client
 Exercism.octokit_client
+Exercism.opensearch_client
 ```
 
 ## Explanation

data/exercism_config.gemspec

@@ -40,5 +40,6 @@ Gem::Specification.new do |spec|
   # own Gemfile when using this.
   spec.add_development_dependency 'aws-sdk-ecr'
   spec.add_development_dependency 'aws-sdk-s3'
+  spec.add_development_dependency 'elasticsearch', '6.8.3'
   spec.add_development_dependency 'redis'
 end

data/lib/exercism/tooling_job.rb

@@ -5,9 +5,11 @@ module Exercism
 
     extend Mandate::Memoize
 
-    def self.create!(type, submission_uuid, language, exercise, extra = {})
+    def self.create!(type, submission_uuid, language, exercise,
+                     run_in_background: false,
+                     **data)
       job_id = SecureRandom.uuid.tr('-', '')
-      data = extra.merge(
+      data.merge!(
         id: job_id,
         submission_uuid: submission_uuid,
         type: type,
@@ -16,13 +18,14 @@ module Exercism
         created_at: Time.now.utc.to_i
       )
 
+      queue_key = run_in_background ? key_for_queued_in_background : key_for_queued
       redis = Exercism.redis_tooling_client
       redis.multi do
         redis.set(
           "job:#{job_id}",
           data.to_json
         )
-        redis.rpush(key_for_queued, job_id)
+        redis.rpush(queue_key, job_id)
         redis.set("submission:#{submission_uuid}:#{type}", job_id)
       end
       new(job_id, data)
@@ -55,7 +58,7 @@ module Exercism
       data.key?(meth) || super
     end
 
-    def method_missing(meth)
+    def method_missing(meth, *args)
       super unless respond_to_missing?(meth)
 
       data[meth]
@@ -69,7 +72,7 @@ module Exercism
       end
     end
 
-    def executed!(status, output, exception)
+    def executed!(status, output)
       redis = Exercism.redis_tooling_client
       redis.multi do
         redis.lrem(key_for_queued, 1, id)
@@ -80,8 +83,7 @@ module Exercism
           "job:#{id}",
           data.merge(
             execution_status: status,
-            execution_output: output,
-            execution_exception: exception
+            execution_output: output
           ).to_json
         )
       end
@@ -91,7 +93,8 @@ module Exercism
       redis = Exercism.redis_tooling_client
       redis.multi do
         redis.lrem(key_for_executed, 1, id)
-        redis.rpush(key_for_processed, id)
+        redis.del("job:#{id}")
+        redis.del("submission:#{data[:submission_uuid]}:#{data[:type]}")
       end
     end
 
@@ -107,17 +110,44 @@ module Exercism
       id == other.id
     end
 
-    def stderr
-      read_s3_file('stderr')
+    def store_stdout!(content)
+      write_s3_file!(:stdout, content)
+    end
+
+    def store_stderr!(content)
+      write_s3_file!(:stderr, content)
+    end
+
+    def store_metadata!(content)
+      write_s3_file!('metadata.json', content.to_json)
     end
 
     def stdout
-      read_s3_file('stdout')
+      read_s3_file(:stdout)
+    end
+
+    def stderr
+      read_s3_file(:stderr)
+    end
+
+    def metadata
+      JSON.parse(read_s3_file('metadata.json'))
+    rescue JSON::ParserError
+      {}
     end
 
     private
     attr_reader :data
 
+    def write_s3_file!(name, content)
+      Exercism.s3_client.put_object(
+        bucket: s3_bucket_name,
+        key: "#{s3_folder}/#{name}",
+        body: content,
+        acl: 'private'
+      )
+    end
+
     def read_s3_file(name)
       Exercism.s3_client.get_object(
         bucket: s3_bucket_name,
@@ -137,7 +167,7 @@ module Exercism
       Exercism.config.aws_tooling_jobs_bucket
     end
 
-    %w[queued locked executed processed cancelled].each do |key|
+    %w[queued queued_in_background locked executed cancelled].each do |key|
       ToolingJob.singleton_class.class_eval do
         define_method "key_for_#{key}" do
           Exercism.env.production? ? key : "#{Exercism.env}:#{key}"

data/lib/exercism-config.rb

@@ -69,4 +69,21 @@ module Exercism
       c.auto_paginate = true
     end
   end
+
+  def self.opensearch_client
+    require 'elasticsearch'
+
+    # For now, we're using the ElasticSearch client, but this needs to be
+    # changed to the OpenSearch client once it becomes available
+    Elasticsearch::Client.new(
+      url: ENV.fetch("OPENSEARCH_HOST", config.opensearch_host),
+      user: ENV.fetch("OPENSEARCH_USER", Exercism.env.production? ? nil : "admin"),
+      password: ENV.fetch("OPENSEARCH_PASSWORD", Exercism.env.production? ? nil : "admin"),
+      transport_options: {
+        ssl: {
+          verify: Exercism.env.production?
+        }
+      }
+    )
+  end
 end

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = '0.75.0'.freeze
+  VERSION = '0.79.0'.freeze
 end

data/settings/ci.yml

@@ -37,6 +37,9 @@ efs_repositories_mount_point: "/tmp/exercism/efs/repos"
 github_organization: fake-exercism
 github_bot_username: exercism-bot
 
+# OpenSearch
+opensearch_host: https://127.0.0.1:9200
+
 # Extra things not used in development, but here
 # so that this file can provide a reference
 website_assets_host:

data/settings/docker.yml

@@ -37,6 +37,9 @@ efs_repositories_mount_point: "/tmp/exercism/efs/repos"
 github_organization: fake-exercism
 github_bot_username: exercism-bot
 
+# OpenSearch
+opensearch_host: https://opensearch:9200
+
 # Extra things not used in development, but here
 # so that this file can provide a reference
 website_assets_host:

data/settings/local.yml

@@ -37,6 +37,9 @@ efs_repositories_mount_point: "/tmp/exercism/efs/repos"
 github_organization: fake-exercism
 github_bot_username: exercism-bot
 
+# OpenSearch
+opensearch_host: https://localhost:9200
+
 # Extra things not used in development, but here
 # so that this file can provide a reference
 website_assets_host:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exercism-config
 version: !ruby/object:Gem::Version
-  version: 0.75.0
+  version: 0.79.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-04 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: elasticsearch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.8.3
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement