refactor client to be a generic proxy

client/cmd.go

@@ -1,4 +1,4 @@
-package gkeclient
+package client
 
 import (
 	"log"
@@ -7,8 +7,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// NewGKEClientCmd create a gke client command
-func NewGKEClientCmd() *cobra.Command {
+// NewClientCmd create a gke client command
+func NewClientCmd() *cobra.Command {
 	c := Proxy{
 		RootCommand: cmd.RootCommand{
 			Command: cobra.Command{

client/load_certificate.go

@@ -1,4 +1,4 @@
-package gkeclient
+package client
 
 import (
 	"crypto/tls"

client/proxy.go

@@ -1,4 +1,4 @@
-package gkeclient
+package client
 
 import (
 	"context"

client/rewrite_request_url.go

@@ -1,4 +1,4 @@
-package gkeclient
+package client
 
 import (
 	"net/http"

cmd/generate_certificate.go

@@ -15,7 +15,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// GeneratedCertificate command
+// GenerateCertificate represents the command to generate a certificate
 type GenerateCertificate struct {
 	RootCommand
 	DNSName string

main.go

@@ -4,7 +4,7 @@ import (
 	"log"
 
 	"github.com/binxio/simple-iap-proxy/cmd"
-	"github.com/binxio/simple-iap-proxy/gkeclient"
+	"github.com/binxio/simple-iap-proxy/client"
 	"github.com/binxio/simple-iap-proxy/gkeserver"
 	"github.com/spf13/cobra"
 )
@@ -24,7 +24,7 @@ is run inside the VPC.
 	}
 	c.AddPersistentFlags()
 	c.AddCommand(cmd.NewGenerateCertificateCmd())
-	c.AddCommand(gkeclient.NewGKEClientCmd())
+	c.AddCommand(client.NewClientCmd())
 	c.AddCommand(gkeserver.NewGKEServerCmd())
 	return &c
 }

terraform/iap-proxy.service

@@ -5,7 +5,7 @@ After=docker.service network-online.target
 
 
 [Service]
-Environment="IMAGE=gcr.io/binx-io-public/simple-iap-proxy:0.4.1"
+Environment="IMAGE=gcr.io/binx-io-public/simple-iap-proxy:0.5.1"
 
 ExecStartPre=ctr images pull ${IMAGE}
 

terraform/main.tf

@@ -203,8 +203,8 @@ locals {
   cloud_config = {
     runcmd = [
       "c_rehash > /dev/null",
-      "iptables -I INPUT -p tcp -j ACCEPT",
-      "i6ptables -I INPUT -p tcp -j ACCEPT",
+      "iptables -I INPUT -p tcp -j ACCEPT --dport 8443",
+      "i6ptables -I INPUT -p tcp -j ACCEPT --dport 8443",
       "systemctl daemon-reload",
       "systemctl enable --now iap-proxy.service"
     ]

terraform/output.tf

@@ -53,12 +53,13 @@ EOF
 
 output "iap_proxy_command" {
   value = <<EOF
-simple-iap-proxy gke-client \
+simple-iap-proxy client \
   --target-url ${local.exports.target-url} \
   --iap-audience ${local.exports.audience} \
   --service-account ${local.exports.service-account} \
   --key-file server.key \
-  --certificate-file server.crt
+  --certificate-file server.crt \
+  --to-gke
 EOF
 }