Merge branch 'master' into deployments-check-k8s-auth

fabric8-services · Aug 2, 2018 · d74c13e · d74c13e
2 parents fcbaf55 + 6687a95
commit d74c13e
Show file tree

Hide file tree

Showing 66 changed files with 425 additions and 423 deletions.
diff --git a/controller/area.go b/controller/area.go
@@ -259,21 +259,19 @@ func ConvertArea(db application.DB, request *http.Request, ar area.Area, options
 	return i
 }
 
-// ConvertAreaSimple converts a simple area ID into a Generic Reletionship
-func ConvertAreaSimple(request *http.Request, id interface{}) *app.GenericData {
+// ConvertAreaSimple converts a simple area ID into a Generic Relationship
+// data+links element
+func ConvertAreaSimple(request *http.Request, id interface{}) (*app.GenericData, *app.GenericLinks) {
 	t := area.APIStringTypeAreas
 	i := fmt.Sprint(id)
-	return &app.GenericData{
-		Type:  &t,
-		ID:    &i,
-		Links: createAreaLinks(request, id),
+	data := &app.GenericData{
+		Type: &t,
+		ID:   &i,
 	}
-}
-
-func createAreaLinks(request *http.Request, id interface{}) *app.GenericLinks {
-	relatedURL := rest.AbsoluteURL(request, app.AreaHref(id))
-	return &app.GenericLinks{
+	relatedURL := rest.AbsoluteURL(request, app.AreaHref(i))
+	links := &app.GenericLinks{
 		Self:    &relatedURL,
 		Related: &relatedURL,
 	}
+	return data, links
 }
diff --git a/controller/iteration.go b/controller/iteration.go
@@ -515,23 +515,21 @@ func ConvertIteration(request *http.Request, itr iteration.Iteration, additional
 	return i
 }
 
-// ConvertIterationSimple converts a simple Iteration ID into a Generic Reletionship
-func ConvertIterationSimple(request *http.Request, id interface{}) *app.GenericData {
+// ConvertIterationSimple converts a simple Iteration ID into a Generic
+// Relationship data+links element
+func ConvertIterationSimple(request *http.Request, id interface{}) (*app.GenericData, *app.GenericLinks) {
 	t := iteration.APIStringTypeIteration
 	i := fmt.Sprint(id)
-	return &app.GenericData{
-		Type:  &t,
-		ID:    &i,
-		Links: createIterationLinks(request, id),
+	data := &app.GenericData{
+		Type: &t,
+		ID:   &i,
 	}
-}
-
-func createIterationLinks(request *http.Request, id interface{}) *app.GenericLinks {
-	relatedURL := rest.AbsoluteURL(request, app.IterationHref(id))
-	return &app.GenericLinks{
+	relatedURL := rest.AbsoluteURL(request, app.IterationHref(i))
+	links := &app.GenericLinks{
 		Self:    &relatedURL,
 		Related: &relatedURL,
 	}
+	return data, links
 }
 
 // iterationIDMap contains a map that will hold iteration's ID as its key

diff --git a/controller/label.go b/controller/label.go
@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"fmt"
 	"net/http"
 	"strings"
 
@@ -152,7 +153,7 @@ func ConvertLabels(appl application.Application, request *http.Request, labels [
 	return ls
 }
 
-// ConvertLabelsSimple converts an array of Label IDs into a Generic Reletionship List
+// ConvertLabelsSimple converts an array of Label IDs into a Generic Relationship List
 func ConvertLabelsSimple(request *http.Request, labelIDs []interface{}) []*app.GenericData {
 	ops := make([]*app.GenericData, 0, len(labelIDs))
 	for _, labelID := range labelIDs {
@@ -161,10 +162,10 @@ func ConvertLabelsSimple(request *http.Request, labelIDs []interface{}) []*app.G
 	return ops
 }
 
-// ConvertLabelSimple converts a Label ID into a Generic Reletionship
+// ConvertLabelSimple converts a Label ID into a Generic Relationship
 func ConvertLabelSimple(request *http.Request, labelID interface{}) *app.GenericData {
 	t := label.APIStringTypeLabels
-	i := labelID.(string)
+	i := fmt.Sprint(labelID)
 	return &app.GenericData{
 		Type: &t,
 		ID:   &i,

diff --git a/controller/test-files/event/list/ok-area.res.payload.golden.json b/controller/test-files/event/list/ok-area.res.payload.golden.json
@@ -12,20 +12,17 @@
         "modifier": {
           "data": {
             "id": "00000000-0000-0000-0000-000000000002",
-            "links": {
-              "related": "http:///api/users/00000000-0000-0000-0000-000000000002"
-            },
-            "type": "identities"
+            "type": "users"
+          },
+          "links": {
+            "related": "http:///api/users/00000000-0000-0000-0000-000000000002",
+            "self": "http:///api/users/00000000-0000-0000-0000-000000000002"
           }
         },
         "newValue": {
           "data": [
             {
               "id": "00000000-0000-0000-0000-000000000003",
-              "links": {
-                "related": "http:///api/areas/00000000-0000-0000-0000-000000000003",
-                "self": "http:///api/areas/00000000-0000-0000-0000-000000000003"
-              },
               "type": "areas"
             }
           ]
@@ -34,10 +31,6 @@
           "data": [
             {
               "id": "",
-              "links": {
-                "related": "http:///api/areas/",
-                "self": "http:///api/areas/"
-              },
               "type": "areas"
             }
           ]

diff --git a/controller/test-files/event/list/ok-assignees.res.payload.golden.json b/controller/test-files/event/list/ok-assignees.res.payload.golden.json
@@ -12,20 +12,17 @@
         "modifier": {
           "data": {
             "id": "00000000-0000-0000-0000-000000000002",
-            "links": {
-              "related": "http:///api/users/00000000-0000-0000-0000-000000000002"
-            },
-            "type": "identities"
+            "type": "users"
+          },
+          "links": {
+            "related": "http:///api/users/00000000-0000-0000-0000-000000000002",
+            "self": "http:///api/users/00000000-0000-0000-0000-000000000002"
           }
         },
         "newValue": {
           "data": [
             {
               "id": "00000000-0000-0000-0000-000000000002",
-              "links": {
-                "related": "http:///api/users/00000000-0000-0000-0000-000000000002",
-                "self": "http:///api/users/00000000-0000-0000-0000-000000000002"
-              },
               "type": "users"
             }
           ]

diff --git a/controller/test-files/event/list/ok-description.res.payload.golden.json b/controller/test-files/event/list/ok-description.res.payload.golden.json
@@ -12,10 +12,11 @@
         "modifier": {
           "data": {
             "id": "00000000-0000-0000-0000-000000000002",
-            "links": {
-              "related": "http:///api/users/00000000-0000-0000-0000-000000000002"
-            },
-            "type": "identities"
+            "type": "users"
+          },
+          "links": {
+            "related": "http:///api/users/00000000-0000-0000-0000-000000000002",
+            "self": "http:///api/users/00000000-0000-0000-0000-000000000002"
           }
         }
       },

diff --git a/controller/test-files/event/list/ok-iteration.res.payload.golden.json b/controller/test-files/event/list/ok-iteration.res.payload.golden.json
@@ -12,20 +12,17 @@
         "modifier": {
           "data": {
             "id": "00000000-0000-0000-0000-000000000002",
-            "links": {
-              "related": "http:///api/users/00000000-0000-0000-0000-000000000002"
-            },
-            "type": "identities"
+            "type": "users"
+          },
+          "links": {
+            "related": "http:///api/users/00000000-0000-0000-0000-000000000002",
+            "self": "http:///api/users/00000000-0000-0000-0000-000000000002"
           }
         },
         "newValue": {
           "data": [
             {
               "id": "00000000-0000-0000-0000-000000000003",
-              "links": {
-                "related": "http:///api/iterations/00000000-0000-0000-0000-000000000003",
-                "self": "http:///api/iterations/00000000-0000-0000-0000-000000000003"
-              },
               "type": "iterations"
             }
           ]
@@ -34,10 +31,6 @@
           "data": [
             {
               "id": "",
-              "links": {
-                "related": "http:///api/iterations/",
-                "self": "http:///api/iterations/"
-              },
               "type": "iterations"
             }
           ]

diff --git a/controller/test-files/event/list/ok-kindFloat.res.payload.golden.json b/controller/test-files/event/list/ok-kindFloat.res.payload.golden.json
@@ -12,10 +12,11 @@
         "modifier": {
           "data": {
             "id": "00000000-0000-0000-0000-000000000002",
-            "links": {
-              "related": "http:///api/users/00000000-0000-0000-0000-000000000002"
-            },
-            "type": "identities"
+            "type": "users"
+          },
+          "links": {
+            "related": "http:///api/users/00000000-0000-0000-0000-000000000002",
+            "self": "http:///api/users/00000000-0000-0000-0000-000000000002"
           }
         }
       },

diff --git a/controller/test-files/event/list/ok-kindInt.res.payload.golden.json b/controller/test-files/event/list/ok-kindInt.res.payload.golden.json
@@ -12,10 +12,11 @@
         "modifier": {
           "data": {
             "id": "00000000-0000-0000-0000-000000000002",
-            "links": {
-              "related": "http:///api/users/00000000-0000-0000-0000-000000000002"
-            },
-            "type": "identities"
+            "type": "users"
+          },
+          "links": {
+            "related": "http:///api/users/00000000-0000-0000-0000-000000000002",
+            "self": "http:///api/users/00000000-0000-0000-0000-000000000002"
           }
         }
       },

diff --git a/controller/test-files/event/list/ok-labels.res.payload.golden.json b/controller/test-files/event/list/ok-labels.res.payload.golden.json
@@ -12,10 +12,11 @@
         "modifier": {
           "data": {
             "id": "00000000-0000-0000-0000-000000000002",
-            "links": {
-              "related": "http:///api/users/00000000-0000-0000-0000-000000000002"
-            },
-            "type": "identities"
+            "type": "users"
+          },
+          "links": {
+            "related": "http:///api/users/00000000-0000-0000-0000-000000000002",
+            "self": "http:///api/users/00000000-0000-0000-0000-000000000002"
           }
         },
         "newValue": {
@@ -28,16 +29,9 @@
               "id": "00000000-0000-0000-0000-000000000004",
               "type": "labels"
             }
-          ],
-          "links": {
-            "related": "http:///api/workitems/00000000-0000-0000-0000-000000000005/labels"
-          }
+          ]
         },
-        "oldValue": {
-          "links": {
-            "related": "http:///api/workitems/00000000-0000-0000-0000-000000000005/labels"
-          }
-        }
+        "oldValue": {}
       },
       "type": "events"
     }

diff --git a/controller/test-files/event/list/ok-state.res.payload.golden.json b/controller/test-files/event/list/ok-state.res.payload.golden.json
@@ -12,10 +12,11 @@
         "modifier": {
           "data": {
             "id": "00000000-0000-0000-0000-000000000002",
-            "links": {
-              "related": "http:///api/users/00000000-0000-0000-0000-000000000002"
-            },
-            "type": "identities"
+            "type": "users"
+          },
+          "links": {
+            "related": "http:///api/users/00000000-0000-0000-0000-000000000002",
+            "self": "http:///api/users/00000000-0000-0000-0000-000000000002"
           }
         }
       },

diff --git a/controller/test-files/event/list/ok-title.res.payload.golden.json b/controller/test-files/event/list/ok-title.res.payload.golden.json
@@ -12,10 +12,11 @@
         "modifier": {
           "data": {
             "id": "00000000-0000-0000-0000-000000000003",
-            "links": {
-              "related": "http:///api/users/00000000-0000-0000-0000-000000000003"
-            },
-            "type": "identities"
+            "type": "users"
+          },
+          "links": {
+            "related": "http:///api/users/00000000-0000-0000-0000-000000000003",
+            "self": "http:///api/users/00000000-0000-0000-0000-000000000003"
           }
         }
       },

diff --git a/...oller/test-files/search/show/filter_assignee_null_show_after_update_work_item.golden.json b/...oller/test-files/search/show/filter_assignee_null_show_after_update_work_item.golden.json
@@ -20,11 +20,11 @@
       "area": {
         "data": {
           "id": "00000000-0000-0000-0000-000000000002",
-          "links": {
-            "related": "http:///api/areas/00000000-0000-0000-0000-000000000002",
-            "self": "http:///api/areas/00000000-0000-0000-0000-000000000002"
-          },
           "type": "areas"
+        },
+        "links": {
+          "related": "http:///api/areas/00000000-0000-0000-0000-000000000002",
+          "self": "http:///api/areas/00000000-0000-0000-0000-000000000002"
         }
       },
       "assignees": {},
@@ -54,11 +54,11 @@
       "creator": {
         "data": {
           "id": "00000000-0000-0000-0000-000000000004",
-          "links": {
-            "related": "http:///api/users/00000000-0000-0000-0000-000000000004",
-            "self": "http:///api/users/00000000-0000-0000-0000-000000000004"
-          },
           "type": "users"
+        },
+        "links": {
+          "related": "http:///api/users/00000000-0000-0000-0000-000000000004",
+          "self": "http:///api/users/00000000-0000-0000-0000-000000000004"
         }
       },
       "events": {
@@ -69,11 +69,11 @@
       "iteration": {
         "data": {
           "id": "00000000-0000-0000-0000-000000000005",
-          "links": {
-            "related": "http:///api/iterations/00000000-0000-0000-0000-000000000005",
-            "self": "http:///api/iterations/00000000-0000-0000-0000-000000000005"
-          },
           "type": "iterations"
+        },
+        "links": {
+          "related": "http:///api/iterations/00000000-0000-0000-0000-000000000005",
+          "self": "http:///api/iterations/00000000-0000-0000-0000-000000000005"
         }
       },
       "labels": {