exercism-config 0.51.0 → 0.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6e54c12d701536a89b8e382b481dce7e13407e2c98491901b8e711284b8e63a
-  data.tar.gz: a69555d9cc2681c780ae0a9395d4483efc961bb1c886de410a26fc42e265bd28
+  metadata.gz: 86c955fbfc003d784f274dabab804fa47c9e650a9377e6ae27d500b792a3b4d4
+  data.tar.gz: 5b242eddb88013e13cec926c47f9b2c4d96f0bd1f04561c28730798535be0680
 SHA512:
-  metadata.gz: 516a52a717400357843f5bdcb9a628747dfb3bfddd06a933cb32cb72f401231692248bd2d67d94cff42198ab871f322d0ad4b6564e5556f5f907540708fa2c59
-  data.tar.gz: 4b9f8884c5fb26390bece3826c26ff165e7f7f9e74ff89286d9e85cfb1becf4817a3580e2d99666de19d8a16ed57e7d17e36267be8afb1db987a0b24d781d1ee
+  metadata.gz: d39665cd20bba4db82995357ebfe5eb430ba11f8a8b4640dfa620d6736accc3138ebda253b36d3266c7c3f6bc788c18af6c266c63a51ef9dade00e398e9c32ca
+  data.tar.gz: bbb85e8979746b342f5b923719e172addb3e6cfcd56d4a5cf1ecc4d1feb942cd09ad7b79812b0da88d3cc34b8fa5f7450f4bdbba51789386d33ab14e375ea232

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_config

@@ -32,7 +32,7 @@ def create_dynamodb_table
   )
 end
 
-def delete_table(client)
+def delete_table
   Exercism.dynamodb_client.delete_table(
     table_name: :config
   )
@@ -84,9 +84,17 @@ secrets_file = File.expand_path('../settings/secrets.yml', __dir__)
 puts "Using secrets file: #{secrets_file}"
 secrets_json = YAML.load(ERB.new(File.read(secrets_file)).result).to_json
 
+secret_name = "config"
 secrets_client = Aws::SecretsManager::Client.new(ExercismConfig::GenerateAwsSettings.())
-secrets_client.create_secret(
-  description: "Exercism Config used secrets", 
-  name: "config", 
-  secret_string: secrets_json
-)
+begin
+  secrets_client.create_secret(
+    description: "Exercism Config used secrets", 
+    name: secret_name, 
+    secret_string: secrets_json
+  )
+rescue Aws::SecretsManager::Errors::ResourceExistsException
+  secrets_client.update_secret(
+    secret_id: secret_name, 
+    secret_string: secrets_json
+  )
+end

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.51.0'.freeze
+  VERSION = '0.56.0'.freeze
 end

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.51.0
+  version: 0.56.0
 platform: ruby
 authors:
 - Jeremy Walker
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-08 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:
     - - ">="