Merge pull request #6 from fac/fix-deploy-action

Fix deploy action

Author: HistoireDeBabar

.rubocop.yml

@@ -2,11 +2,10 @@ AllCops:
   DisabledByDefault: true
   Include:
     - "**/Gemfile"
-    - "**/lib/**.rb"
-    - "**/test/**.rb"
-    - "**/features/**/**.rb"
+    - "**/lib/**/*"
+    - "**/test/**/*"
+    - "**/bin/**"
     - "**.rb"
-    - "**/producer/**.rb"
   TargetRubyVersion: 2.7
 
 #################### Layout ################################

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    serverless-tools (0.0.2)
+    serverless-tools (0.0.3)
       aws-sdk-lambda
       aws-sdk-s3
       thor
@@ -11,7 +11,7 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.532.0)
+    aws-partitions (1.534.0)
     aws-sdk-core (3.122.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
@@ -20,7 +20,7 @@ GEM
     aws-sdk-kms (1.51.0)
       aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.71.0)
+    aws-sdk-lambda (1.73.0)
       aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.106.0)

lib/serverless-tools/cli.rb

@@ -7,7 +7,7 @@ class CLI < Thor
     desc "comment", "create Github Issue comment body"
     method_option :functions, :type => :string, :aliases => "-f", :default => "{}"
     def comment
-      comment = Comment.build(options[:functions])
+      comment = Comment.new.build(options[:functions])
       puts "::set-output name=comment::#{comment}"
     end
 

lib/serverless-tools/comment.rb

@@ -1,9 +1,14 @@
 require "json"
+require_relative "git"
 
 module ServerlessTools
   class Comment
-    def self.build(function_json)
-      lines = ["Functions updated for sha: #{ENV["GITHUB_SHA"]} %0A"]
+    def initialize(git: Git.new)
+      @git = git
+    end
+
+    def build(function_json)
+      lines = ["Functions updated for sha: #{@git.sha} %0A"]
       lines << JSON.parse(function_json).map do |function, status|
       "> **#{function}**: #{status} %0A"
       end

lib/serverless-tools/deployer/aws_lambda_config.rb

@@ -1,13 +1,15 @@
 require "yaml"
+require_relative "../git"
 
 module ServerlessTools
   module Deployer
     class AwsLambdaConfig
       attr_reader :function_name, :s3_archive_name, :handler_file, :bucket
 
-      def initialize(filename:, function_name:)
+      def initialize(filename:, function_name:, git: Git.new)
         config_data = YAML.load_file(filename)
 
+        @git = git
         @repo = config_data[function_name]["repo"]
         @function_name = function_name
         @s3_archive_name = config_data[function_name]["s3_archive_name"]
@@ -16,7 +18,7 @@ def initialize(filename:, function_name:)
       end
 
       def s3_key
-        "#{repo}/deployments/#{git_sha}/#{function_name}/#{s3_archive_name}"
+        "#{repo}/deployments/#{git.sha}/#{function_name}/#{s3_archive_name}"
       end
 
       def local_filename
@@ -25,11 +27,7 @@ def local_filename
 
       private
 
-      attr_reader :repo
-
-      def git_sha
-        (ENV["GITHUB_SHA"] || (`git rev-parse HEAD`)).strip
-      end
+      attr_reader :repo, :git
     end
   end
 end

lib/serverless-tools/deployer/aws_lambda_function.rb

@@ -9,7 +9,6 @@ def initialize(config, client:)
       end
 
       def update_code(object)
-        puts ""
         unless object.exists?
           puts "::warning:: Not updating #{config.function_name} as key does not exist!"
           puts "::warning:: key: #{object.key}"
@@ -20,15 +19,10 @@ def update_code(object)
           s3_bucket: object.bucket.name,
           s3_key: object.key,
         })
-        puts "::set-output name=#{resp[:function_name]}::#{resp[:last_update_status]}"
-
-        puts "\\`#{resp[:function_name]}\\` function update was #{resp[:last_update_status]}"
-        puts "> updated with #{object.key}"
+        puts "::set-output name=#{resp[:function_name]}_status::#{resp[:last_update_status]}"
+        puts "::set-output name=#{resp[:function_name]}_key::#{object.key}"
       rescue Aws::Lambda::Errors::ServiceError => e
         puts "::error:: An error occured when updating #{config.function_name} #{e.message}"
-        puts "An error occured when updating \\`#{config.function_name}\\`"
-        puts "> attempted to update with #{object.key}"
-        puts "> error message: #{e.message}"
       end
 
       private

lib/serverless-tools/git.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+module ServerlessTools
+  class Git
+    def sha
+      (`git rev-parse HEAD`).strip
+    end
+  end
+end

lib/serverless-tools/version.rb

@@ -1,3 +1,3 @@
 module ServerlessTools
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

serverless-tools.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ["serverless-tools"]
   spec.require_paths = ["lib"]
 
-  spec.requirements << "zip"
+  spec.requirements = ["zip", "git"]
 
   spec.post_install_message = "Serverless tools, and beyond!"
 

test/comment_test.rb

@@ -0,0 +1,31 @@
+require "minitest/autorun"
+require "mocha/minitest"
+
+require "serverless-tools/comment"
+
+describe "Comment" do
+  let(:git) { mock() }
+  let(:key) { "/key/to/s3/object/function.zip" }
+  let(:function) { "example_function" }
+  let(:function_json) do
+    {
+      example_function_status: "Succeeded",
+      example_function_key: key,
+    }.to_json
+  end
+
+  describe "#build" do
+    before do
+      git.stubs(:sha).returns("123")
+    end
+
+    it "returns a value" do
+      comment = ServerlessTools::Comment.new(git: git)
+
+      expected_result = "Functions updated for sha: 123 %0A"\
+                        "> **#{function}_status**: Succeeded %0A> **#{function}_key**: #{key} %0A"
+
+      assert_equal(comment.build(function_json), expected_result)
+    end
+  end
+end