Skip to content

Commit

Permalink
Merge branch 'develop' into modularize_infrastructure
Browse files Browse the repository at this point in the history
  • Loading branch information
dwilkie committed Aug 27, 2024
2 parents 747f9db + 120feec commit 6bca903
Show file tree
Hide file tree
Showing 18 changed files with 46 additions and 452 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/client_gateway.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
image: ${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}

- name: Deploy
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
uses: aws-actions/amazon-ecs-deploy-task-definition@v2
with:
task-definition: ${{ steps.render-task-def.outputs.task-definition }}
service: ${{ matrix.ecs_service }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/media_proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
image: ${{ env.ECR_REGISTRY }}/media-proxy:${{ env.IMAGE_TAG }}

- name: Deploy
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
uses: aws-actions/amazon-ecs-deploy-task-definition@v2
with:
task-definition: ${{ steps.render-task-def.outputs.task-definition }}
service: ${{ matrix.ecs_service }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/public_gateway.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:
image: ${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}

- name: Deploy
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
uses: aws-actions/amazon-ecs-deploy-task-definition@v2
with:
task-definition: ${{ steps.render-task-def.outputs.task-definition }}
service: ${{ matrix.ecs_service }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/switch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ jobs:
image: ${{ env.APP_ECR_REPOSITORY_URI }}:${{ env.IMAGE_TAG }}

- name: Deploy App Server
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
uses: aws-actions/amazon-ecs-deploy-task-definition@v2
with:
task-definition: ${{ steps.render-app-task-def.outputs.task-definition }}
service: ${{ matrix.ecs_service }}
Expand Down
46 changes: 22 additions & 24 deletions components/app/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,19 @@ GEM
adhearsion-loquacious (1.9.3)
ast (2.4.2)
aws-eventstream (1.3.0)
aws-partitions (1.950.0)
aws-sdk-core (3.201.0)
aws-partitions (1.967.0)
aws-sdk-core (3.201.5)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-lambda (1.125.0)
aws-sdk-lambda (1.127.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-polly (1.90.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-sigv4 (1.9.1)
aws-eventstream (~> 1, >= 1.0.2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
Expand All @@ -124,7 +124,7 @@ GEM
coderay (1.1.3)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
countdownlatch (1.0.0)
crack (1.0.0)
Expand All @@ -139,10 +139,10 @@ GEM
drb (2.2.1)
equalizer (0.0.11)
eventmachine (1.2.7)
faraday (2.10.0)
faraday-net_http (>= 2.0, < 3.2)
faraday (2.11.0)
faraday-net_http (>= 2.0, < 3.4)
logger
faraday-net_http (3.1.0)
faraday-net_http (3.3.0)
net-http
ffi (1.16.3)
ffi-compiler (1.3.2)
Expand Down Expand Up @@ -189,23 +189,21 @@ GEM
niceogiri (1.1.2)
nokogiri (~> 1.5)
nio4r (2.7.3)
nokogiri (1.16.6-arm-linux)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.6-x86_64-linux)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
okcomputer (1.18.5)
parallel (1.25.1)
parser (3.3.4.0)
ast (~> 2.4.1)
racc
phony (2.20.12)
phony (2.20.13)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.5)
racc (1.8.0)
racc (1.8.1)
rack (3.0.11)
rack-protection (4.0.0)
base64 (>= 0.1.0)
Expand All @@ -219,12 +217,12 @@ GEM
webrick (~> 1.8)
rainbow (3.1.1)
rake (13.2.1)
redis (5.2.0)
redis (5.3.0)
redis-client (>= 0.22.0)
redis-client (0.22.2)
connection_pool
regexp_parser (2.9.2)
rexml (3.3.1)
rexml (3.3.6)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
Expand All @@ -239,7 +237,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.65.0)
rubocop (1.65.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -250,7 +248,7 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
rubocop-ast (1.32.0)
parser (>= 3.3.1.0)
rubocop-minitest (0.35.0)
rubocop (>= 1.61, < 2.0)
Expand All @@ -268,7 +266,7 @@ GEM
rubocop-minitest
rubocop-performance
rubocop-rails
rubocop-rspec (3.0.3)
rubocop-rspec (3.0.4)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
Expand All @@ -278,7 +276,7 @@ GEM
ruby_speech (3.0.1)
activesupport (>= 3.0.7)
nokogiri (~> 1.8, >= 1.8.3)
sentry-ruby (5.18.1)
sentry-ruby (5.19.0)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
simplecov (0.22.0)
Expand Down Expand Up @@ -312,15 +310,16 @@ GEM
thread_safe (0.3.6)
tilt (2.3.0)
timers (4.3.5)
twilio-ruby (7.2.3)
twilio-ruby (7.2.4)
faraday (>= 0.9, < 3.0)
jwt (>= 1.5, < 3.0)
nokogiri (>= 1.6, < 2.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uri (0.13.0)
vcr (6.2.0)
vcr (6.3.1)
base64
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
Expand All @@ -338,7 +337,6 @@ GEM
PLATFORMS
arm64-darwin-22
arm64-darwin-23
arm64-linux
x86_64-linux
x86_64-linux-musl

Expand Down
14 changes: 7 additions & 7 deletions components/s3_mpeg/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@ GEM
remote: https://rubygems.org/
specs:
aws-eventstream (1.3.0)
aws-partitions (1.950.0)
aws-sdk-core (3.201.0)
aws-partitions (1.966.0)
aws-sdk-core (3.201.5)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.156.0)
aws-sdk-s3 (1.159.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-sigv4 (1.9.1)
aws-eventstream (~> 1, >= 1.0.2)
diff-lcs (1.5.1)
docile (1.4.0)
jmespath (1.6.2)
ox (2.14.18)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.3.6)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand Down
26 changes: 13 additions & 13 deletions components/services/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,38 @@ GEM
remote: https://rubygems.org/
specs:
aws-eventstream (1.3.0)
aws-partitions (1.955.0)
aws-sdk-core (3.201.1)
aws-partitions (1.967.0)
aws-sdk-core (3.201.5)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ec2 (1.465.0)
aws-sdk-ec2 (1.470.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-ecs (1.151.0)
aws-sdk-ecs (1.154.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-ssm (1.173.0)
aws-sdk-ssm (1.175.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.8.0)
aws-sigv4 (1.9.1)
aws-eventstream (~> 1, >= 1.0.2)
bigdecimal (3.1.8)
coderay (1.1.3)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
diff-lcs (1.5.1)
docile (1.4.0)
jmespath (1.6.2)
method_source (1.1.0)
ox (2.14.18)
pg (1.5.6)
pg (1.5.7)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
rake (13.2.1)
rexml (3.2.8)
strscan (>= 3.0.9)
rexml (3.3.6)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -47,10 +47,10 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
sentry-ruby (5.18.1)
sentry-ruby (5.19.0)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
sequel (5.82.0)
sequel (5.83.1)
bigdecimal
simplecov (0.22.0)
docile (~> 1.1)
Expand Down
62 changes: 0 additions & 62 deletions components/testing/infrastructure/.terraform.lock.hcl

This file was deleted.

7 changes: 0 additions & 7 deletions components/testing/infrastructure/Dockerfile

This file was deleted.

16 changes: 0 additions & 16 deletions components/testing/infrastructure/README.md

This file was deleted.

Loading

0 comments on commit 6bca903

Please sign in to comment.