removing consul from fileserver

Signed-off-by: Renee Chu <[email protected]>

Author: jrussett

cmd/file-server/config/config.go

@@ -10,10 +10,8 @@ import (
 )
 
 type FileServerConfig struct {
-	ServerAddress                   string `json:"server_address,omitempty"`
-	StaticDirectory                 string `json:"static_directory,omitempty"`
-	ConsulCluster                   string `json:"consul_cluster,omitempty"`
-	EnableConsulServiceRegistration bool   `json:"enable_consul_service_registration,omitempty"`
+	ServerAddress   string `json:"server_address,omitempty"`
+	StaticDirectory string `json:"static_directory,omitempty"`
 
 	HTTPSServerEnabled bool   `json:"https_server_enabled"`
 	HTTPSListenAddr    string `json:"https_listen_addr"`

cmd/file-server/config/config_test.go

@@ -19,8 +19,6 @@ var _ = Describe("Config", func() {
 		configData = `{
 			"server_address": "192.168.1.1:8080",
 			"static_directory": "/tmp/static",
-			"consul_cluster": "consul.example.com",
-			"enable_consul_service_registration": true,
 
 			"https_server_enabled": true,
 			"https_listen_addr": "192.168.1.1:8443",
@@ -53,10 +51,8 @@ var _ = Describe("Config", func() {
 		Expect(err).NotTo(HaveOccurred())
 
 		expectedConfig := config.FileServerConfig{
-			ServerAddress:                   "192.168.1.1:8080",
-			StaticDirectory:                 "/tmp/static",
-			ConsulCluster:                   "consul.example.com",
-			EnableConsulServiceRegistration: true,
+			ServerAddress:   "192.168.1.1:8080",
+			StaticDirectory: "/tmp/static",
 
 			HTTPSServerEnabled: true,
 			HTTPSListenAddr:    "192.168.1.1:8443",

cmd/file-server/main.go

@@ -3,24 +3,19 @@ package main
 import (
 	"crypto/tls"
 	"flag"
-	"net"
 	"net/http"
 	"os"
 	"runtime"
 	"strings"
 
-	"code.cloudfoundry.org/clock"
-	"code.cloudfoundry.org/consuladapter"
 	"code.cloudfoundry.org/debugserver"
 	loggingclient "code.cloudfoundry.org/diego-logging-client"
 	"code.cloudfoundry.org/fileserver/cmd/file-server/config"
 	"code.cloudfoundry.org/fileserver/handlers"
 	"code.cloudfoundry.org/go-loggregator/v8/runtimeemitter"
 	"code.cloudfoundry.org/lager"
 	"code.cloudfoundry.org/lager/lagerflags"
-	"code.cloudfoundry.org/locket"
 	"code.cloudfoundry.org/tlsconfig"
-	"github.com/hashicorp/consul/api"
 	"github.com/tedsuo/ifrit"
 	"github.com/tedsuo/ifrit/grouper"
 	"github.com/tedsuo/ifrit/http_server"
@@ -50,11 +45,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	consulClient, err := consuladapter.NewClientFromUrl(cfg.ConsulCluster)
-	if err != nil {
-		logger.Fatal("new-client-failed", err)
-	}
-
 	var tlsConfig *tls.Config
 	if cfg.HTTPSServerEnabled {
 		if len(cfg.HTTPSListenAddr) == 0 {
@@ -73,11 +63,6 @@ func main() {
 		{"file server", initializeServer(logger, cfg.StaticDirectory, cfg.ServerAddress, cfg.HTTPSListenAddr, tlsConfig)},
 	}
 
-	if cfg.EnableConsulServiceRegistration {
-		registrationRunner := initializeRegistrationRunner(logger, consulClient, cfg.ServerAddress, clock.NewClock())
-		members = append(members, grouper.Member{"registration-runner", registrationRunner})
-	}
-
 	if dbgAddr := debugserver.DebugAddress(flag.CommandLine); dbgAddr != "" {
 		members = append(grouper.Members{
 			{"debug-server", debugserver.Runner(dbgAddr, reconfigurableSink)},
@@ -140,24 +125,3 @@ func initializeServer(logger lager.Logger, staticDirectory, serverAddress, serve
 
 	return http_server.New(serverAddress, fileServerHandler)
 }
-
-func initializeRegistrationRunner(logger lager.Logger, consulClient consuladapter.Client, listenAddress string, clock clock.Clock) ifrit.Runner {
-	_, portString, err := net.SplitHostPort(listenAddress)
-	if err != nil {
-		logger.Fatal("failed-invalid-listen-address", err)
-	}
-	portNum, err := net.LookupPort("tcp", portString)
-	if err != nil {
-		logger.Fatal("failed-invalid-listen-port", err)
-	}
-
-	registration := &api.AgentServiceRegistration{
-		Name: "file-server",
-		Port: portNum,
-		Check: &api.AgentServiceCheck{
-			TTL: "20s",
-		},
-	}
-
-	return locket.NewRegistrationRunner(logger, registration, consulClient, locket.RetryInterval, clock)
-}

cmd/file-server/main_suite_test.go

@@ -1,17 +1,14 @@
 package main_test
 
 import (
-	"code.cloudfoundry.org/consuladapter/consulrunner"
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/config"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 
 	"testing"
 )
 
 var fileServerBinary string
-var consulRunner *consulrunner.ClusterRunner
 
 func TestFileServer(t *testing.T) {
 	RegisterFailHandler(Fail)
@@ -25,24 +22,9 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 }, func(fileServerPath []byte) {
 	fileServerBinary = string(fileServerPath)
 
-	consulRunner = consulrunner.NewClusterRunner(
-		consulrunner.ClusterRunnerConfig{
-			StartingPort: 9001 + config.GinkgoConfig.ParallelNode*consulrunner.PortOffsetLength,
-			NumNodes:     1,
-			Scheme:       "http",
-		},
-	)
-
-	consulRunner.Start()
-	consulRunner.WaitUntilReady()
 })
 
 var _ = SynchronizedAfterSuite(func() {
-	consulRunner.Stop()
 }, func() {
 	gexec.CleanupBuildArtifacts()
 })
-
-var _ = BeforeEach(func() {
-	consulRunner.Reset()
-})

cmd/file-server/main_test.go

@@ -16,7 +16,6 @@ import (
 	"code.cloudfoundry.org/lager/lagerflags"
 	"code.cloudfoundry.org/tlsconfig"
 	"code.cloudfoundry.org/tlsconfig/certtest"
-	"github.com/hashicorp/consul/api"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
@@ -70,7 +69,6 @@ var _ = Describe("File server", func() {
 					TimeFormat: lagerflags.FormatUnixEpoch,
 				},
 				StaticDirectory: servedDirectory,
-				ConsulCluster:   consulRunner.URL(),
 				ServerAddress:   fmt.Sprintf("localhost:%d", port),
 			}
 		})
@@ -101,45 +99,6 @@ var _ = Describe("File server", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(string(body)).To(Equal("hello"))
 		})
-
-		Context("when consul service registration is enabled", func() {
-			BeforeEach(func() {
-				cfg.EnableConsulServiceRegistration = true
-			})
-
-			It("registers itself with consul", func() {
-				services, err := consulRunner.NewClient().Agent().Services()
-				Expect(err).NotTo(HaveOccurred())
-				Expect(services).To(HaveKeyWithValue("file-server",
-					&api.AgentService{
-						Service: "file-server",
-						ID:      "file-server",
-						Port:    port,
-					}))
-			})
-
-			It("registers a TTL healthcheck", func() {
-				checks, err := consulRunner.NewClient().Agent().Checks()
-				Expect(err).NotTo(HaveOccurred())
-				Expect(checks).To(HaveKeyWithValue("service:file-server",
-					&api.AgentCheck{
-						Node:        "0",
-						CheckID:     "service:file-server",
-						Name:        "Service 'file-server' check",
-						Status:      "passing",
-						ServiceID:   "file-server",
-						ServiceName: "file-server",
-					}))
-			})
-		})
-
-		Context("when consul service registration is disabled", func() {
-			It("does not register itself with consul", func() {
-				services, err := consulRunner.NewClient().Agent().Services()
-				Expect(err).NotTo(HaveOccurred())
-				Expect(services).NotTo(HaveKey("file-server"))
-			})
-		})
 	})
 
 	Context("when HTTPS server is enabled", func() {
@@ -157,7 +116,6 @@ var _ = Describe("File server", func() {
 				},
 				HTTPSServerEnabled: true,
 				StaticDirectory:    servedDirectory,
-				ConsulCluster:      consulRunner.URL(),
 				ServerAddress:      fmt.Sprintf("localhost:%d", port),
 			}
 		})