Refactored code, added IsBase64Encoded

Author: dhvcc

.gitignore

@@ -0,0 +1,7 @@
+main
+resize
+*.zip
+nohup.out
+.vim
+.vscode
+*.png

other/logo.png renamed to assets/logo.png

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+GOOS=linux
+GOARCH=amd64
+CGO_ENABLED=0
+
+go build -o main
+[ $? = '1' ] && echo "Error building module" && exit 1
+zip dist.zip main
+rm main
+[ $? = '1' ] && echo "Error zipping" && exit 1
+
+echo "Build finished"

bindata.go

@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/andybalholm/brotli v1.0.3 // indirect
-	github.com/aws/aws-lambda-go v1.26.0 // indirect
-	github.com/disintegration/imaging v1.6.2 // indirect
+	github.com/aws/aws-lambda-go v1.26.0
+	github.com/disintegration/imaging v1.6.2
 	github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect
 	github.com/klauspost/compress v1.13.5 // indirect
 	github.com/valyala/fasthttp v1.29.0 // indirect

build.sh

@@ -1,84 +1,21 @@
 package main
 
 import (
-	"bytes"
 	"context"
-	"crypto/tls"
-	"encoding/base64"
 	"fmt"
+
 	"github.com/aws/aws-lambda-go/events"
-	"github.com/aws/aws-lambda-go/lambda"
-	"github.com/disintegration/imaging"
-	"image"
-	"image/color"
-	"net/http"
-	"time"
 )
 
-const width = 1200
-const height = 630
-const minHeight = 250
-
-func convertImage(url string) image.Image {
-	fmt.Printf("====> Should convert url: %s.\n", url)
-	asset, err := Asset("logo.png")
-	if err != nil {
-		return imaging.New(1, 1, color.Black)
-	}
-	background, _ := imaging.Decode(bytes.NewReader(asset))
-
-	fmt.Printf("Started request.\n")
-	tr := &http.Transport{}
-	tr.TLSClientConfig = &tls.Config{
-		NextProtos: []string{"h1"},
-	}
-
-	client := &http.Client{
-		Timeout:   5 * time.Second,
-		Transport: tr,
-	}
-	imageResp, err := client.Get(url)
-	if err != nil {
-		panic(err)
-	}
-	fmt.Println(imageResp)
-	//imageResp, _ := http.Get(url)
-	//defer imageResp.Body.Close()
-
-	fmt.Printf("Finished request.\n")
-	image, _ := imaging.Decode(imageResp.Body)
-	image_h := image.Bounds().Max.Y
-
-	if image_h < minHeight {
-		image = imaging.Resize(image, 0, minHeight, imaging.Lanczos)
-		image_h = image.Bounds().Max.Y
-	}
-
-	output := imaging.Resize(background, 0, image_h, imaging.Lanczos)
-	output = imaging.PasteCenter(output, image)
-	fmt.Printf("====> Returning request.\n")
-	return image
-}
-
-func encodeImage(image image.Image) string {
-	var buf bytes.Buffer
-	fmt.Printf("====> Start encoding.\n")
-	b64encoder := base64.NewEncoder(base64.StdEncoding, &buf)
-	imaging.Encode(b64encoder, image, imaging.JPEG)
-	b64encoder.Close()
-	encoded := buf.String()
-	fmt.Printf("====> Ended encoding.\n")
-	return encoded
-}
-
 func HandleRequest(ctx context.Context, request events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
 	fmt.Printf("Processing request data for request %s.\n", request.RequestContext.RequestID)
-	body := encodeImage(convertImage(request.QueryStringParameters["image"]))
-	headers := map[string]string{"content-type": "image/png"}
-
-	return events.APIGatewayProxyResponse{Body: body, StatusCode: 200, Headers: headers}, nil
-}
-
-func main() {
-	lambda.Start(HandleRequest)
+	body := EncodeImage(ConvertImage(request.QueryStringParameters["image"]))
+	headers := map[string]string{"Content-Type": "image/png"}
+
+	return events.APIGatewayProxyResponse{
+		Body:            body,
+		StatusCode:      200,
+		Headers:         headers,
+		IsBase64Encoded: true,
+	}, nil
 }

go.mod

@@ -0,0 +1,9 @@
+package main
+
+import (
+	"github.com/aws/aws-lambda-go/lambda"
+)
+
+func main() {
+  lambda.Start(HandleRequest)
+}

lambda.go

@@ -0,0 +1,58 @@
+package main
+
+import (
+	"bytes"
+	"encoding/base64"
+	"fmt"
+	"image"
+	"image/color"
+	"net/http"
+
+	"github.com/disintegration/imaging"
+)
+
+const width = 1200
+const height = 630
+const minHeight = 250
+
+func ConvertImage(url string) image.Image {
+	fmt.Printf("====> Should convert url: %s.\n", url)
+	asset, err := Asset("assets/logo.png")
+	if err != nil {
+		fmt.Println("Can't load asset, falling back to black square")
+		return imaging.New(width, height, color.Black)
+	}
+	background, _ := imaging.Decode(bytes.NewReader(asset))
+
+	fmt.Printf("Started request.\n")
+	imageResp, err := http.Get(url)
+	if err != nil {
+		panic(err)
+	}
+	defer imageResp.Body.Close()
+
+	fmt.Printf("Finished request.\n")
+	image, _ := imaging.Decode(imageResp.Body)
+	image_h := image.Bounds().Max.Y
+
+	if image_h < minHeight {
+		image = imaging.Resize(image, 0, minHeight, imaging.Lanczos)
+		image_h = image.Bounds().Max.Y
+	}
+
+	output := imaging.Resize(background, 0, image_h, imaging.Lanczos)
+	output = imaging.PasteCenter(output, image)
+	fmt.Printf("====> Returning image %s.\n", output.Bounds().Max)
+	return output
+}
+
+func EncodeImage(image image.Image) string {
+	var buf bytes.Buffer
+	fmt.Printf("====> Start encoding.\n")
+	b64encoder := base64.NewEncoder(base64.StdEncoding, &buf)
+	imaging.Encode(b64encoder, image, imaging.JPEG)
+	b64encoder.Close()
+	encoded := buf.String()
+	fmt.Printf("====> Ended encoding.\n")
+	return encoded
+}