Merge pull request #9 from FireTail-io/dev

merge dev into main

Author: TheTeaCat

README.md

@@ -72,35 +72,16 @@ Create an account at [Firetail.App](https://firetail.app/), then:
 
 ### Building The Firetail AppSync Lambda
 
-The Firetail AppSync Lambda is written in Go, and can be built using the standard `go build` command. First, clone the repository and change directory into `logs-handler`, where the Lambda's source is located:
-
-```bash
-git clone [email protected]:FireTail-io/firetail-appsync-lambda.git
-cd firetail-appsync-lambda/logs-hander
-```
-
-Before building the source into a binary, set `GOARCH` to `amd64` and `GOOS` to `linux` to ensure the binary will be compatible with the [Lambda Go runtime](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html):
-
-```bash
-GOARCH=amd64 GOOS=linux
-```
-
-Next, build the binary and output it into a `bin` directory at the root of the repository. `-ldflags="-s -w"` can be used to marginally reduce the size of the binary:
-
-```bash
-go build -ldflags="-s -w" -o ../bin/logs-handler
-```
-
-The [serverless.yml](./serverless.yml) provided in the root of this repository can be used to deploy this binary to Lambda, and expects the binary to be found in a `bin` directory at the root of the repository, hence `-o ../bin/logs-handler`.
-
-The process of building the Firetail AppSync Lambda binary can alternatively be performed using [the Makefile at the root of this repository](./Makefile), using the `build` target:
+The process of building the Firetail AppSync Lambda binary can be performed using [the Makefile at the root of this repository](./Makefile), using the `build` target:
 
 ```bash
 git clone [email protected]:FireTail-io/firetail-appsync-lambda.git
 cd firetail-appsync-lambda
 make build
 ```
 
+A more in-depth explanation of how to build the Firetail AppSync Lambda from source can be found in [docs/build-from-src.md](./docs/build-from-src.md).
+
 
 
 ### Deploying The Firetail AppSync Lambda With Serverless

docs/build-from-src.md

@@ -0,0 +1,22 @@
+## Building The Firetail AppSync Lambda From Source
+
+The Firetail AppSync Lambda is written in Go, and can be built using the standard `go build` command. First, clone the repository and change directory into `logs-handler`, where the Lambda's source is located:
+
+```bash
+git clone [email protected]:FireTail-io/firetail-appsync-lambda.git
+cd firetail-appsync-lambda/logs-hander
+```
+
+Before building the source into a binary, set `GOARCH` to `amd64` and `GOOS` to `linux` to ensure the binary will be compatible with the [Lambda Go runtime](https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html):
+
+```bash
+export GOARCH=amd64 GOOS=linux
+```
+
+Next, build the binary and output it into a `bin` directory at the root of the repository. `-ldflags="-s -w"` can be used to marginally reduce the size of the binary:
+
+```bash
+go build -ldflags="-s -w" -o ../bin/logs-handler
+```
+
+The [serverless.yml](./serverless.yml) provided in the root of this repository can be used to deploy this binary to Lambda, and expects the binary to be found in a `bin` directory at the root of the repository, hence `-o ../bin/logs-handler`.

logs-handler/main.go

@@ -6,11 +6,21 @@ import (
 	"github.com/aws/aws-lambda-go/lambda"
 )
 
+const DefaultFiretailApiUrl string = "https://api.logging.eu-west-1.prod.firetail.app/logs/aws/appsync"
+
 var firetailApiUrl string
 var firetailApiToken string
 
+func loadEnvVars() {
+	var firetailApiUrlSet bool
+	firetailApiUrl, firetailApiUrlSet = os.LookupEnv("FIRETAIL_API_URL")
+	if !firetailApiUrlSet {
+		firetailApiUrl = DefaultFiretailApiUrl
+	}
+	firetailApiToken = os.Getenv("FIRETAIL_API_TOKEN")	
+}
+
 func main() {
-	firetailApiUrl = "https://api.logging.eu-west-1.prod.firetail.app/logs/aws/appsync"
-	firetailApiToken = os.Getenv("FIRETAIL_API_TOKEN")
+	loadEnvVars()
 	lambda.Start(Handler)
 }

logs-handler/main_test.go

@@ -0,0 +1,31 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLoadEnvVars(t *testing.T) {
+	const MockFiretailApiUrl = "MOCK_FIRETAIL_API_URL"
+	const MockFiretailApiToken = "MOCK_FIRETAIL_API_TOKEN"
+
+	t.Setenv("FIRETAIL_API_URL", MockFiretailApiUrl)
+	t.Setenv("FIRETAIL_API_TOKEN", MockFiretailApiToken)
+
+	loadEnvVars()
+
+	assert.Equal(t, firetailApiUrl, MockFiretailApiUrl)
+	assert.Equal(t, firetailApiToken, MockFiretailApiToken)
+}
+
+func TestLoadEnvVarsApiUrlUnset(t *testing.T) {
+	const MockFiretailApiToken = "MOCK_FIRETAIL_API_TOKEN"
+
+	t.Setenv("FIRETAIL_API_TOKEN", MockFiretailApiToken)
+
+	loadEnvVars()
+
+	assert.Equal(t, firetailApiUrl, DefaultFiretailApiUrl)
+	assert.Equal(t, firetailApiToken, MockFiretailApiToken)
+}