Set ssh client version as optional (AthenZ#548)

WindzCUHK · Sep 13, 2018 · 31ced22 · 31ced22
1 parent 245e49a
commit 31ced22
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/clients/go/zts/model.go b/clients/go/zts/model.go
diff --git a/clients/go/zts/zts_schema.go b/clients/go/zts/zts_schema.go
diff --git a/core/zms/src/main/java/com/yahoo/athenz/zms/ZMSSchema.java b/core/zms/src/main/java/com/yahoo/athenz/zms/ZMSSchema.java
@@ -1,5 +1,5 @@
 //
-// This file generated by rdl 1.5.1
+// This file generated by rdl 1.5.1. Do not modify!
 //
 
 package com.yahoo.athenz.zms;

diff --git a/core/zts/src/main/java/com/yahoo/athenz/zts/SSHCertRequestMeta.java b/core/zts/src/main/java/com/yahoo/athenz/zts/SSHCertRequestMeta.java
@@ -15,6 +15,8 @@ public class SSHCertRequestMeta {
     @RdlOptional
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public String clientInfo;
+    @RdlOptional
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
     public String sshClientVersion;
     public String certType;
 

diff --git a/core/zts/src/main/java/com/yahoo/athenz/zts/ZTSSchema.java b/core/zts/src/main/java/com/yahoo/athenz/zts/ZTSSchema.java
@@ -1,5 +1,5 @@
 //
-// This file generated by rdl 1.5.1
+// This file generated by rdl 1.5.1. Do not modify!
 //
 
 package com.yahoo.athenz.zts;
@@ -278,7 +278,7 @@ private static Schema build() {
             .field("requestor", "String", false, "requesting user")
             .field("origin", "String", false, "origin FQDN or ip")
             .field("clientInfo", "String", true, "client info")
-            .field("sshClientVersion", "String", false, "ssh client version")
+            .field("sshClientVersion", "String", true, "ssh client version")
             .field("certType", "String", false, "cert type - user or host");
 
         sb.structType("SSHCertRequest")

diff --git a/core/zts/src/main/rdl/SSHCert.rdli b/core/zts/src/main/rdl/SSHCert.rdli
@@ -15,7 +15,7 @@ type SSHCertRequestMeta Struct {
     String requestor; //requesting user
     String origin; //origin FQDN or ip
     String clientInfo (optional); //client info
-    String sshClientVersion; //ssh client version
+    String sshClientVersion (optional); //ssh client version
     String certType; //cert type - user or host
 }