feat(kuma-cp) exposing creationTime and modificationTime via API (#677)

kumahq · Apr 27, 2020 · 7aa8726 · 7aa8726
1 parent 161878d
commit 7aa8726
Show file tree

Hide file tree

Showing 74 changed files with 361 additions and 157 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # CHANGELOG
 
 ## master
+* feat: expose CreationTime and modificationTime
+  [#677](https://github.com/Kong/kuma/pull/677)
 * feat: pagination in kumactl
   [#690](https://github.com/Kong/kuma/pull/690)
 * feat: secret management API

diff --git a/app/kumactl/cmd/apply/apply_test.go b/app/kumactl/cmd/apply/apply_test.go
@@ -38,7 +38,6 @@ var _ = Describe("kumactl apply", func() {
 	var rootCtx *kumactl_cmd.RootContext
 	var rootCmd *cobra.Command
 	var store core_store.ResourceStore
-
 	BeforeEach(func() {
 		rootCtx = &kumactl_cmd.RootContext{
 			Runtime: kumactl_cmd.RootRuntime{
@@ -374,7 +373,9 @@ var _ = Describe("kumactl apply", func() {
 
 		// then
 		Expect(buf.String()).To(Equal(
-			`mesh: default
+			`creationTime: "1970-01-01T05:30:00+05:30"
+mesh: default
+modificationTime: "1970-01-01T05:30:00+05:30"
 name: sample
 networking:
   address: 2.2.2.2

diff --git a/app/kumactl/cmd/get/get_dataplanes_test.go b/app/kumactl/cmd/get/get_dataplanes_test.go
@@ -30,8 +30,8 @@ import (
 var _ = Describe("kumactl get dataplanes", func() {
 
 	var dataplanes []*mesh_core.DataplaneResource
-
 	BeforeEach(func() {
+		// setup
 		dataplanes = []*mesh_core.DataplaneResource{
 			{
 				Meta: &test_model.ResourceMeta{

diff --git a/app/kumactl/cmd/get/get_fault_injections_test.go b/app/kumactl/cmd/get/get_fault_injections_test.go
@@ -112,7 +112,6 @@ var _ = Describe("kumactl get fault-injections", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
-
 		BeforeEach(func() {
 			// setup
 			rootCtx = &kumactl_cmd.RootContext{

diff --git a/app/kumactl/cmd/get/get_healthchecks_test.go b/app/kumactl/cmd/get/get_healthchecks_test.go
@@ -29,7 +29,6 @@ import (
 var _ = Describe("kumactl get healthchecks", func() {
 
 	var sampleHealthChecks []*mesh_core.HealthCheckResource
-
 	BeforeEach(func() {
 		sampleHealthChecks = []*mesh_core.HealthCheckResource{
 			{
@@ -62,10 +61,8 @@ var _ = Describe("kumactl get healthchecks", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
-
 		BeforeEach(func() {
 			// setup
-
 			rootCtx = &kumactl_cmd.RootContext{
 				Runtime: kumactl_cmd.RootRuntime{
 					NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) {

diff --git a/app/kumactl/cmd/get/get_meshes_test.go b/app/kumactl/cmd/get/get_meshes_test.go
@@ -158,7 +158,6 @@ var _ = Describe("kumactl get meshes", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
-
 		BeforeEach(func() {
 			// setup
 			rootCtx = &kumactl_cmd.RootContext{

diff --git a/app/kumactl/cmd/get/get_proxytemplates_test.go b/app/kumactl/cmd/get/get_proxytemplates_test.go
@@ -60,10 +60,8 @@ var _ = Describe("kumactl get proxytemplates", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
-
 		BeforeEach(func() {
 			// setup
-
 			rootCtx = &kumactl_cmd.RootContext{
 				Runtime: kumactl_cmd.RootRuntime{
 					NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) {

diff --git a/app/kumactl/cmd/get/get_single_resource_test.go b/app/kumactl/cmd/get/get_single_resource_test.go
@@ -6,7 +6,6 @@ import (
 	"io/ioutil"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/Kong/kuma/pkg/catalog"
 	catalog_client "github.com/Kong/kuma/pkg/catalog/client"
@@ -29,11 +28,9 @@ var _ = Describe("kumactl get [resource] NAME", func() {
 	var rootCmd *cobra.Command
 	var outbuf, errbuf *bytes.Buffer
 	var store core_store.ResourceStore
-
 	BeforeEach(func() {
 		rootCtx = &kumactl_cmd.RootContext{
 			Runtime: kumactl_cmd.RootRuntime{
-				Now: time.Now,
 				NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) {
 					return store, nil
 				},

diff --git a/app/kumactl/cmd/get/get_traffic_logs_test.go b/app/kumactl/cmd/get/get_traffic_logs_test.go
@@ -90,7 +90,6 @@ var _ = Describe("kumactl get traffic-logs", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
-
 		BeforeEach(func() {
 			// setup
 			rootCtx = &kumactl_cmd.RootContext{

diff --git a/app/kumactl/cmd/get/get_traffic_routes_test.go b/app/kumactl/cmd/get/get_traffic_routes_test.go
@@ -62,10 +62,8 @@ var _ = Describe("kumactl get traffic-routes", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
-
 		BeforeEach(func() {
 			// setup
-
 			rootCtx = &kumactl_cmd.RootContext{
 				Runtime: kumactl_cmd.RootRuntime{
 					NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) {

diff --git a/app/kumactl/cmd/get/get_traffic_traces_test.go b/app/kumactl/cmd/get/get_traffic_traces_test.go
@@ -74,7 +74,6 @@ var _ = Describe("kumactl get traffic-traces", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
-
 		BeforeEach(func() {
 			// setup
 			rootCtx = &kumactl_cmd.RootContext{

diff --git a/app/kumactl/cmd/get/get_trafficpermissions_test.go b/app/kumactl/cmd/get/get_trafficpermissions_test.go
@@ -84,7 +84,6 @@ var _ = Describe("kumactl get traffic-permissions", func() {
 		var rootCmd *cobra.Command
 		var buf *bytes.Buffer
 		var store core_store.ResourceStore
-
 		BeforeEach(func() {
 			// setup
 			rootCtx = &kumactl_cmd.RootContext{

diff --git a/app/kumactl/cmd/get/testdata/get-dataplane.golden.json b/app/kumactl/cmd/get/testdata/get-dataplane.golden.json
@@ -2,6 +2,8 @@
     "type": "Dataplane",
     "mesh": "default",
     "name": "dataplane-1",
+    "creationTime": "0001-01-01T00:00:00Z",
+    "modificationTime": "0001-01-01T00:00:00Z",
     "networking": {
         "address": "127.0.0.1",
         "inbound": [

diff --git a/app/kumactl/cmd/get/testdata/get-dataplane.golden.yaml b/app/kumactl/cmd/get/testdata/get-dataplane.golden.yaml
@@ -1,5 +1,6 @@
----
+creationTime: 0001-01-01T00:00:00Z
 mesh: default
+modificationTime: 0001-01-01T00:00:00Z
 name: dataplane-1
 networking:
   address: 127.0.0.1

diff --git a/app/kumactl/cmd/get/testdata/get-dataplanes.golden.json b/app/kumactl/cmd/get/testdata/get-dataplanes.golden.json
@@ -3,6 +3,8 @@
       {
         "mesh": "default",
         "name": "experiment",
+        "creationTime": "0001-01-01T00:00:00Z",
+        "modificationTime": "0001-01-01T00:00:00Z",
         "networking": {
           "address": "127.0.0.1",
           "inbound": [
@@ -29,6 +31,8 @@
       {
         "mesh": "default",
         "name": "example",
+        "creationTime": "0001-01-01T00:00:00Z",
+        "modificationTime": "0001-01-01T00:00:00Z",
         "networking": {
           "address": "127.0.0.2",
           "inbound": [

diff --git a/app/kumactl/cmd/get/testdata/get-dataplanes.golden.yaml b/app/kumactl/cmd/get/testdata/get-dataplanes.golden.yaml
@@ -1,5 +1,7 @@
 items:
-- mesh: default
+- creationTime: 0001-01-01T00:00:00Z
+  mesh: default
+  modificationTime: 0001-01-01T00:00:00Z
   name: experiment
   networking:
     address: 127.0.0.1
@@ -15,7 +17,9 @@ items:
         service: metrics
         version: v1
   type: Dataplane
-- mesh: default
+- creationTime: 0001-01-01T00:00:00Z
+  mesh: default
+  modificationTime: 0001-01-01T00:00:00Z
   name: example
   networking:
     address: 127.0.0.2

diff --git a/app/kumactl/cmd/get/testdata/get-fault-injection.golden.json b/app/kumactl/cmd/get/testdata/get-fault-injection.golden.json
@@ -2,6 +2,8 @@
     "type": "FaultInjection",
     "mesh": "default",
     "name": "fault-injection-1",
+    "creationTime": "0001-01-01T00:00:00Z",
+    "modificationTime": "0001-01-01T00:00:00Z",
     "sources": [
         {
             "match": {

diff --git a/app/kumactl/cmd/get/testdata/get-fault-injection.golden.yaml b/app/kumactl/cmd/get/testdata/get-fault-injection.golden.yaml
@@ -2,7 +2,9 @@ conf:
   abort:
     httpStatus: 500
     percentage: 50
+creationTime: 0001-01-01T00:00:00Z
 mesh: default
+modificationTime: 0001-01-01T00:00:00Z
 name: fault-injection-1
 sources:
   - match:

diff --git a/app/kumactl/cmd/get/testdata/get-fault-injections.golden.json b/app/kumactl/cmd/get/testdata/get-fault-injections.golden.json
@@ -4,6 +4,8 @@
       "type": "FaultInjection",
       "mesh": "default",
       "name": "fi1",
+      "creationTime": "0001-01-01T00:00:00Z",
+      "modificationTime": "0001-01-01T00:00:00Z",
       "sources": [
         {
           "match": {
@@ -38,6 +40,8 @@
       "type": "FaultInjection",
       "mesh": "default",
       "name": "fi2",
+      "creationTime": "0001-01-01T00:00:00Z",
+      "modificationTime": "0001-01-01T00:00:00Z",
       "sources": [
         {
           "match": {

diff --git a/app/kumactl/cmd/get/testdata/get-fault-injections.golden.yaml b/app/kumactl/cmd/get/testdata/get-fault-injections.golden.yaml
@@ -9,10 +9,12 @@ items:
       responseBandwidth:
         limit: 50 mbps
         percentage: 50
+    creationTime: 0001-01-01T00:00:00Z
     destinations:
       - match:
           service: backend
     mesh: default
+    modificationTime: 0001-01-01T00:00:00Z
     name: fi1
     sources:
       - match:
@@ -29,10 +31,12 @@ items:
       responseBandwidth:
         limit: 50 mbps
         percentage: 50
+    creationTime: 0001-01-01T00:00:00Z
     destinations:
       - match:
           service: redis
     mesh: default
+    modificationTime: 0001-01-01T00:00:00Z
     name: fi2
     sources:
       - match:

diff --git a/app/kumactl/cmd/get/testdata/get-healthcheck.golden.json b/app/kumactl/cmd/get/testdata/get-healthcheck.golden.json
@@ -2,6 +2,8 @@
     "type": "HealthCheck",
     "mesh": "default",
     "name": "healthcheck-1",
+    "creationTime": "0001-01-01T00:00:00Z",
+    "modificationTime": "0001-01-01T00:00:00Z",
     "sources": [
         {
             "match": {

diff --git a/app/kumactl/cmd/get/testdata/get-healthcheck.golden.yaml b/app/kumactl/cmd/get/testdata/get-healthcheck.golden.yaml
@@ -1,11 +1,3 @@
-mesh: default
-name: healthcheck-1
-sources:
-  - match:
-      service: web
-destinations:
-  - match:
-      service: backend
 conf:
   activeChecks:
     interval: 10s
@@ -15,4 +7,14 @@ conf:
   passiveChecks:
     unhealthyThreshold: 3
     penaltyInterval: 5s
+creationTime: 0001-01-01T00:00:00Z
+destinations:
+  - match:
+      service: backend
+mesh: default
+modificationTime: 0001-01-01T00:00:00Z
+name: healthcheck-1
+sources:
+  - match:
+      service: web
 type: HealthCheck
diff --git a/app/kumactl/cmd/get/testdata/get-healthchecks.golden.json b/app/kumactl/cmd/get/testdata/get-healthchecks.golden.json
@@ -3,12 +3,16 @@
     {
       "mesh": "default",
       "name": "web-to-backend",
-      "type": "HealthCheck"
+      "type": "HealthCheck",
+      "creationTime": "0001-01-01T00:00:00Z",
+      "modificationTime": "0001-01-01T00:00:00Z"
     },
     {
       "mesh": "default",
       "name": "backend-to-db",
-      "type": "HealthCheck"
+      "type": "HealthCheck",
+      "creationTime": "0001-01-01T00:00:00Z",
+      "modificationTime": "0001-01-01T00:00:00Z"
     }
   ],
   "next": null

diff --git a/app/kumactl/cmd/get/testdata/get-healthchecks.golden.yaml b/app/kumactl/cmd/get/testdata/get-healthchecks.golden.yaml
@@ -1,8 +1,12 @@
 items:
-- mesh: default
+- creationTime: 0001-01-01T00:00:00Z
+  mesh: default
+  modificationTime: 0001-01-01T00:00:00Z
   name: web-to-backend
   type: HealthCheck
-- mesh: default
+- creationTime: 0001-01-01T00:00:00Z
+  mesh: default
+  modificationTime: 0001-01-01T00:00:00Z
   name: backend-to-db
   type: HealthCheck
 next: null
diff --git a/app/kumactl/cmd/get/testdata/get-mesh.golden.json b/app/kumactl/cmd/get/testdata/get-mesh.golden.json
@@ -1,6 +1,8 @@
 {
     "type": "Mesh",
     "name": "mesh-1",
+    "creationTime": "0001-01-01T00:00:00Z",
+    "modificationTime": "0001-01-01T00:00:00Z",
     "mtls": {
         "ca": {
             "provided": {}

diff --git a/app/kumactl/cmd/get/testdata/get-mesh.golden.yaml b/app/kumactl/cmd/get/testdata/get-mesh.golden.yaml
@@ -1,4 +1,4 @@
----
+creationTime: 0001-01-01T00:00:00Z
 logging:
   backends:
     - name: logstash
@@ -11,6 +11,7 @@ metrics:
   prometheus:
     path: /non-standard-path
     port: 1234
+modificationTime: 0001-01-01T00:00:00Z
 mtls:
   ca:
     provided: {}

diff --git a/app/kumactl/cmd/get/testdata/get-meshes.golden.json b/app/kumactl/cmd/get/testdata/get-meshes.golden.json
@@ -8,7 +8,9 @@
         }
       },
       "name": "mesh1",
-      "type": "Mesh"
+      "type": "Mesh",
+      "creationTime": "0001-01-01T00:00:00Z",
+      "modificationTime": "0001-01-01T00:00:00Z"
     },
     {
       "mtls": {
@@ -18,7 +20,9 @@
         }
       },
       "name": "mesh2",
-      "type": "Mesh"
+      "type": "Mesh",
+      "creationTime": "0001-01-01T00:00:00Z",
+      "modificationTime": "0001-01-01T00:00:00Z"
     },
     {
       "metrics": {
@@ -65,7 +69,9 @@
         }
       },
       "name": "mesh3",
-      "type": "Mesh"
+      "type": "Mesh",
+      "creationTime": "0001-01-01T00:00:00Z",
+      "modificationTime": "0001-01-01T00:00:00Z"
     },
     {
       "metrics": {
@@ -86,7 +92,9 @@
         }
       },
       "name": "mesh4",
-      "type": "Mesh"
+      "type": "Mesh",
+      "creationTime": "0001-01-01T00:00:00Z",
+      "modificationTime": "0001-01-01T00:00:00Z"
     }
   ],
   "next": null