Merge pull request #4 from base2Services/develop

v0.1.1 Release

Author: Guslington

Dockerfile

@@ -2,13 +2,16 @@ FROM golang:latest as go
 
 RUN mkdir /build
 
-COPY aws-env.go /build
-
 WORKDIR /build
 
 RUN go get -u github.com/aws/aws-sdk-go
 
-RUN CGO_ENABLED=0 GOOS=linux go build -v -o awsenv .
+Run go get -u github.com/kataras/golog
+
+COPY .git /build/
+COPY aws-env.go /build
+
+RUN CGO_ENABLED=0 GOOS=linux go build -ldflags "-X main.version=$(git describe --tags)" -v -o awsenv .
 
 
 FROM scratch

README.md

@@ -11,9 +11,12 @@ Searches for SSM Parameters in your AWS account based on the variables provided
 
 ## Parameters
 
+### Environment Variables
+
 * `SSM_PATH` [Required] - Complete path structure created in SSM Parameter store
 * `AWS_REGION` [Required] - Region in which the SSM Parameters are stored
 * `DIRECTORY` [Optional] - Directory path of the .env file. Can contain child directories. Default is `/ssm`. *NOTE:* The default cannot be changed if used in a side car configuration.
+* `LOG_LEVEL` [Optional] - Levels such as `fatal`, `error`, `warn`, `info`, `debug`, or `disable`. Default is `info`
 * `FORMAT` [Optional] - Format of the .env file.
     * unset
     ```bash
@@ -28,6 +31,10 @@ Searches for SSM Parameters in your AWS account based on the variables provided
     DB_PASSWORD='SecretPassword'
     ```
 
+### Command Line
+
+* `-v` [Optional] - Show version and exit 0
+
 ## Parameter Hierarchy
 
 Provide the hierachy structure using the `SSM_PATH` environment variable
@@ -81,7 +88,7 @@ test:
   * eval the `/ssm/.env` file to export the environment parameters
 
 ```Dockerfile
-FROM FROM base2/awsenv as awsenv
+FROM base2/awsenv as awsenv
 
 FROM debian:jessie
 

aws-env.go

@@ -6,14 +6,28 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ssm"
+	"github.com/kataras/golog"
 	"io/ioutil"
-	"log"
 	"os"
 	"strings"
 )
 
+var version string
+
 func main() {
 
+	if len(os.Args) > 1 {
+		if os.Args[1] == "-v" {
+			fmt.Printf("awsenv version %s\n", version)
+			os.Exit(0)
+		}
+	}
+
+	// Set log level if defind, default level info
+	if os.Getenv("LOG_LEVEL") != "" {
+		golog.SetLevel(os.Getenv("LOG_LEVEL"))
+	}
+
 	keys := strings.Split(os.Getenv("SSM_PATH"), "/")
 	params := make(map[string]string)
 
@@ -26,7 +40,7 @@ func main() {
 	// Loop through the sub paths and retrieve parameters
 	for i := range keys {
 		path = path + "/" + keys[i]
-		log.Printf("Retriving parameters in path %s", path)
+		golog.Infof("Retriving parameters in path %s", path)
 		ExportVariables(path, "", params)
 	}
 
@@ -53,11 +67,12 @@ func ExportVariables(path string, nextToken string, params map[string]string ) {
 	output, err := client.GetParametersByPath(input)
 
 	if err != nil {
-		log.Panic(err)
+		golog.Fatal(err)
 	}
 
 	for _, element := range output.Parameters {
 		env, value := TrimParameter(path, element)
+		golog.Debugf("Found parameter %s in path %s", env, path)
 		params[env] = value
 	}
 
@@ -90,14 +105,14 @@ func ParametersToFile(params map[string]string) {
 	}
 	// Create /ssm directory if it doesn't exist
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		log.Printf("Creating directory %s", dir)
+		golog.Debugf("Creating directory %s", dir)
 		os.MkdirAll(dir, 0755)
 	}
 
 	// Write evironment variables to .env file
 	err := ioutil.WriteFile(dir + "/.env", buffer.Bytes(), 0744)
 	if err != nil {
-		log.Panic(err)
+		golog.Fatal(err)
 	}
 }
 

docker-compose.yml

@@ -6,6 +6,7 @@ services:
     build: ./
     image: base2/awsenv
     environment:
+      LOG_LEVEL: debug
       SSM_PATH: /my-app/production/prod1
       OUTPUT: shell
       AWS_REGION: ap-southeast-2