ConcreteRegistry -> HTTPRegistry

Signed-off-by: Maria Shaldibina <[email protected]>
bingosummer · Oct 21, 2014 · 888c0f2 · 888c0f2
1 parent 29f19f0
commit 888c0f2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/infrastructure/aws_infrastructure.go b/infrastructure/aws_infrastructure.go
@@ -37,7 +37,7 @@ func NewAwsInfrastructure(
 }
 
 func NewAwsRegistry(metadataService MetadataService) Registry {
-	return NewConcreteRegistry(metadataService, false)
+	return NewHTTPRegistry(metadataService, false)
 }
 
 func (inf awsInfrastructure) GetDevicePathResolver() boshdpresolv.DevicePathResolver {

diff --git a/infrastructure/aws_infrastructure_test.go b/infrastructure/aws_infrastructure_test.go
@@ -35,7 +35,7 @@ func init() {
 
 		Describe("NewAwsRegistry", func() {
 			It("returns concrete registry with useServerNameAsID set to false", func() {
-				expectedRegistry := NewConcreteRegistry(metadataService, false)
+				expectedRegistry := NewHTTPRegistry(metadataService, false)
 				Expect(NewAwsRegistry(metadataService)).To(Equal(expectedRegistry))
 			})
 		})

diff --git a/infrastructure/concrete_registry.go → infrastructure/http_registry.go b/infrastructure/concrete_registry.go → infrastructure/http_registry.go
@@ -10,16 +10,16 @@ import (
 	boshsettings "github.com/cloudfoundry/bosh-agent/settings"
 )
 
-type concreteRegistry struct {
+type httpRegistry struct {
 	metadataService   MetadataService
 	useServerNameAsID bool
 }
 
-func NewConcreteRegistry(
+func NewHTTPRegistry(
 	metadataService MetadataService,
 	useServerNameAsID bool,
-) concreteRegistry {
-	return concreteRegistry{
+) httpRegistry {
+	return httpRegistry{
 		metadataService:   metadataService,
 		useServerNameAsID: useServerNameAsID,
 	}
@@ -29,7 +29,7 @@ type settingsWrapperType struct {
 	Settings string
 }
 
-func (r concreteRegistry) GetSettings() (boshsettings.Settings, error) {
+func (r httpRegistry) GetSettings() (boshsettings.Settings, error) {
 	var settings boshsettings.Settings
 
 	var identifier string

diff --git a/infrastructure/concrete_registry_test.go → infrastructure/http_registry_test.go b/infrastructure/concrete_registry_test.go → infrastructure/http_registry_test.go
@@ -15,15 +15,15 @@ import (
 	boshsettings "github.com/cloudfoundry/bosh-agent/settings"
 )
 
-var _ = Describe("concreteRegistry", func() {
+var _ = Describe("httpRegistry", func() {
 	var (
 		metadataService *fakeinf.FakeMetadataService
 		registry        Registry
 	)
 
 	BeforeEach(func() {
 		metadataService = &fakeinf.FakeMetadataService{}
-		registry = NewConcreteRegistry(metadataService, false)
+		registry = NewHTTPRegistry(metadataService, false)
 	})
 
 	Describe("GetSettings", func() {
@@ -51,7 +51,7 @@ var _ = Describe("concreteRegistry", func() {
 
 		Context("when registry is configured to not use server name as id", func() {
 			BeforeEach(func() {
-				registry = NewConcreteRegistry(metadataService, false)
+				registry = NewHTTPRegistry(metadataService, false)
 				metadataService.InstanceID = "fake-identifier"
 				metadataService.RegistryEndpoint = ts.URL
 			})
@@ -213,7 +213,7 @@ var _ = Describe("concreteRegistry", func() {
 
 		Context("when registry is configured to use server name as id", func() {
 			BeforeEach(func() {
-				registry = NewConcreteRegistry(metadataService, true)
+				registry = NewHTTPRegistry(metadataService, true)
 				metadataService.ServerName = "fake-identifier"
 				metadataService.RegistryEndpoint = ts.URL
 			})

diff --git a/infrastructure/openstack_infrastructure.go b/infrastructure/openstack_infrastructure.go
@@ -36,7 +36,7 @@ func NewOpenstackInfrastructure(
 }
 
 func NewOpenstackRegistry(metadataService MetadataService) Registry {
-	return NewConcreteRegistry(metadataService, true)
+	return NewHTTPRegistry(metadataService, true)
 }
 
 func (inf openstackInfrastructure) GetDevicePathResolver() boshdpresolv.DevicePathResolver {

diff --git a/infrastructure/openstack_infrastructure_test.go b/infrastructure/openstack_infrastructure_test.go
@@ -36,7 +36,7 @@ func init() {
 
 		Describe("NewOpenstackRegistry", func() {
 			It("returns concrete registry with useServerNameAsID set to true", func() {
-				expectedRegistry := NewConcreteRegistry(metadataService, true)
+				expectedRegistry := NewHTTPRegistry(metadataService, true)
 				Expect(NewOpenstackRegistry(metadataService)).To(Equal(expectedRegistry))
 			})
 		})