From 8e8bbb3f56965eec5576b645248aa196f6ac0c9f Mon Sep 17 00:00:00 2001
From: jackgr <jackgr@google.com>
Date: Tue, 5 Apr 2016 13:35:12 -0700
Subject: [PATCH] Remove expandbird address and URL command line flags
---
cmd/manager/deployments.go | 10 +++++++---
cmd/manager/main.go | 4 ----
cmd/manager/router/context.go | 4 ----
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/cmd/manager/deployments.go b/cmd/manager/deployments.go
index e2702fb7a..318faec77 100644
--- a/cmd/manager/deployments.go
+++ b/cmd/manager/deployments.go
@@ -83,15 +83,19 @@ func setupDependencies(c *router.Context) error {
return nil
}
-const expanderPort = "8080"
-const deployerPort = "8080"
+const (
+ expanderName = "expander-service"
+ expanderPort = "8080"
+ expanderURL = "http://localhost:8081"
+ deployerPort = "8080"
+)
func newManager(c *router.Context) manager.Manager {
cfg := c.Config
service := repo.NewInmemRepoService()
cp := c.CredentialProvider
rp := repo.NewRepoProvider(service, repo.NewGCSRepoProvider(cp), cp)
- expander := manager.NewExpander(util.GetServiceURL(cfg.ExpanderURL, cfg.ExpanderName, expanderPort), rp)
+ expander := manager.NewExpander(util.GetServiceURL(expanderURL, expanderName, expanderPort), rp)
deployer := manager.NewDeployer(util.GetServiceURL(cfg.DeployerURL, cfg.DeployerName, deployerPort))
address := strings.TrimPrefix(util.GetServiceURL(cfg.MongoAddress, cfg.MongoName, cfg.MongoPort), "http://")
repository := createRepository(address)
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 7005b888c..d79c91996 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -31,8 +31,6 @@ import (
var (
port = flag.Int("port", 8080, "The port to listen on")
maxLength = flag.Int64("maxLength", 1024, "The maximum length (KB) of a template.")
- expanderName = flag.String("expander", "expandybird-service", "The DNS name of the expander service.")
- expanderURL = flag.String("expanderURL", "", "The URL for the expander service.")
deployerName = flag.String("deployer", "resourcifier-service", "The DNS name of the deployer service.")
deployerURL = flag.String("deployerURL", "", "The URL for the deployer service.")
credentialFile = flag.String("credentialFile", "", "Local file to use for credentials.")
@@ -73,8 +71,6 @@ func parseFlags() *router.Config {
return &router.Config{
Address: fmt.Sprintf(":%d", *port),
MaxTemplateLength: *maxLength,
- ExpanderName: *expanderName,
- ExpanderURL: *expanderURL,
DeployerName: *deployerName,
DeployerURL: *deployerURL,
CredentialFile: *credentialFile,
diff --git a/cmd/manager/router/context.go b/cmd/manager/router/context.go
index e7c6408d6..9a4ebe49f 100644
--- a/cmd/manager/router/context.go
+++ b/cmd/manager/router/context.go
@@ -31,10 +31,6 @@ type Config struct {
Address string
// MaxTemplateLength is the maximum length of a template.
MaxTemplateLength int64
- // ExpanderName is the DNS name of the expansion service.
- ExpanderName string
- // ExpanderURL is the expander service's URL.
- ExpanderURL string
// DeployerName is the deployer's DNS name
DeployerName string
// DeployerURL is the deployer's URL
--
GitLab