exercism-config 0.41.0 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01f964544c9ddec6effc25a1b417ed9d2f3d0c5dcb98ebae0b6cd9c4b62e3963
-  data.tar.gz: 61a0591b8b221bed122b2dc12cfceff707aaf7005f56335bab86e1e31633210b
+  metadata.gz: eb3b0fea425fb02156daa4db89fea9defa16dc54962b5c299359ada000d1f86a
+  data.tar.gz: ff4e9535337514761b1f09d3bb7172abd50a3a054dde0e1d7dae3347a3205433
 SHA512:
-  metadata.gz: dd48bdaf9a8b8a86a3934e886442b6c23fd5285a2f0a578d0b6209ac1ac5b88ad58d2e34401459c84dbb7f0d57a99b5ef411199016f43833744811656ae6f188
-  data.tar.gz: d0ac7eee145662d64d964f6b6dfd19d85aa780d5d387d9fb5c53adbe1c0963556389d4dfedb985c1617e81754d8ea5dc9e9befffecfe069826767d79d510e48f
+  metadata.gz: d59a574a95d289b4d37260e8c442b4351f8a176ba2528af98329c9cdd0e0e75b74410be73a239c707343a207fdc9425af3d2eb7300836506bfcba06ff35acfa4
+  data.tar.gz: 7f223275f782bd6113a1a1d973f550c3d08e511d6da64eddad8754ca48f3d267304faf4c00a7651aae4d6556d15242bb5d7b865eab0fdb15d05609c0fd94db80

data/bin/setup_exercism_local_aws

@@ -13,11 +13,9 @@ Exercism.config.dynamodb_client = ExercismConfig::SetupDynamoDBClient.()
 # Setup local s3 #
 ##################
 
-# We don't need this running for CI atm as none of our
-# tests actually hit s3. Although we might choose to change this
-unless ENV["EXERCISM_CI"] || ENV["EXERCISM_SKIP_S3"]
+unless ENV["EXERCISM_SKIP_S3"]
   [
-    Exercism.config.aws_iterations_bucket,
+    Exercism.config.aws_submissions_bucket,
     Exercism.config.aws_tooling_jobs_bucket,
   ].each do |bucket|
     begin
@@ -30,10 +28,13 @@ unless ENV["EXERCISM_CI"] || ENV["EXERCISM_SKIP_S3"]
   end
 end
 
-########################
-# Setup local dynamodb #
-########################
-%w[tooling_jobs tooling_jobs-test].each do |table_name|
+###########################################
+# Setup local dynamodb tooling jobs table #
+###########################################
+[
+  Exercism.config.dynamodb_tooling_jobs_table,
+  Exercism.config.dynamodb_tooling_jobs_table + "-test"
+].each do |table_name|
   begin
     Exercism.config.dynamodb_client.delete_table(
       table_name: table_name
@@ -99,4 +100,80 @@ end
       }
     ]
   )
+
+  Exercism.config.dynamodb_client.update_table(
+    table_name: table_name,
+    attribute_definitions: [
+      {
+        attribute_name: "submission_uuid",
+        attribute_type: "S"
+      },
+      {
+        attribute_name: "type",
+        attribute_type: "S"
+      }
+    ],
+    global_secondary_index_updates: [
+      {
+        create: {
+          index_name: "submission_type", # required
+          key_schema: [ # required
+            {
+              attribute_name: "submission_uuid", # required
+              key_type: "HASH" # required, accepts HASH, RANGE
+            },
+            {
+              attribute_name: "type", # required
+              key_type: "RANGE" # required, accepts HASH, RANGE
+            }
+          ],
+          projection: { # required
+            projection_type: "INCLUDE",
+            non_key_attributes: ["id", "job_status"]
+          },
+          provisioned_throughput: {
+            read_capacity_units: 1, # required
+            write_capacity_units: 1 # required
+          }
+        }
+      }
+    ]
+  )
+end
+
+##############################################
+# Setup local dynamodb language groups table #
+##############################################
+[
+  Exercism.config.dynamodb_tooling_language_groups_table,
+  Exercism.config.dynamodb_tooling_language_groups_table + "-test"
+].each do |table_name|
+  begin
+    Exercism.config.dynamodb_client.delete_table(
+      table_name: table_name
+    )
+  rescue Aws::DynamoDB::Errors::ResourceNotFoundException
+  end
+  puts "[x] #{table_name}"
+
+  Exercism.config.dynamodb_client.create_table(
+    table_name: table_name,
+    attribute_definitions: [
+      {
+        attribute_name: "group",
+        attribute_type: "S"
+      }
+    ],
+    key_schema: [
+      {
+        attribute_name: "group",
+        key_type: "HASH"
+      }
+    ],
+    provisioned_throughput: {
+      read_capacity_units: 1,
+      write_capacity_units: 1
+    }
+  )
 end
+

data/lib/exercism-config.rb

@@ -7,6 +7,7 @@ require_relative 'exercism_config/environment'
 require_relative 'exercism_config/determine_environment'
 require_relative 'exercism_config/generate_aws_settings'
 require_relative 'exercism_config/setup_dynamodb_client'
+require_relative 'exercism_config/setup_ecr_client'
 require_relative 'exercism_config/setup_s3_client'
 require_relative 'exercism_config/retrieve'
 require_relative 'exercism_config/generate_aws_settings'

data/lib/exercism/config.rb

@@ -2,6 +2,7 @@ module Exercism
   class Config < OpenStruct
     PROPS_WITH_TEST_SUFFIX = %i[
       dynamodb_tooling_jobs_table
+      dynamodb_tooling_language_groups_table
     ].freeze
 
     def initialize(data, aws_settings)

data/lib/exercism_config/determine_environment.rb

@@ -4,6 +4,10 @@ module ExercismConfig
 
     def call
       env = ENV['EXERCISM_ENV'] || ENV['RAILS_ENV'] || ENV['APP_ENV']
+      unless env
+        env = Rails.env.to_s if Object.const_defined?(:Rails) && Rails.respond_to?(:env)
+      end
+
       raise Exercism::ConfigError, 'No environment set - set one of EXERCISM_ENV, RAILS_ENV or APP_ENV' unless env
 
       Environment.new(env)

data/lib/exercism_config/setup_ecr_client.rb

@@ -0,0 +1,18 @@
+module ExercismConfig
+  class SetupECRClient
+    include Mandate
+
+    def call
+      aws_settings = GenerateAwsSettings.().merge(
+        # endpoint: config_endpoint,
+
+        # We don't want a profile for this AWS service
+        # as we run it locally. But we do normally, so
+        # we locally override this here.
+        profile: nil
+      ).select { |_k, v| v }
+
+      Aws::ECR::Client.new(aws_settings)
+    end
+  end
+end

data/lib/exercism_config/setup_s3_client.rb

@@ -21,7 +21,7 @@ module ExercismConfig
     memoize
     def config_endpoint
       return nil if Exercism.env.production?
-      return "http://127.0.0.1:#{ENV['S3_PORT']}" if ENV['EXERCISM_CI']
+      return "http://127.0.0.1:#{ENV['S3_PORT']}" if Exercism.env.test? && ENV['EXERCISM_CI']
 
       host = ENV['EXERCISM_DOCKER'] ? 's3:9090' : 'localhost:3041'
       "http://#{host}"

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = '0.41.0'.freeze
+  VERSION = '0.46.0'.freeze
 end

data/settings/ci.yml

@@ -1,8 +1,9 @@
 anycable_redis_url: redis://127.0.0.1:6379/1
 anycable_rpc_host: 127.0.0.1:50051
-aws_iterations_bucket: exercism-staging-iterations
+aws_submissions_bucket: exercism-staging-submissions
 aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
 dynamodb_tooling_jobs_table: tooling_jobs
+dynamodb_tooling_language_groups_table: tooling_language_groups
 spi_url: http://127.0.0.1:3020
 tooling_orchestrator_url: http://127.0.0.1:3021
 

data/settings/docker.yml

@@ -1,8 +1,9 @@
 anycable_redis_url: redis://redis:6379/1
 anycable_rpc_host: 0.0.0.0:50051
-aws_iterations_bucket: exercism-staging-iterations
+aws_submissions_bucket: exercism-staging-submissions
 aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
 dynamodb_tooling_jobs_table: tooling_jobs
+dynamodb_tooling_language_groups_table: tooling_language_groups
 mysql_master_endpoint: mysql
 mysql_port: 3306
 spi_url: http://website:3020

data/settings/local.yml

@@ -1,8 +1,9 @@
 anycable_redis_url: redis://127.0.0.1:6379/1
 anycable_rpc_host: 127.0.0.1:50051
-aws_iterations_bucket: exercism-staging-iterations
+aws_submissions_bucket: exercism-staging-submissions
 aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
 dynamodb_tooling_jobs_table: tooling_jobs
+dynamodb_tooling_language_groups_table: tooling_language_groups
 mysql_master_endpoint: localhost
 mysql_socket: /tmp/mysql.sock
 spi_url: http://127.0.0.1:3020

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exercism-config
 version: !ruby/object:Gem::Version
-  version: 0.41.0
+  version: 0.46.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-29 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
@@ -153,6 +153,7 @@ files:
 - lib/exercism_config/generate_aws_settings.rb
 - lib/exercism_config/retrieve.rb
 - lib/exercism_config/setup_dynamodb_client.rb
+- lib/exercism_config/setup_ecr_client.rb
 - lib/exercism_config/setup_s3_client.rb
 - lib/exercism_config/version.rb
 - package.json