From 9b1829ac97b185d0bcd9cbd81bee4651051469ea Mon Sep 17 00:00:00 2001
From: Dean <deanoren@gmail.com>
Date: Wed, 9 Nov 2022 18:01:02 +0100
Subject: [PATCH] Fix DSA instance struct, update tests

Co-authored-by: Dean Oren <deangili.oren@mail.schwarz>
---
 .../v1/data-services/instances/instances.go   | 20 +++++-----
 .../data-services/instances/instances_test.go | 40 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pkg/api/v1/data-services/instances/instances.go b/pkg/api/v1/data-services/instances/instances.go
index 600e93d5..66b753ba 100644
--- a/pkg/api/v1/data-services/instances/instances.go
+++ b/pkg/api/v1/data-services/instances/instances.go
@@ -41,16 +41,16 @@ type ListResponse struct {
 
 // Instance is a struct representing an instance
 type Instance struct {
-	InstanceID       string            `json:"instanceId,omitempty"`
-	Name             string            `json:"name,omitempty"`
-	PlanID           string            `json:"planId,omitempty"`
-	DashboardURL     string            `json:"dashboardUrl,omitempty"`
-	CFGUID           string            `json:"cfGuid,omitempty"`
-	CFSpaceGUID      string            `json:"cfSpaceGuid,omitempty"`
-	OrganizationGUID string            `json:"organizationGuid,omitempty"`
-	ImageURL         string            `json:"imageUrl,omitempty"`
-	Parameters       map[string]string `json:"parameters,omitempty"`
-	LastOperation    LastOperation     `json:"lastOperation,omitempty"`
+	InstanceID         string            `json:"instanceId,omitempty"`
+	Name               string            `json:"name,omitempty"`
+	PlanID             string            `json:"planId,omitempty"`
+	DashboardURL       string            `json:"dashboardUrl,omitempty"`
+	CFGUID             string            `json:"cfGuid,omitempty"`
+	CFSpaceGUID        string            `json:"cfSpaceGuid,omitempty"`
+	CFOrganizationGUID string            `json:"cfOrganizationGuid,omitempty"`
+	ImageURL           string            `json:"imageUrl,omitempty"`
+	Parameters         map[string]string `json:"parameters,omitempty"`
+	LastOperation      LastOperation     `json:"lastOperation,omitempty"`
 }
 
 // LastOperation is a struct representing instance last operation
diff --git a/pkg/api/v1/data-services/instances/instances_test.go b/pkg/api/v1/data-services/instances/instances_test.go
index 34947212..776ff123 100644
--- a/pkg/api/v1/data-services/instances/instances_test.go
+++ b/pkg/api/v1/data-services/instances/instances_test.go
@@ -37,7 +37,7 @@ const (
 			"dashboardUrl": "string",
 			"cfGuid": "string",
 			"cfSpaceGuid": "string",
-			"organizationGuid": "string",
+			"cfOrganizationGuid": "string",
 			"imageUrl": "string",
 			"parameters": {},
 			"lastOperation": {
@@ -80,15 +80,15 @@ func TestDSAInstancesService_List(t *testing.T) {
 		{"ok", args{context.Background(), projectID}, instances.ListResponse{
 			Instances: []instances.Instance{
 				{
-					InstanceID:       "string",
-					Name:             "string",
-					PlanID:           "string",
-					DashboardURL:     "string",
-					CFGUID:           "string",
-					CFSpaceGUID:      "string",
-					OrganizationGUID: "string",
-					ImageURL:         "string",
-					Parameters:       map[string]string{},
+					InstanceID:         "string",
+					Name:               "string",
+					PlanID:             "string",
+					DashboardURL:       "string",
+					CFGUID:             "string",
+					CFSpaceGUID:        "string",
+					CFOrganizationGUID: "string",
+					ImageURL:           "string",
+					Parameters:         map[string]string{},
 					LastOperation: instances.LastOperation{
 						Type:        "create",
 						State:       "in progress",
@@ -119,7 +119,7 @@ const get_response = `{
 	"dashboardUrl": "string",
 	"cfGuid": "string",
 	"cfSpaceGuid": "string",
-	"organizationGuid": "string",
+	"cfOrganizationGuid": "string",
 	"imageUrl": "string",
 	"parameters": {},
 	"lastOperation": {
@@ -163,15 +163,15 @@ func TestDSAInstancesService_Get(t *testing.T) {
 	}{
 		{"nil ctx", args{ctx: nil}, instances.GetResponse{}, true},
 		{"ok", args{context.Background(), projectID, "string"}, instances.GetResponse{
-			InstanceID:       "string",
-			Name:             "string",
-			PlanID:           "string",
-			DashboardURL:     "string",
-			CFGUID:           "string",
-			CFSpaceGUID:      "string",
-			OrganizationGUID: "string",
-			ImageURL:         "string",
-			Parameters:       map[string]string{},
+			InstanceID:         "string",
+			Name:               "string",
+			PlanID:             "string",
+			DashboardURL:       "string",
+			CFGUID:             "string",
+			CFSpaceGUID:        "string",
+			CFOrganizationGUID: "string",
+			ImageURL:           "string",
+			Parameters:         map[string]string{},
 			LastOperation: instances.LastOperation{
 				Type:        "create",
 				State:       "in progress",