Rename ContentServiceUrl to ContentServiceAddress

Author: Andrew Farries

components/usage/pkg/server/server.go

@@ -29,7 +29,7 @@ type Config struct {
 
 	StripeCredentialsFile string `json:"stripeCredentialsFile,omitempty"`
 
-	ContentServiceUrl string `json:"contentServiceUrl,omitempty"`
+	ContentServiceAddress string `json:"contentServiceAddress,omitempty"`
 
 	Server *baseserver.Configuration `json:"server,omitempty"`
 }
@@ -74,8 +74,8 @@ func Start(cfg Config) error {
 	}
 
 	var contentService contentservice.Interface = &contentservice.NoOpClient{}
-	if cfg.ContentServiceUrl != "" {
-		contentService = contentservice.New(cfg.ContentServiceUrl)
+	if cfg.ContentServiceAddress != "" {
+		contentService = contentservice.New(cfg.ContentServiceAddress)
 	}
 
 	ctrl, err := controller.New(schedule, controller.NewUsageReconciler(conn, pricer, billingController, contentService))

install/installer/pkg/components/usage/configmap.go

@@ -20,8 +20,8 @@ import (
 
 func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 	cfg := server.Config{
-		ControllerSchedule: time.Hour.String(),
-		ContentServiceUrl:  fmt.Sprintf("%s:%d", content_service.Component, content_service.RPCPort),
+		ControllerSchedule:    time.Hour.String(),
+		ContentServiceAddress: fmt.Sprintf("%s:%d", content_service.Component, content_service.RPCPort),
 		Server: &baseserver.Configuration{
 			Services: baseserver.ServicesConfiguration{
 				GRPC: &baseserver.ServerConfiguration{

install/installer/pkg/components/usage/configmap_test.go

@@ -23,7 +23,7 @@ func TestConfigMap_ContainsSchedule(t *testing.T) {
 	require.JSONEq(t,
 		`{
        "controllerSchedule": "2m",
-       "contentServiceUrl": "content-service:8080",
+       "contentServiceAddress": "content-service:8080",
        "stripeCredentialsFile": "stripe-secret/apikeys",
        "server": {
          "services": {