Merge pull request #22 from lukaszbudnik/dependabot/docker/golang-1.17.0-alpine3.13

Bump golang from 1.16.3-alpine3.13 to 1.17.0-alpine3.13

.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  # Maintain dependencies for go lang
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  # Maintain dependencies for docker
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/docker-image.yml

@@ -1,18 +1,12 @@
 name: Docker Image CI
 
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+on: [push, pull_request]
 
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag yosoy-local:$(date +%s)
+      - uses: actions/checkout@v2.3.4
+      - name: Build the Docker image
+        run: docker build . --file Dockerfile --tag yosoy-local:$(date +%s)

.github/workflows/docker-publish.yml

@@ -0,0 +1,52 @@
+name: Publish Docker image
+
+on:
+  push:
+    branches: [main]
+  release:
+    types: [published]
+
+jobs:
+  push_to_registries:
+    name: Push Docker image to Docker Hub and ghcr.io registries
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            lukasz/yosoy
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=edge
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/go.yml

@@ -1,25 +1,20 @@
 name: Go
 
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
+on: [push, pull_request]
 
 jobs:
-
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
 
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.15
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.16
 
-    - name: Build
-      run: go build -v ./...
+      - name: Build
+        run: go build -v ./...
 
-    - name: Test
-      run: go test -v ./...
+      - name: Test
+        run: go test -v ./...

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.15.7-alpine3.13 as builder
+FROM golang:1.17.0-alpine3.13 as builder
 
 LABEL maintainer="Łukasz Budnik lukasz.budnik@gmail.com"
 
@@ -6,7 +6,7 @@ LABEL maintainer="Łukasz Budnik lukasz.budnik@gmail.com"
 ADD . /go/yosoy
 RUN cd /go/yosoy && go build
 
-FROM alpine:3.13
+FROM alpine:3.14.1
 COPY --from=builder /go/yosoy/yosoy /bin
 
 # register entrypoint

README.md

@@ -1,4 +1,4 @@
-# yosoy
+# yosoy ![Go](https://github.com/lukaszbudnik/yosoy/workflows/Go/badge.svg) ![Docker](https://github.com/lukaszbudnik/yosoy/workflows/Docker%20Image%20CI/badge.svg)
 
 yosoy is a HTTP service for stubbing and prototyping distributed applications. It is a service which will introduce itself to the caller and print some useful information about its environment. "Yo soy" in español means "I am".
 
@@ -52,19 +52,19 @@ minikube start
 kubectl apply -f test/deployment.yaml
 # tunnel to it and copy the URL as $URL variable
 minikube service --url camarero
-# call it a few times
-curl $URL
-curl $URL
-curl $URL
-curl $URL
+# simulate some HTTP requests
+curl -H "Host: gateway.myapp.com" $URL/camarero/abc
+curl -H "Host: gateway.myapp.com" $URL/camarero/abc
+curl -H "Host: gateway.myapp.com" $URL/camarero/abc
+curl -H "Host: gateway.myapp.com" $URL/camarero/abc
 ```
 
 A sample response looks like this:
 
 ```json
 {
-  "host": "127.0.0.1:53366",
-  "requestUri": "/",
+  "host": "gateway.myapp.com",
+  "requestUri": "/camarero/abc",
   "remoteAddr": "172.17.0.1",
   "counter": 4,
   "headers": {

go.mod

@@ -1,6 +1,6 @@
 module github.com/lukaszbudnik/yosoy
 
-go 1.15
+go 1.16
 
 require (
 	github.com/gorilla/handlers v1.5.1

server.go

@@ -26,7 +26,19 @@ type response struct {
 var counter = 0
 var hostname = os.Getenv("HOSTNAME")
 
+func preflight(w http.ResponseWriter, req *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+	w.Header().Set("Access-Control-Allow-Methods", "*")
+	w.Header().Set("Access-Control-Allow-Headers", "*")
+	w.Header().Set("Access-Control-Allow-Credentials", "true")
+	w.Header().Set("Access-Control-Expose-Headers", "*")
+	w.Header().Set("Access-Control-Max-Age", "600")
+	w.WriteHeader(http.StatusOK)
+}
+
 func handler(w http.ResponseWriter, req *http.Request) {
+	w.Header().Set("Access-Control-Allow-Origin", "*")
+
 	showEnvs := os.Getenv("YOSOY_SHOW_ENVS")
 	showFiles := os.Getenv("YOSOY_SHOW_FILES")
 
@@ -80,7 +92,8 @@ func main() {
 	r := mux.NewRouter()
 
 	r.Handle("/favicon.ico", r.NotFoundHandler)
-	r.PathPrefix("/").HandlerFunc(handler)
+	r.PathPrefix("/").HandlerFunc(preflight).Methods(http.MethodOptions)
+	r.PathPrefix("/").HandlerFunc(handler).Methods(http.MethodGet, http.MethodPut, http.MethodPatch, http.MethodPost, http.MethodDelete, http.MethodConnect, http.MethodHead, http.MethodTrace)
 
 	loggingRouter := handlers.CombinedLoggingHandler(os.Stdout, r)
 	proxyRouter := handlers.ProxyHeaders(loggingRouter)

server_test.go

@@ -32,8 +32,12 @@ func TestHandler(t *testing.T) {
 	var response response
 	json.Unmarshal(rr.Body.Bytes(), &response)
 
+	// test response
 	assert.Equal(t, 1, response.Counter)
 	assert.Equal(t, "example.org", response.Host)
 	assert.NotEmpty(t, response.EnvVariables)
 	assert.NotEmpty(t, response.Files[".gitignore"])
+
+	// test cors
+	assert.Contains(t, rr.HeaderMap["Access-Control-Allow-Origin"], "*")
 }