exercism-config 0.76.0 → 0.80.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 382f12024996ba4f2a1485f87a77de080f1e472a2d7e46eee1cdbf0eb2893036
-  data.tar.gz: f8f5d09624c88131b6d1ba0183b26e4ecd355d9b3c48b85bef4f2fa5bc815529
+  metadata.gz: 9028a8ef38a64c4fbc99ebf5830082b4d01eb5fcd57f3ba3c71be173abacb50c
+  data.tar.gz: 704f3be682e8151296104648540bb0153fe5725449593d2702c807ea41dbc3b3
 SHA512:
-  metadata.gz: d8ce0815630303f05a29ee780512f7177fb0ec4eb8f6ffcbd88aa2e9a33b08fbfef972311a5b8aaba928596a8aabe189a38c5f8850bd18ba8ef8d660c4c6a342
-  data.tar.gz: e99dd955ba1143efbf1f8ac76257df59e386fc27cdd050b6508c9bb37ef4121f7098b8bdaa66d736158f9a911cf1a666c60d4893e33955540c32bfab07e8aee0
+  metadata.gz: 9e688f9269fd4408fb898d9b516783a4cac653a5729bd702bbeccf84e4bec5e239a915c8ca5acd68ca0dc43dc204b8f955efa18583ac1845b68f07952ff5985c
+  data.tar.gz: 5c8340deea246d5588a82a167c33f64219590d7d1168b4839ceec89486109666db6683018e74294bb7d52ca4fd678fb7292fbec5adfe11b24f260c59182e9acc

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_for_background_processing : 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)
@@ -164,7 +167,7 @@ module Exercism
       Exercism.config.aws_tooling_jobs_bucket
     end
 
-    %w[queued locked executed cancelled].each do |key|
+    %w[queued queued_for_background_processing 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.76.0'.freeze
+  VERSION = '0.80.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.76.0
+  version: 0.80.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 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