From 3a8f5a9fb2076416fb23a4c846a8233a66478450 Mon Sep 17 00:00:00 2001 From: Winna Bridgewater Date: Wed, 21 Aug 2019 13:42:24 +0100 Subject: [PATCH] Add Description to MaintenanceInfo definition Maintenance Info description should be supported by ODB [#167808805] --- domain/maintenance_info.go | 7 ++-- domain/maintenance_info_test.go | 61 +++++++++++++++++++-------------- domain/service_catalog_test.go | 8 +++-- 3 files changed, 44 insertions(+), 32 deletions(-) diff --git a/domain/maintenance_info.go b/domain/maintenance_info.go index a8502a81..ac7bc332 100644 --- a/domain/maintenance_info.go +++ b/domain/maintenance_info.go @@ -3,9 +3,10 @@ package domain import "reflect" type MaintenanceInfo struct { - Public map[string]string `json:"public,omitempty"` - Private string `json:"private,omitempty"` - Version string `json:"version,omitempty"` + Public map[string]string `json:"public,omitempty"` + Private string `json:"private,omitempty"` + Version string `json:"version,omitempty"` + Description string `json:"description,omitempty"` } func (m *MaintenanceInfo) Equals(input MaintenanceInfo) bool { diff --git a/domain/maintenance_info_test.go b/domain/maintenance_info_test.go index d3351f23..6150ac89 100644 --- a/domain/maintenance_info_test.go +++ b/domain/maintenance_info_test.go @@ -28,45 +28,52 @@ var _ = Describe("MaintenanceInfo", func() { Entry( "one extra property is added", domain.MaintenanceInfo{ - Public: map[string]string{"foo": "bar"}, - Private: "test", + Public: map[string]string{"foo": "bar"}, + Private: "test", + Description: "test", }, domain.MaintenanceInfo{ - Public: map[string]string{"foo": "bar"}, - Private: "test", - Version: "1.2.3", + Public: map[string]string{"foo": "bar"}, + Private: "test", + Version: "1.2.3", + Description: "test", }), Entry( "one property is different", domain.MaintenanceInfo{ - Public: map[string]string{"foo": "bar"}, - Private: "test", - Version: "1.2.3", + Public: map[string]string{"foo": "bar"}, + Private: "test", + Version: "1.2.3", + Description: "test-different", }, domain.MaintenanceInfo{ - Public: map[string]string{"foo": "bar"}, - Private: "test-not-the-same", - Version: "1.2.3", + Public: map[string]string{"foo": "bar"}, + Private: "test-not-the-same", + Version: "1.2.3", + Description: "test", }), Entry( "all properties are missing in one of the objects", domain.MaintenanceInfo{ - Public: map[string]string{"foo": "bar"}, - Private: "test", - Version: "1.2.3", + Public: map[string]string{"foo": "bar"}, + Private: "test", + Version: "1.2.3", + Description: "test", }, domain.MaintenanceInfo{}), Entry( "all properties are defined but different", domain.MaintenanceInfo{ - Public: map[string]string{"foo": "bar"}, - Private: "test", - Version: "1.2.3", + Public: map[string]string{"foo": "bar"}, + Private: "test", + Version: "1.2.3", + Description: "test", }, domain.MaintenanceInfo{ - Public: map[string]string{"bar": "foo"}, - Private: "test-not-the-same", - Version: "8.9.6-rc3", + Public: map[string]string{"bar": "foo"}, + Private: "test-not-the-same", + Version: "8.9.6-rc3", + Description: "test-different", }), ) @@ -78,14 +85,16 @@ var _ = Describe("MaintenanceInfo", func() { Entry( "all properties are the same", domain.MaintenanceInfo{ - Public: map[string]string{"foo": "bar"}, - Private: "test", - Version: "1.2.3", + Public: map[string]string{"foo": "bar"}, + Private: "test", + Version: "1.2.3", + Description: "test", }, domain.MaintenanceInfo{ - Public: map[string]string{"foo": "bar"}, - Private: "test", - Version: "1.2.3", + Public: map[string]string{"foo": "bar"}, + Private: "test", + Version: "1.2.3", + Description: "test", }), Entry( "all properties are empty", diff --git a/domain/service_catalog_test.go b/domain/service_catalog_test.go index ea3c58b5..eaf546ba 100644 --- a/domain/service_catalog_test.go +++ b/domain/service_catalog_test.go @@ -108,8 +108,9 @@ var _ = Describe("ServiceCatalog", func() { Public: map[string]string{ "name": "foo", }, - Private: "someprivatehashedvalue", - Version: "8.1.0", + Private: "someprivatehashedvalue", + Version: "8.1.0", + Description: "test", }, } jsonString := `{ @@ -127,7 +128,8 @@ var _ = Describe("ServiceCatalog", func() { "name": "foo" }, "private": "someprivatehashedvalue", - "version": "8.1.0" + "version": "8.1.0", + "description": "test" } }`