full360-sequencer 0.2.6 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e39df18990fb5fdf6924e3e4b60b373f1400db68d6125be7a24b56b3401950f5
-  data.tar.gz: 400f3182c16e5f32dfa88883c0717f7ddecc88c1e8aec993a19abbdb2f5e613d
+  metadata.gz: 6b306d37c59d71853d6163ceb7ee5536d760891d403a9306f81ecbfb83cb6400
+  data.tar.gz: 93dc22959e26473187909b980c706218807f5ed07ac5e00d28877517155785c0
 SHA512:
-  metadata.gz: 75181267e1df232193818cff99384d6ac2262f3b6059afdf71d1f445ab0b09d869ead4aed3882545a30b8242c0c7091661bbc301bc24410efc9a5d3e57e37459
-  data.tar.gz: a78938906d4c9c7cbf650a32f3932000c57349d00490b3779ba55fea428060f6ef3809f265d40ae81f26e75b4209a5032c75d58910007a6b34cfa5d8446a1271
+  metadata.gz: 8829c54bb964f3de9361cb58ea6eb23451f5c2ac8f91a81f180f2a957a7ab576f89273409ec1ac615e56ca1aeec2d2cf9e096657a1b82cb50f37258cfeb64d26
+  data.tar.gz: 45d0bf6df5196b24a71af673932187d9908888dd5993682a4481631ca906cadef0bfd8141f28696145f49a3516d78826fc311ba7f172835769b93f4c3d18f7d4

data/.github/workflows/release.yml

@@ -59,8 +59,8 @@ jobs:
           pull: true
           push: true
           tags: |
-            full360/sequencer:jruby-latest
-            full360/sequencer:${{ steps.tag.outputs.VERSION }}-jruby-latest
+            full360/sequencer:latest-jruby
+            full360/sequencer:${{ steps.tag.outputs.VERSION }}-jruby
 
   docker-ruby:
     runs-on: ubuntu-latest
@@ -90,5 +90,5 @@ jobs:
           pull: true
           push: true
           tags: |
-            full360/sequencer:ruby-latest
-            full360/sequencer:${{ steps.tag.outputs.VERSION }}-ruby-latest
+            full360/sequencer:latest-ruby
+            full360/sequencer:${{ steps.tag.outputs.VERSION }}-ruby

data/CHANGELOG.md

@@ -10,6 +10,33 @@ Versioning](http://semver.org/spec/v2.0.0.html).
 ### Changed
 ### Removed
 
+## 0.3.1
+### Added
+### Changed
+- Make the S3 URL matcher work with all types of prefixes.
+### Removed
+
+## 0.3.0
+### Added
+- AWS SDK for S3 as a dependency.
+### Changed
+- Downloading the sequencer file is now done using Ruby.
+- Reading the YAML file is not required anymore by the process.
+### Removed
+- Remove the aws-cli as a dependency of the Docker image.
+
+## 0.2.8
+### Added
+### Changed
+- Rename the sequencer file in entrypoint to `sequencer.yml`
+### Removed
+
+## 0.2.7
+### Added
+### Changed
+- Normalize the Docker image tags to `latest-jruby/ruby` and `vX.X.X-jruby/ruby`
+### Removed
+
 ## 0.2.6
 ### Added
 ### Changed

data/Dockerfile.jruby

@@ -8,7 +8,6 @@ RUN apt-get update \
   && apt-get install -y --no-install-recommends \
   unzip \
   ca-certificates \
-  awscli \
   && update-ca-certificates \
   && rm -rf /var/lib/apt/lists/*
 

data/Dockerfile.ruby

@@ -5,10 +5,7 @@ RUN apk add --no-cache \
   unzip \
   ca-certificates \
   bash \
-  wget \
-  curl \
-  aws-cli \
-  && update-ca-certificates \
+  && update-ca-certificates
 
 #set time zone
 RUN mv /etc/localtime /etc/localtime.bak ; ln -s /usr/share/zoneinfo/UTC /etc/localtime

data/Gemfile.lock

@@ -1,22 +1,30 @@
 PATH
   remote: .
   specs:
-    full360-sequencer (0.2.6)
+    full360-sequencer (0.3.1)
       aws-sdk-ecs (~> 1.85)
+      aws-sdk-s3 (~> 1.103)
 
 GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.2.0)
-    aws-partitions (1.510.0)
+    aws-partitions (1.516.0)
     aws-sdk-core (3.121.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ecs (1.85.0)
+    aws-sdk-ecs (1.86.0)
       aws-sdk-core (~> 3, >= 3.120.0)
       aws-sigv4 (~> 1.1)
+    aws-sdk-kms (1.49.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.103.0)
+      aws-sdk-core (~> 3, >= 3.120.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     coderay (1.1.3)
@@ -49,4 +57,4 @@ DEPENDENCIES
   rake (~> 12)
 
 BUNDLED WITH
-   2.2.28
+   2.2.29

data/bin/sequencer

@@ -19,6 +19,15 @@ def sequencer_version
 end
 
 begin
+  region = ENV.fetch("AWS_REGION", "us-east-1")
+  s3_str = ENV.fetch("SEQUENCER_YAML_S3_PATH", "s3://dummy/prefix")
+  
+  # Will split the path into two groups one for the bucket and one for the
+  # prefix and we will use this later on when we download the file.
+  matches = /\As3:\/\/(?<bucket>.+?)\/(?<prefix>.+)\z/.match(s3_str)
+
+  s3_client = Aws::S3::Client.new(region: region)
+
   logger.info("sequencer version #{sequencer_version}")
   logger.level = ENV["SEQUENCER_LOG_DEBUG"] ? Logger::DEBUG : Logger::INFO
 
@@ -28,8 +37,13 @@ begin
   else
     sleep_between_checks = ENV.fetch("SEQUENCER_SLEEP_BETWEEN_CHECKS", 5).to_i
 
+    logger.info("downloading from S3: #{matches["bucket"]}/#{matches["prefix"]}")
+    resp = s3_client.get_object(bucket: matches["bucket"], key: matches["prefix"])
+
+    logger.info("file last modified on: #{resp.last_modified}")
+
     Full360::Sequencer::Runner.new(sleep_between_checks, logger).tap do |runner|
-      runner.config_from_file(config_file)
+      runner.config_from_file(resp.body.read)
       runner.run
     end
   end

data/entrypoint.sh

@@ -1,10 +1,3 @@
 #!/usr/bin/env bash
 
-if [ -n "$AWS_REGION" ]
-then
-  aws s3 cp $SEQUENCER_YAML_S3_PATH /sequencer/file.yml --region $AWS_REGION
-else
-  aws s3 cp $SEQUENCER_YAML_S3_PATH /sequencer/file.yml
-fi
-
-sequencer /sequencer/file.yml
+sequencer $SEQUENCER_YAML_S3_PATH

data/full360-sequencer.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0"
 
   spec.add_runtime_dependency "aws-sdk-ecs", "~> 1.85"
+  spec.add_runtime_dependency "aws-sdk-s3", "~> 1.103"
 
   # development dependencies
   spec.add_development_dependency "minitest", "~> 5.9"

data/lib/full360_sequencer/runner.rb

@@ -72,7 +72,7 @@ module Full360
       # @params yaml_path [String]
       # @return [Array]
       def parse_config_file(yaml_path)
-        YAML.safe_load(File.read(yaml_path), symbolize_names: true)
+        YAML.safe_load(yaml_path, symbolize_names: true)
       end
     end
   end

data/lib/full360_sequencer/version.rb

@@ -1,5 +1,5 @@
 module Full360
   module Sequencer
-    VERSION = "0.2.6".freeze
+    VERSION = "0.3.1".freeze
   end
 end

data/lib/full360_sequencer.rb

@@ -1,4 +1,5 @@
 require "logger"
+require "aws-sdk-s3"
 
 # Autoload all gem classes
 module Full360

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: full360-sequencer
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
 platform: ruby
 authors:
 - Full 360 Group
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.85'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.103'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.103'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement