full360-sequencer 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2847dd62aff2e2cd5540fd3abc9fdcf0b1087bb0e38c9adaeb501b04c4bddc8e
-  data.tar.gz: c0a54bc734e1e3c44aa2c3543e6a171839346c75b9e881028bd28580585f7c06
+  metadata.gz: 9b5bd0d4c3e623279fd6da75822326d24a0f210984d9a6b0aff31e29d7f88f99
+  data.tar.gz: 26ac9248facc2b3d33b3e700895d5cb5fc4ea59c50dc8558cc2087da66d3673d
 SHA512:
-  metadata.gz: f912e6cab2f0bed981e8a11d7fd9add676a1956c40fa6333b628f2ee24ad3e2ddb5e125a78ea0d22520841e39e76fc6c8d0b411e1510b998a04a2f99855a903b
-  data.tar.gz: e86a6e8eccc6296ddd7d58db583e4f9434c1fd8f82ff5f47011ccaa3412ebc9317b06e887c82ed53324bac4df82d9e33eb033a989a74aca1ccd54c49328d87fb
+  metadata.gz: b19ad0f701731ef33cb163934c693538b0b5e13642e3656e5dd74f1f282174144bf2418d1297d65dcc5de02e6a8f50299641054d9990244a819f1d2b124dc757
+  data.tar.gz: ecd6da502c840fded29e4a9e1170dfe5aeae5f39fbfcc0e6f4ab4ed3f648167518ad176687b01dea6a8e145a5501d183a6166540d6901f693299546c6e75f69f

data/.github/workflows/release.yml

@@ -50,9 +50,7 @@ jobs:
 
       - name: Extract tag name
         id: tag
-        uses: actions/github-script@0.2.0
-        with:
-          script: return context.payload.ref.replace(/\/refs\/tags\//, '')
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
       - name: Build JRuby image
         uses: docker/build-push-action@v2
@@ -61,8 +59,8 @@ jobs:
           pull: true
           push: true
           tags: |
-            full360/sequencer:jruby-latest
-            full360/sequencer:${{ steps.tag.outputs.result }}-jruby-latest
+            full360/sequencer:latest-jruby
+            full360/sequencer:${{ steps.tag.outputs.VERSION }}-jruby
 
   docker-ruby:
     runs-on: ubuntu-latest
@@ -83,9 +81,7 @@ jobs:
 
       - name: Extract tag name
         id: tag
-        uses: actions/github-script@0.2.0
-        with:
-          script: return context.payload.ref.replace(/\/refs\/tags\//, '')
+        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
       - name: Build Ruby image
         uses: docker/build-push-action@v2
@@ -94,5 +90,5 @@ jobs:
           pull: true
           push: true
           tags: |
-            full360/sequencer:ruby-latest
-            full360/sequencer:${{ steps.tag.outputs.result }}-ruby-latest
+            full360/sequencer:latest-jruby
+            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.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
+### Removed
+- Remove the `github-script` action.
+
 ## 0.2.5
 ### 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.5)
+    full360-sequencer (0.3.0)
       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)

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 = /^s3:\/\/(?<bucket>.*)\/(?<prefix>.*)$/.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.5".freeze
+    VERSION = "0.3.0".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.5
+  version: 0.3.0
 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