exercism-config 0.52.0 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 483dc9efe209d092e0424e2e05eb0ca1992f29a187ff35a198e02fbf65e531d5
-  data.tar.gz: b03b79b8f90694b75ec9d6702719180ec5aa83dccb5105b8b2244b1390a2759d
+  metadata.gz: dd3a2e75d9a25001f206eea0ebf0176e29feeb5f19e5a2452abe2e0727c59eeb
+  data.tar.gz: 4f941cdab42013d7b4e494d3b3e694adc10fc30824e76519ad4ed8abe8b88f1f
 SHA512:
-  metadata.gz: 8e4a4374a93234a4d122c7bd1ed90de8cfc2943fafc2d96b764e348da4806ea978d7486de9631c075d3661079577c8c1fb1cc219f7cce2002fcd208d458d53c2
-  data.tar.gz: 3eca657a69cb97b72e18deb94a07f36565267cd1d67ed19345da967bc0261cc10aa3c500d823d17a990c857e95e6dbf6d0306cb89739c4c2115b024a8a7d013f
+  metadata.gz: 25dab7f25a4e679c960a759b73eb7a2b701f80dbcf8127ff149dba8f5debf641c29131a8eea77989099385dce51b0eaee1d61ac46b90bb074599eef0b55c33c0
+  data.tar.gz: 5f971478ed4937d055c1563a974c8c884f52a1aee228ca8129b100bfa96473f9ee2d7d66d00d069ba6d2d9372fde7138b3fb84b18528ec8cf88c851ae6aa42f2

data/README.md

@@ -7,7 +7,7 @@
 
 ## Usage
 
-This gem provides you with the following config and secrets:
+This gem provides you with the following config, secrets and helper methods:
 
 ```ruby
 # Config
@@ -27,8 +27,14 @@ Exercism.config.language_server_url
 # Secrets
 Exercism.secrets.github_omniauth_app_id
 Exercism.secrets.github_omniauth_app_secret
+Exercism.secrets.github_webhooks_secret
 Exercism.secrets.hcaptcha_site_key
 Exercism.secrets.hcaptcha_secret
+
+# Helper methods (create new clients)
+Exercism.dynamodb_client
+Exercism.s3_client
+Exercism.ecr_client
 ```
 
 ## Explaination

data/bin/setup_exercism_local_aws

@@ -6,7 +6,6 @@ require "exercism-config"
 return if Exercism.env.production?
 
 puts "Create AWS/DynamoDB tables..."
-
 ##################
 # Setup local s3 #
 ##################
@@ -18,6 +17,8 @@ unless ENV["EXERCISM_SKIP_S3"]
   ].each do |bucket|
     begin
       Exercism.s3_client.create_bucket(bucket: bucket)
+    rescue Aws::S3::Errors::BucketAlreadyExists 
+      # Bucket already exists
     rescue Seahorse::Client::NetworkingError => e
       puts "local S3 not up yet..."
       sleep 2 # slighty retry delaty
@@ -34,14 +35,14 @@ end
   Exercism.config.dynamodb_tooling_jobs_table + "-test"
 ].each do |table_name|
   begin
-    Exercism.config.dynamodb_client.delete_table(
+    Exercism.dynamodb_client.delete_table(
       table_name: table_name
     )
   rescue Aws::DynamoDB::Errors::ResourceNotFoundException
   end
   puts "[x] #{table_name}"
 
-  Exercism.config.dynamodb_client.create_table(
+  Exercism.dynamodb_client.create_table(
     table_name: table_name,
     attribute_definitions: [
       {
@@ -61,7 +62,7 @@ end
     }
   )
 
-  Exercism.config.dynamodb_client.update_table(
+  Exercism.dynamodb_client.update_table(
     table_name: table_name,
     attribute_definitions: [
       {
@@ -99,7 +100,7 @@ end
     ]
   )
 
-  Exercism.config.dynamodb_client.update_table(
+  Exercism.dynamodb_client.update_table(
     table_name: table_name,
     attribute_definitions: [
       {
@@ -147,14 +148,14 @@ end
   Exercism.config.dynamodb_tooling_language_groups_table + "-test"
 ].each do |table_name|
   begin
-    Exercism.config.dynamodb_client.delete_table(
+    Exercism.dynamodb_client.delete_table(
       table_name: table_name
     )
   rescue Aws::DynamoDB::Errors::ResourceNotFoundException
   end
   puts "[x] #{table_name}"
 
-  Exercism.config.dynamodb_client.create_table(
+  Exercism.dynamodb_client.create_table(
     table_name: table_name,
     attribute_definitions: [
       {

data/exercism_config.gemspec

@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
   # This isn't a compulsary dependency
   # but can be used if someone puts it in their
   # own Gemfile when using this.
-  spec.add_development_dependency 'aws-sdk-s3'
   spec.add_development_dependency 'aws-sdk-ecr'
+  spec.add_development_dependency 'aws-sdk-s3'
 end

data/lib/exercism_config/retrieve_config.rb

@@ -3,13 +3,13 @@ module ExercismConfig
     include Mandate
 
     def call
-      return generate_mock if Exercism.env.test?
+      return use_non_production_settings unless Exercism.env.production?
 
       retrieve_from_dynamodb
     end
 
     private
-    def generate_mock
+    def use_non_production_settings
       require 'erb'
       require 'yaml'
 
@@ -43,6 +43,5 @@ module ExercismConfig
         'local'
       end
     end
-
   end
 end

data/lib/exercism_config/retrieve_secrets.rb

@@ -3,20 +3,20 @@ module ExercismConfig
     include Mandate
 
     def call
-      return generate_mock if Exercism.env.test?
+      return use_non_production_settings unless Exercism.env.production?
 
       retrieve_from_aws
     end
 
     private
-    def generate_mock
+    def use_non_production_settings
       require 'erb'
       require 'yaml'
 
-      settings_file = File.expand_path('../../settings/secrets.yml', __dir__)
-      settings = YAML.safe_load(ERB.new(File.read(settings_file)).result)
+      secrets_file = File.expand_path('../../settings/secrets.yml', __dir__)
+      secrets = YAML.safe_load(ERB.new(File.read(secrets_file)).result)
 
-      Exercism::Settings.new(settings, {})
+      Exercism::Secrets.new(secrets)
     end
 
     def retrieve_from_aws

data/lib/exercism_config/version.rb

@@ -1,3 +1,3 @@
 module ExercismConfig
-  VERSION = '0.52.0'.freeze
+  VERSION = '0.57.0'.freeze
 end

data/settings/ci.yml

@@ -1,12 +1,23 @@
+# Anycable
 anycable_redis_url: redis://127.0.0.1:6379/1
 anycable_rpc_host: 127.0.0.1:50051
-aws_submissions_bucket: exercism-staging-submissions
-aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
+
+# DynamoDB config
 dynamodb_tooling_jobs_table: tooling_jobs
 dynamodb_tooling_language_groups_table: tooling_language_groups
+
+# Internal Routes
+language_server_url: ws://127.0.0.1:3023
 spi_url: http://127.0.0.1:3020
 tooling_orchestrator_url: http://127.0.0.1:3021
-language_server_url: ws://127.0.0.1:3023
 
+# MySQL
 mysql_master_endpoint: 127.0.0.1
 mysql_port: <%= ENV["MYSQL_PORT"] %>
+
+# S3 Config
+aws_submissions_bucket: exercism-staging-submissions
+aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
+
+# Sidekiq Config
+sidekiq_redis_url: redis://127.0.0.1:6379/2

data/settings/docker.yml

@@ -1,11 +1,23 @@
+# Anycable
 anycable_redis_url: redis://redis:6379/1
 anycable_rpc_host: 0.0.0.0:50051
-aws_submissions_bucket: exercism-staging-submissions
-aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
+
+# DynamoDB config
 dynamodb_tooling_jobs_table: tooling_jobs
 dynamodb_tooling_language_groups_table: tooling_language_groups
-mysql_master_endpoint: mysql
-mysql_port: 3306
+
+# Internal Routes
 spi_url: http://website:3020
 tooling_orchestrator_url: http://tooling-orchestrator:3021
 language_server_url: ws://localhost:3023
+
+# MySQL
+mysql_master_endpoint: mysql
+mysql_port: 3306
+
+# S3 Config
+aws_submissions_bucket: exercism-staging-submissions
+aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
+
+# Sidekiq Config
+sidekiq_redis_url: redis://redis:6379/2

data/settings/local.yml

@@ -1,11 +1,23 @@
+# Anycable
 anycable_redis_url: redis://127.0.0.1:6379/1
 anycable_rpc_host: 127.0.0.1:50051
-aws_submissions_bucket: exercism-staging-submissions
-aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
+
+# DynamoDB config
 dynamodb_tooling_jobs_table: tooling_jobs
 dynamodb_tooling_language_groups_table: tooling_language_groups
-mysql_master_endpoint: localhost
-mysql_socket: /tmp/mysql.sock
+
+# Internal Routes
+language_server_url: ws://localhost:3023
 spi_url: http://localhost:3020
 tooling_orchestrator_url: http://localhost:3021
-language_server_url: ws://localhost:3023
+
+# MySQL
+mysql_master_endpoint: localhost
+mysql_socket: /tmp/mysql.sock
+
+# S3 Config
+aws_submissions_bucket: exercism-staging-submissions
+aws_tooling_jobs_bucket: exercism-staging-tooling-jobs
+
+# Sidekiq Config
+sidekiq_redis_url: redis://127.0.0.1:6379/2

data/settings/secrets.yml

@@ -1,4 +1,5 @@
 github_omniauth_app_id: "some-github-app-id"
 github_omniauth_app_secret: "some-github-app-exercism-secret"
+github_webhooks_secret: "some-github-webhooks-secret"
 hcaptcha_site_key: "some-hcaptcha-site-key"
 hcaptcha_secret: "some-hcaptcha-secret"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exercism-config
 version: !ruby/object:Gem::Version
-  version: 0.52.0
+  version: 0.57.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-dynamodb
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
+  name: aws-sdk-ecr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-ecr
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="