exercism-config 0.74.0 → 0.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49f4f9516d54c1013b4f9e103767540892fdbee3fc588ed8b597c831ec69a13d
-  data.tar.gz: feaaa7aaafa696c1400006f3e4eab0c533aac2bf64be51ffd330545dc9ae23e0
+  metadata.gz: 37e5adfdefe004d2528a29254e0e0f2ba872c846f43ef4f87df2e7a5c9fca1f4
+  data.tar.gz: ec9223378a44a65942dfe91c26cc3ab900058071a1a5a31ccca1895dcb755d61
 SHA512:
-  metadata.gz: 57d9cfee7cfd6731f8dc538cd59c1f2b57437b494e54cf9da905b19d481ec2d1ac791c3d4ba29747dc433c4785ff7cd08b7f69c1504a7ed96af0596517cbe23f
-  data.tar.gz: 9d931b453e242e492402c7e779b453b91ed5f37a7320d9562a623505986e1cd7b2e998ed21380cf2d0822d936b808481cb4199d324f0598d31787ce6d550ec73
+  metadata.gz: c20da1f12c29cd611d92d73c7e6dcf847dbb577601dcaa3d728d1642fb8ca9b58761114c9f2e4063f9b018412d400be9daf466f7ca37e1ece726aae212793783
+  data.tar.gz: 5aa552a5137910b03e564775868cb52ee7afcbbba2162d32721bfaf864a1008b3be172e51c168fd3fec71e9565c73dd00f1dc965718d93992b6b42818df385a6

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

@@ -55,7 +55,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 +69,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 +80,7 @@ module Exercism
           "job:#{id}",
           data.merge(
             execution_status: status,
-            execution_output: output,
-            execution_exception: exception
+            execution_output: output
           ).to_json
         )
       end
@@ -91,7 +90,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 +107,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 +164,7 @@ module Exercism
       Exercism.config.aws_tooling_jobs_bucket
     end
 
-    %w[queued locked executed processed cancelled].each do |key|
+    %w[queued 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.74.0'.freeze
+  VERSION = '0.78.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:

data/settings/secrets.yml

@@ -9,3 +9,4 @@ stripe_secret_key: "sk_test_51IDGMXEoOT0Jqx0UMSRriKkjutiuKVsv8GWUQWqhz4df03e4fuH
 stripe_publishable_key: "pk_test_51IDGMXEoOT0Jqx0UcoKlkvB7O0VDvFdCBvOCiWiKv6CkSnkZn7IG6cIHuCWg7cegGogYJSy8WsaKzwFHQqN75T7b00d56MtilB"
 stripe_endpoint_secret: "whsec_rgY246H0vSUw0A9KpDOqsDDgAakEdCCT"
 stripe_recurring_product_id: "prod_Jw8Kqq4QQ0qio7"
+slack_api_token: "some-token"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exercism-config
 version: !ruby/object:Gem::Version
-  version: 0.74.0
+  version: 0.78.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-11-11 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