Build locally and add s3 metadata to response

Author: aramatev

.github/workflows/main.yml

@@ -1,24 +1,61 @@
-name: Publish Docker images
+name: Build and Publish AWS S3 Proxy
 
 on:
   push:
-    tags:
-    - "*"
+  # workflow_dispatch:
 
 jobs:
-  docker-image-2-0:
-    name: v2.0
-    if: github.event_name == 'push' && contains(github.ref, 'v2.0.')
-    runs-on: ubuntu-18.04
-    env:
-      IMAGE_NAME: docker.pkg.github.com/${{ github.repository }}/linux:2.0
+  build_and_upload:
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
-    - name: Build & Push
-      run: |
-        docker login docker.pkg.github.com -u owner -p ${{ secrets.GITHUB_TOKEN }}
-        docker build -t $IMAGE_NAME docker/linux/2.0/
-        docker push $IMAGE_NAME
-    timeout-minutes: 10
+      - name: Extract branch name
+        id: branch
+        uses: actions/github-script@0.9.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            return context.payload.ref.replace(/^refs\/heads\//, '');
+        continue-on-error: true
+      - uses: actions/checkout@v2
+      - name: Docker login
+        run: |
+          docker run \
+           -e "AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}" \
+           -e "AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}" \
+           -e "AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION}" \
+           amazon/aws-cli ecr get-login-password |
+          docker login \
+            --username AWS \
+            --password-stdin \
+            "${AWS_ECR_S3_PROXY}"
+        env:
+          AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
+          AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"
+          AWS_DEFAULT_REGION: "${{ secrets.AWS_DEFAULT_REGION }}"
+          AWS_ECR_S3_PROXY: "${{ secrets.AWS_ECR_S3_PROXY }}"
+      - name: Docker build
+        working-directory: ./
+        run: |
+          set -x
+          docker build -f docker/linux/2.0/Dockerfile -t aws-s3-proxy .
+      - name: Docker push
+        working-directory: ./
+        run: |
+          set -eufxo pipefail
+          image="${AWS_ECR_S3_PROXY}/infrastructure/aws-s3-proxy"
+          git_hash=$(git reflog --format='%h' -1)
+          head_ref="${{ github.head_ref }}"
+          branch_ref="${{ steps.branch.outputs.result }}"
+          branch=""
+          [ -z "${head_ref}" ] || branch=${head_ref}
+          [ -z "${branch_ref}" ] || branch=${branch_ref}
+          tag_image="${image}:${git_hash}"
+          docker tag aws-s3-proxy "${tag_image}"
+          docker push "${tag_image}"
+          [ -z "${branch}" ] || {
+            tag_image="${image}:${branch}-${git_hash}"
+            docker tag aws-s3-proxy "${tag_image}"
+            docker push "${tag_image}"
+          }
+        env:
+          AWS_ECR_S3_PROXY: "${{ secrets.AWS_ECR_S3_PROXY }}"

docker/linux/2.0/Dockerfile

@@ -1,21 +1,30 @@
 # AWS S3 Proxy v2.0
 # docker run -d -p 8080:80 -e AWS_REGION -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_S3_BUCKET pottava/s3-proxy
 
-FROM golang:1.13.4-alpine3.10 AS builder
+FROM golang:1.13.7-alpine3.11 AS builder
 RUN apk --no-cache add gcc musl-dev git
-RUN go get -u github.com/pottava/aws-s3-proxy
-WORKDIR /go/src/github.com/pottava/aws-s3-proxy
-ENV APP_VERSION=v2.0.0
-RUN git checkout "${APP_VERSION}" > /dev/null 2>&1
-RUN go mod download
-RUN go mod verify
+# RUN go get -u github.com/PreVeil/aws-s3-proxy
+# WORKDIR /go/src/github.com/PreVeil/aws-s3-proxy
+# ENV APP_VERSION=v2.0.0
+# RUN git checkout "${APP_VERSION}" > /dev/null 2>&1
+# RUN go mod download
+# RUN go mod verify
+
+WORKDIR /build
+ARG APP_VERSION=v2.0.0
+
+COPY go.mod go.sum ./
+RUN go mod download && go mod verify
+
+COPY . .
+
 RUN githash=$(git rev-parse --short HEAD 2>/dev/null) \
     && today=$(date +%Y-%m-%d --utc) \
     && CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build \
-    -ldflags '-s -w -X main.ver=${APP_VERSION} -X main.commit=${githash} -X main.date=${today}' \
+    -ldflags "-s -w -X main.ver=${APP_VERSION} -X main.commit=${githash} -X main.date=${today}" \
     -o /app
 
-FROM alpine:3.10 AS libs
+FROM alpine:3.11 AS libs
 RUN apk --no-cache add ca-certificates
 
 FROM scratch

internal/config/config.go

@@ -21,6 +21,7 @@ type config struct { // nolint
 	AwsAPIEndpoint     string        // AWS_API_ENDPOINT
 	S3Bucket           string        // AWS_S3_BUCKET
 	S3KeyPrefix        string        // AWS_S3_KEY_PREFIX
+	S3Metadata         bool          // AWS_S3_METADATA
 	IndexDocument      string        // INDEX_DOCUMENT
 	DirectoryListing   bool          // DIRECTORY_LISTINGS
 	DirListingFormat   string        // DIRECTORY_LISTINGS_FORMAT
@@ -62,6 +63,10 @@ func Setup() {
 	if len(indexDocument) == 0 {
 		indexDocument = "index.html"
 	}
+	s3Metadata := false
+	if b, err := strconv.ParseBool(os.Getenv("AWS_S3_METADATA")); err == nil {
+		s3Metadata = b
+	}
 	directoryListings := false
 	if b, err := strconv.ParseBool(os.Getenv("DIRECTORY_LISTINGS")); err == nil {
 		directoryListings = b
@@ -103,6 +108,7 @@ func Setup() {
 		AwsAPIEndpoint:     os.Getenv("AWS_API_ENDPOINT"),
 		S3Bucket:           os.Getenv("AWS_S3_BUCKET"),
 		S3KeyPrefix:        os.Getenv("AWS_S3_KEY_PREFIX"),
+		S3Metadata:         s3Metadata,
 		IndexDocument:      indexDocument,
 		DirectoryListing:   directoryListings,
 		DirListingFormat:   os.Getenv("DIRECTORY_LISTINGS_FORMAT"),

internal/controllers/s3.go

@@ -70,7 +70,7 @@ func AwsS3(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, message, code)
 		return
 	}
-	setHeadersFromAwsResponse(w, obj, c.HTTPCacheControl, c.HTTPExpires)
+	setHeadersFromAwsResponse(w, obj, c.HTTPCacheControl, c.HTTPExpires, c.S3Metadata)
 
 	io.Copy(w, obj.Body) // nolint
 }
@@ -93,7 +93,7 @@ func replacePathWithSymlink(client service.AWS, bucket, symlinkPath string) (*st
 	return aws.String(link.URL), nil
 }
 
-func setHeadersFromAwsResponse(w http.ResponseWriter, obj *s3.GetObjectOutput, httpCacheControl, httpExpires string) {
+func setHeadersFromAwsResponse(w http.ResponseWriter, obj *s3.GetObjectOutput, httpCacheControl, httpExpires string, s3Metadata bool) {
 
 	// Cache-Control
 	if len(httpCacheControl) > 0 {
@@ -120,6 +120,14 @@ func setHeadersFromAwsResponse(w http.ResponseWriter, obj *s3.GetObjectOutput, h
 	setStrHeader(w, "ETag", obj.ETag)
 	setTimeHeader(w, "Last-Modified", obj.LastModified)
 
+	// A map of metadata to store with the object in S3.
+	// Metadata map[string]*string `location:"headers" locationName:"x-amz-meta-" type:"map"`
+	if s3Metadata {
+		for metaKey, metaValue := range obj.Metadata {
+			setStrHeader(w, metaKey, metaValue)
+		}
+	}
+
 	w.WriteHeader(determineHTTPStatus(obj))
 }