Skip to content

Remove s3 requirement #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove s3 requirement #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0a43e5
Remove s3 requirement
iHiD Apr 19, 2022
03ae6c6
Add matrix
ErikSchierboom Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,13 @@ on:

jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
os: ['ubuntu-20.04']
ruby-version: ['3.0', '3.1']
Comment on lines +14 to +15
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a matrix for testing. Let me know which values you want to test with.


runs-on: ${{ matrix.os }}

services:
aws:
Expand Down Expand Up @@ -36,7 +42,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@168d6a54b412713c0ed60998a78093a270ca8d84
with:
ruby-version: '3.0'
ruby-version: ${{ matrix.ruby-version }}
bundler-cache: true

###
Expand Down
8 changes: 4 additions & 4 deletions .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ Style/ZeroLengthPredicate:
Style/ClassAndModuleChildren:
Enabled: false

Naming/FileName:
Exclude:
- "lib/exercism-config.rb"

Naming/VariableNumber:
EnforcedStyle: snake_case

Naming/FileName:
Exclude:
- lib/exercism-config.rb

Style/LambdaCall:
EnforcedStyle: braces
1 change: 1 addition & 0 deletions exercism_config.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ 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 'webrick'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this gem?

spec.add_development_dependency 'elasticsearch', '6.8.3'
spec.add_development_dependency 'redis'
end
32 changes: 19 additions & 13 deletions lib/exercism-config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,24 @@
require 'ostruct'
require 'json'

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_config'
require_relative 'exercism_config/retrieve_secrets'

require_relative 'exercism_config/version'
require_relative 'exercism/config'
require_relative 'exercism/secrets'
require_relative 'exercism/tooling_job'
# 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_config'
# require_relative 'exercism_config/retrieve_secrets'

# require_relative 'exercism_config/version'
# require_relative 'exercism/config'
# require_relative 'exercism/secrets'
# require_relative 'exercism/tooling_job'
Comment on lines +7 to +19
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can these be removed?


require "zeitwerk"
loader = Zeitwerk::Loader.for_gem
loader.ignore(__FILE__)
loader.setup

module Exercism
class ConfigError < RuntimeError; end
Expand All @@ -42,6 +47,7 @@ def self.dynamodb_client
end

def self.s3_client
require 'webrick'
require 'aws-sdk-s3'
Aws::S3::Client.new(
ExercismConfig::GenerateAwsSettings.().merge(
Expand Down
11 changes: 0 additions & 11 deletions lib/exercism_config/setup_dynamodb_client.rb
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions lib/exercism_config/setup_ecr_client.rb
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions lib/exercism_config/setup_s3_client.rb
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions test/retrieve_config_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def test_config_for_production
def test_config_for_development
Exercism.stubs(env: ExercismConfig::Environment.new(:development))
config = ExercismConfig::RetrieveConfig.()
p config
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was it intentional to add this?

assert_includes %w[
mysql
localhost
Expand Down