lambda_convert 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab417e94470f8f933b2d90b7010d3050cbdf608d
-  data.tar.gz: c2748ee3e263683c0b7aadf00d4a2da2e5b5883d
+  metadata.gz: 6c605d6308b66aa522b51fe09121ea05a1e962eb
+  data.tar.gz: 375b23a2819be672e58bb8894fc7c0df5fc3c10a
 SHA512:
-  metadata.gz: 30120d3f06649b62c0bdf9b3bcf44ca68fbf4a4d6efcc7a14b198187f054ff86d2a101a7eb1fec24a4ec84726812ca26b2425649344a6a587681ec3ffda0b6b3
-  data.tar.gz: 68052dd61c6afdc2da6d303105169eb302376b0d871d2ffcda3bdf2fdd8ccec4ad872578cb85fbcfb2651893b8b595c4a5047bf90e8ab53b145eaf77bfc5c403
+  metadata.gz: a55edfd1babe87ff83d2a9cc763e9a47501b63af31d7c1028f04479f222bffe1a566ae614af7ff896668e8c1cb1838e8586e7e521f138da47851f5263464c197
+  data.tar.gz: 5f557c99c83614749f0b189e56764fc1640359a343f1a649e2943546086e5691e978cce192597e3b723437b2781110f96d702e8e3ccf9c3eab3db5687aaf2049

data/README.md

@@ -27,3 +27,7 @@ To eliminate the big image file uploading issue and the security risk, the idea
  - **CONVERT_S3_KEY_PREFIX** - AWS S3 temporary file uploading prefix, default value is `_convert_tmp/`
  - **CONVERT_LAMBDA_FUNCTION** - Name of the AWS Lambda function to invoke, default value is `image-convert-prod`
  - **CONVERT_DISABLE_FALLBACK** - By default, this command line tool fallbacks to local `convert` command if remote operation fails. Set this value to 1 to disable the fallback behavior.
+
+## The AWS Lambda function
+
+The AWS Lambda function for running ImageMagick can be found here at https://github.com/envoy/envoy-convert

data/lib/lambda_convert/cli.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'json'
+require 'securerandom'
 require 'English'
 
 require 'aws-sdk'
@@ -9,95 +10,119 @@ module LambdaConvert
   module CLI
     class <<self
       attr_accessor :logger
-    end
 
-    def self.lambda_convert
-      s3_region = ENV['CONVERT_S3_REGION'] || ENV['AWS_REGION']
-      lambda_region = ENV['CONVERT_LAMBDA_REGION'] || ENV['AWS_REGION']
-      aws_credentials = Aws::Credentials.new(
-        ENV['CONVERT_ACCESS_KEY'] || ENV['AWS_ACCESS_KEY_ID'],
-        ENV['CONVERT_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_ACCESS_KEY']
-      )
-      s3_bucket = ENV['CONVERT_S3_BUCKET']
-      s3_key_prefix = ENV['CONVERT_S3_KEY_PREFIX'] || '_convert_tmp/'
-      lambda_function = ENV['CONVERT_LAMBDA_FUNCTION'] || 'image-convert-prod'
+      def aws_credentials
+        Aws::Credentials.new(
+          ENV['CONVERT_ACCESS_KEY'] || ENV['AWS_ACCESS_KEY_ID'],
+          ENV['CONVERT_SECRET_ACCESS_KEY'] || ENV['AWS_SECRET_ACCESS_KEY']
+        )
+      end
 
-      s3 = Aws::S3::Client.new(
-        region: s3_region,
-        credentials: aws_credentials
-      )
-      aws_lambda = Aws::Lambda::Client.new(
-        region: lambda_region,
-        credentials: aws_credentials
-      )
+      def lambda_region
+        ENV['CONVERT_LAMBDA_REGION'] || ENV['AWS_REGION']
+      end
 
-      abort('Invalid arguments') if ARGV.count < 2
+      def lambda_function
+        ENV['CONVERT_LAMBDA_FUNCTION'] || 'image-convert-prod'
+      end
 
-      input_file, input_selecting = LambdaConvert::Utils.parse_input_path(
-        ARGV[0]
-      )
-      # Notice: there is also special output file syntax for convert command,
-      # but we are not supporting them now, as we probably won't use it
-      output_file = ARGV[-1]
+      def s3_region
+        ENV['CONVERT_S3_REGION'] || ENV['AWS_REGION']
+      end
 
-      input_key = "#{s3_key_prefix}#{SecureRandom.uuid}"
-      output_key = "#{s3_key_prefix}#{SecureRandom.uuid}"
+      def s3_bucket
+        ENV['CONVERT_S3_BUCKET']
+      end
 
+      def s3_key_prefix
+        ENV['CONVERT_S3_KEY_PREFIX'] || '_convert_tmp/'
+      end
+
+      def s3_client
+        @s3_client ||= Aws::S3::Client.new(
+          region: s3_region,
+          credentials: aws_credentials
+        )
+      end
+
+      def lambda_client
+        @aws_lambda ||= Aws::Lambda::Client.new(
+          region: lambda_region,
+          credentials: aws_credentials
+        )
+      end
+    end
+
+    def self.upload_file(input_file, input_key)
       logger.info("Uploading file to s3://#{s3_bucket}/#{input_key}")
       File.open(input_file, 'rb') do |file|
-        s3.put_object(bucket: s3_bucket, key: input_key, body: file)
+        s3_client.put_object(bucket: s3_bucket, key: input_key, body: file)
       end
+    end
+
+    def self.invoke_lambda(input_key, input_selecting, args, output_key)
       source = '{source}'
       source += "[#{input_selecting}]" unless input_selecting.nil?
       instruction = {
         schema: 'envoy-convert-instruction',
         original: input_key,
         bucket: s3_bucket,
-        write_options: {
-          acl: 'private'
-        },
+        write_options: {},
         key: output_key,
-        args: [source] + ARGV[1..-2] + ['{dest}']
+        args: [source] + args + ['{dest}']
       }
       logger.info("Invoking lambda with instruction #{instruction}")
 
-      resp = aws_lambda.invoke(
+      resp = lambda_client.invoke(
         function_name: lambda_function,
         invocation_type: 'RequestResponse',
         payload: JSON.dump(instruction)
       )
       logger.info("Get response of invoke #{resp}")
       raise 'Failed to run convert on Lambda' if resp.status_code != 200
+    end
 
+    def self.download_file(output_key, output_file)
       logger.info(
         "Downloading file from s3://#{s3_bucket}/#{output_key} to " \
         "#{output_file}"
       )
-      s3.get_object(
+      s3_client.get_object(
         response_target: output_file,
         bucket: s3_bucket,
         key: output_key
       )
+    end
+
+    def self.delete_files(keys)
+      logger.info("Delete files #{keys} from #{s3_bucket}")
+      s3_client.delete_objects(
+        bucket: s3_bucket,
+        delete: {
+          objects: keys.map { |key| { key: key } },
+          quiet: true
+        }
+      )
+    end
+
+    def self.lambda_convert
+      input_file, input_selecting = LambdaConvert::Utils.parse_input_path(
+        ARGV[0]
+      )
+      # Notice: there is also special output file syntax for convert command,
+      # but we are not supporting them now, as we probably won't use it
+      output_file = ARGV[-1]
+      input_key = "#{s3_key_prefix}#{SecureRandom.uuid}"
+      output_key = "#{s3_key_prefix}#{SecureRandom.uuid}"
+
+      upload_file(input_file, input_key)
+      invoke_lambda(input_key, input_selecting, ARGV[1..-2], output_key)
+      download_file(output_key, output_file)
+
       logger.info('Done')
     ensure
-      if !s3.nil? && !input_key.nil? && !output_key.nil?
-        logger.info(
-          "Delete files #{input_key} and #{output_key} from #{s3_bucket}"
-        )
-        s3.delete_objects(
-          bucket: s3_bucket,
-          delete: {
-            objects: [
-              {
-                key: input_key
-              },
-              {
-                key: output_key
-              }
-            ],
-            quiet: true
-          }
-        )
+      if !input_key.nil? && !output_key.nil?
+        delete_files([input_key, output_key])
       end
     end
 
@@ -117,9 +142,9 @@ module LambdaConvert
 
     def self.main
       abort('Recursive call') if ENV['CONVERT_RECURSIVE_FLAG'] == '1'
+      abort('Invalid arguments') if ARGV.count < 2
       lambda_convert
     rescue StandardError => e
-
       logger.warn("Failed to convert via lambda, error=#{e}")
       fallback_disabled = (ENV['CONVERT_DISABLE_FALLBACK'].to_i != 0) || false
       if fallback_disabled

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lambda_convert
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Fang-Pen Lin