diff --git a/app/kumactl/cmd/get/get_single_resource_test.go b/app/kumactl/cmd/get/get_single_resource_test.go index 8a81362fd867..eabf4900f292 100644 --- a/app/kumactl/cmd/get/get_single_resource_test.go +++ b/app/kumactl/cmd/get/get_single_resource_test.go @@ -25,11 +25,11 @@ var _ = Describe("kumactl get [resource] NAME", func() { var rootCmd *cobra.Command var outbuf, errbuf *bytes.Buffer var store core_store.ResourceStore - + now, _ := time.Parse(time.RFC3339, "2018-07-17T16:05:36.995Z") BeforeEach(func() { rootCtx = &kumactl_cmd.RootContext{ Runtime: kumactl_cmd.RootRuntime{ - Now: time.Now, + Now: func() time.Time { return now }, NewResourceStore: func(*config_proto.ControlPlaneCoordinates_ApiServer) (core_store.ResourceStore, error) { return store, nil }, diff --git a/app/kumactl/cmd/get/testdata/get-dataplane.golden.json b/app/kumactl/cmd/get/testdata/get-dataplane.golden.json index a78fa7924ba8..1058340026cf 100644 --- 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": "2018-07-17T16:05:36.995Z", + "modificationTime": "2018-07-17T16:05:36.995Z", "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 index 654861212c53..278c8e6c7598 100644 --- 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: 2018-07-17T16:05:36.995Z mesh: default +modificationTime: 2018-07-17T16:05:36.995Z name: dataplane-1 networking: address: 127.0.0.1 diff --git a/app/kumactl/cmd/get/testdata/get-fault-injection.golden.json b/app/kumactl/cmd/get/testdata/get-fault-injection.golden.json index 14e523668379..761b1a3a1e48 100644 --- 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": "2018-07-17T16:05:36.995Z", + "modificationTime": "2018-07-17T16:05:36.995Z", "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 index aaaeeda364ec..066defce3aea 100644 --- 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: 2018-07-17T16:05:36.995Z mesh: default +modificationTime: 2018-07-17T16:05:36.995Z name: fault-injection-1 sources: - match: diff --git a/app/kumactl/cmd/get/testdata/get-healthcheck.golden.json b/app/kumactl/cmd/get/testdata/get-healthcheck.golden.json index 691d4bdb1d4c..b84530953a9d 100644 --- 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": "2018-07-17T16:05:36.995Z", + "modificationTime": "2018-07-17T16:05:36.995Z", "sources": [ { "match": { diff --git a/app/kumactl/cmd/get/testdata/get-healthcheck.golden.yaml b/app/kumactl/cmd/get/testdata/get-healthcheck.golden.yaml index a1401826162e..5bde41e9180c 100644 --- 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: 2018-07-17T16:05:36.995Z +destinations: + - match: + service: backend +mesh: default +modificationTime: 2018-07-17T16:05:36.995Z +name: healthcheck-1 +sources: + - match: + service: web type: HealthCheck \ No newline at end of file diff --git a/app/kumactl/cmd/get/testdata/get-mesh.golden.json b/app/kumactl/cmd/get/testdata/get-mesh.golden.json index dd34a1a2b4c3..0ca8a49f2e47 100644 --- 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": "2018-07-17T16:05:36.995Z", + "modificationTime": "2018-07-17T16:05:36.995Z", "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 index fce51fa1cd4e..aa26a3a2efea 100644 --- 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: 2018-07-17T16:05:36.995Z logging: backends: - name: logstash @@ -11,6 +11,7 @@ metrics: prometheus: path: /non-standard-path port: 1234 +modificationTime: 2018-07-17T16:05:36.995Z mtls: ca: provided: {} diff --git a/app/kumactl/cmd/get/testdata/get-proxytemplate.golden.json b/app/kumactl/cmd/get/testdata/get-proxytemplate.golden.json index 2ee071a8a7a1..d2e0120c1cc9 100644 --- a/app/kumactl/cmd/get/testdata/get-proxytemplate.golden.json +++ b/app/kumactl/cmd/get/testdata/get-proxytemplate.golden.json @@ -2,6 +2,8 @@ "mesh": "default", "name": "proxytemplate-1", "type": "ProxyTemplate", + "creationTime": "2018-07-17T16:05:36.995Z", + "modificationTime": "2018-07-17T16:05:36.995Z", "selectors": [ { "match": { diff --git a/app/kumactl/cmd/get/testdata/get-proxytemplate.golden.yaml b/app/kumactl/cmd/get/testdata/get-proxytemplate.golden.yaml index bdc35e56563e..372fc0f63f5c 100644 --- a/app/kumactl/cmd/get/testdata/get-proxytemplate.golden.yaml +++ b/app/kumactl/cmd/get/testdata/get-proxytemplate.golden.yaml @@ -1,9 +1,11 @@ +conf: + imports: + - default-proxy +creationTime: 2018-07-17T16:05:36.995Z mesh: default +modificationTime: 2018-07-17T16:05:36.995Z name: proxytemplate-1 selectors: - match: service: "backend" -conf: - imports: - - default-proxy type: ProxyTemplate \ No newline at end of file diff --git a/app/kumactl/cmd/get/testdata/get-traffic-log.golden.json b/app/kumactl/cmd/get/testdata/get-traffic-log.golden.json index f43615e51e9d..731504c9135d 100644 --- a/app/kumactl/cmd/get/testdata/get-traffic-log.golden.json +++ b/app/kumactl/cmd/get/testdata/get-traffic-log.golden.json @@ -2,6 +2,8 @@ "type": "TrafficLog", "mesh": "default", "name": "traffic-log-1", + "creationTime": "2018-07-17T16:05:36.995Z", + "modificationTime": "2018-07-17T16:05:36.995Z", "sources": [ { "match": { diff --git a/app/kumactl/cmd/get/testdata/get-traffic-log.golden.yaml b/app/kumactl/cmd/get/testdata/get-traffic-log.golden.yaml index df2be58dba5d..fe8947568045 100644 --- a/app/kumactl/cmd/get/testdata/get-traffic-log.golden.yaml +++ b/app/kumactl/cmd/get/testdata/get-traffic-log.golden.yaml @@ -1,13 +1,15 @@ -mesh: default -name: traffic-log-1 +conf: + backend: file +creationTime: 2018-07-17T16:05:36.995Z destinations: - match: env: dev service: backend1 +mesh: default +modificationTime: 2018-07-17T16:05:36.995Z +name: traffic-log-1 sources: - match: service: web1 version: "1.0" -conf: - backend: file type: TrafficLog \ No newline at end of file diff --git a/app/kumactl/cmd/get/testdata/get-traffic-permission.golden.json b/app/kumactl/cmd/get/testdata/get-traffic-permission.golden.json index 31328686c96b..cd8fcf9e0caf 100644 --- a/app/kumactl/cmd/get/testdata/get-traffic-permission.golden.json +++ b/app/kumactl/cmd/get/testdata/get-traffic-permission.golden.json @@ -1,21 +1,23 @@ { - "type": "TrafficPermission", - "mesh": "default", - "name": "traffic-permission-1", - "sources": [ - { - "match": { - "service": "web1", - "version": "1.0" - } + "type": "TrafficPermission", + "mesh": "default", + "name": "traffic-permission-1", + "creationTime": "2018-07-17T16:05:36.995Z", + "modificationTime": "2018-07-17T16:05:36.995Z", + "sources": [ + { + "match": { + "service": "web1", + "version": "1.0" } - ], - "destinations": [ - { - "match": { - "env": "dev", - "service": "backend1" - } + } + ], + "destinations": [ + { + "match": { + "env": "dev", + "service": "backend1" } - ] - } \ No newline at end of file + } + ] +} \ No newline at end of file diff --git a/app/kumactl/cmd/get/testdata/get-traffic-permission.golden.yaml b/app/kumactl/cmd/get/testdata/get-traffic-permission.golden.yaml index c75f30e87ffe..52ebde0fa275 100644 --- a/app/kumactl/cmd/get/testdata/get-traffic-permission.golden.yaml +++ b/app/kumactl/cmd/get/testdata/get-traffic-permission.golden.yaml @@ -1,9 +1,11 @@ -mesh: default -name: traffic-permission-1 +creationTime: 2018-07-17T16:05:36.995Z destinations: - match: env: dev service: backend1 +mesh: default +modificationTime: 2018-07-17T16:05:36.995Z +name: traffic-permission-1 sources: - match: service: web1 diff --git a/app/kumactl/cmd/get/testdata/get-traffic-route.golden.json b/app/kumactl/cmd/get/testdata/get-traffic-route.golden.json index e660273c728a..d1a7cc778017 100644 --- a/app/kumactl/cmd/get/testdata/get-traffic-route.golden.json +++ b/app/kumactl/cmd/get/testdata/get-traffic-route.golden.json @@ -2,6 +2,8 @@ "type": "TrafficRoute", "mesh": "default", "name": "traffic-route-1", + "creationTime": "2018-07-17T16:05:36.995Z", + "modificationTime": "2018-07-17T16:05:36.995Z", "sources": [ { "match": { diff --git a/app/kumactl/cmd/get/testdata/get-traffic-route.golden.yaml b/app/kumactl/cmd/get/testdata/get-traffic-route.golden.yaml index e5546f12b689..0368a9ef18f0 100644 --- a/app/kumactl/cmd/get/testdata/get-traffic-route.golden.yaml +++ b/app/kumactl/cmd/get/testdata/get-traffic-route.golden.yaml @@ -1,14 +1,16 @@ -mesh: default -name: traffic-route-1 -sources: - - match: - service: backend -destinations: - - match: - service: redis conf: - weight: 90 destination: service: redis version: "1.0" +creationTime: 2018-07-17T16:05:36.995Z +destinations: + - match: + service: redis +mesh: default +modificationTime: 2018-07-17T16:05:36.995Z +name: traffic-route-1 +sources: + - match: + service: backend type: TrafficRoute \ No newline at end of file diff --git a/app/kumactl/cmd/get/testdata/get-traffic-trace.golden.json b/app/kumactl/cmd/get/testdata/get-traffic-trace.golden.json index 46cb64e59712..4f4a4ef8440a 100644 --- a/app/kumactl/cmd/get/testdata/get-traffic-trace.golden.json +++ b/app/kumactl/cmd/get/testdata/get-traffic-trace.golden.json @@ -2,6 +2,8 @@ "type": "TrafficTrace", "mesh": "default", "name": "traffic-trace-1", + "creationTime": "2018-07-17T16:05:36.995Z", + "modificationTime": "2018-07-17T16:05:36.995Z", "selectors": [ { "match": { diff --git a/app/kumactl/cmd/get/testdata/get-traffic-trace.golden.yaml b/app/kumactl/cmd/get/testdata/get-traffic-trace.golden.yaml index a6c86592ed9f..7e3f16523f47 100644 --- a/app/kumactl/cmd/get/testdata/get-traffic-trace.golden.yaml +++ b/app/kumactl/cmd/get/testdata/get-traffic-trace.golden.yaml @@ -1,9 +1,11 @@ +conf: + backend: zipkin +creationTime: 2018-07-17T16:05:36.995Z mesh: default +modificationTime: 2018-07-17T16:05:36.995Z name: traffic-trace-1 selectors: - match: service: web1 version: "1.0" -conf: - backend: zipkin type: TrafficTrace \ No newline at end of file