main.go clearer, update license headers

Author: mister-ken

Justfile

@@ -16,14 +16,17 @@ version:
 [group('k8s')]
 build: clean
    @echo ">> running $0"
-   docker build --tag k8s-vault-client . 
-   kubectl get  secret vault-auth-secret -o json | jq -r ".data.token" | base64 --decode > token
+   docker build -t ghcr.io/hashicorp-education/learn-vault-golang-sdk/vault-sdk-go-app:latest .
 
 [group('k8s')]
 deploy-k8s:
    @echo ">> running $0"
-   minikube image load docker.io/library/k8s-vault-client:latest
+   ./vault-setup.sh
+   kubectl get  secret vault-auth-secret -o json | jq -r ".data.token" | base64 --decode > token
+   minikube image load ghcr.io/hashicorp-education/learn-vault-golang-sdk/vault-sdk-go-app:latest
+   sleep 5
    kubectl apply -f manifests/go-app.yaml
+
    echo "kubectl port-forward pod/vault-client 8080:8080"
 
 [group('k8s')]
@@ -52,8 +55,15 @@ test-k8s:
 clean:
    @echo ">> running $0"
    kubectl delete -f go-app.yaml || true
-   kubectl apply -f vault-auth-service-account.yaml || true
-   kubectl apply -f vault-auth-secret.yaml || true
+   kubectl delete -f vault-auth-service-account.yaml || true
+   kubectl delete -f vault-auth-secret.yaml || true
    minikube image rm ghcr.io/hashicorp-education/learn-vault-golang-sdk/vault-sdk-go-app:latest || true
    docker stop $(docker ps -aq --filter name=reference=ghcr.io/hashicorp-education/learn-vault-golang-sdk/vault-sdk-go-app) || true
-   docker image rm $(docker image ls --filter "reference=ghcr.io/hashicorp-education/learn-vault-golang-sdk/vault-sdk-go-app" --format "{{.ID}}") || true
+   docker image rm $(docker image ls --filter "reference=ghcr.io/hashicorp-education/learn-vault-golang-sdk/vault-sdk-go-app" --format {{"{{.ID}}/"}}) || true
+
+[group('k8s')]
+clean-images-k8s:
+   @echo ">> running $0"
+   minikube image rm ghcr.io/hashicorp-education/learn-vault-golang-sdk/vault-sdk-go-app:latest || true
+   # docker image ls --filter "reference=ghcr.io/hashicorp-education/learn-vault-golang-sdk/vault-sdk-go-app" --format \"{{{{.ID}}\"
+   docker image rm $(docker image ls --filter "reference=ghcr.io/hashicorp-education/learn-vault-golang-sdk/vault-sdk-go-app" --format "{{{{.ID}}") || true

main.go

@@ -54,6 +54,7 @@ func main() {
 
 	// set up Gin router
 	router := gin.Default()
+	router.SetTrustedProxies([]string{"127.0.0.1", "192.168.1.2", "10.0.0.0/8"})
 
 	// using the token returned from Vault get secret from the default
 	// mount path for KV v2 secret
@@ -83,9 +84,10 @@ func main() {
 	// Run Gin at the default port of 8080. The application will be accessible at http://localhost:8080 when port forwarding is set up.
 	router.GET("/", func(c *gin.Context) {
 		c.JSON(200, gin.H{
-			"message": value,
+			"access_key":        value,
+			"secret_access_key": pass,
 		})
 	})
 
-	router.Run()
+	router.Run(":8080")
 }

manifests/go-app.yaml

@@ -1,9 +1,6 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: vault-auth
-  namespace: default
----
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
 apiVersion: v1
 kind: Pod
 metadata:

manifests/vault-auth-secret.yaml

@@ -1,6 +1,12 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: vault-auth
+  namespace: default
+---
 apiVersion: v1
 kind: Secret
 metadata: