Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix rdl for meta string fields so they can be unset #2515

Merged
merged 1 commit into from
Feb 21, 2024
Merged

fix rdl for meta string fields so they can be unset #2515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions clients/go/zms/model.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions clients/go/zms/zms_schema.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions core/zms/src/main/java/com/yahoo/athenz/zms/Domain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class Domain {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Integer roleCertExpiryMins;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String signAlgorithm;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -94,7 +94,7 @@ public class Domain {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Map<String, String> contacts;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String environment;
public String name;
@RdlOptional
Expand Down
4 changes: 2 additions & 2 deletions core/zms/src/main/java/com/yahoo/athenz/zms/DomainData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class DomainData {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Integer roleCertExpiryMins;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String signAlgorithm;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -90,7 +90,7 @@ public class DomainData {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Map<String, String> contacts;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String environment;
public String name;
public List<Role> roles;
Expand Down
4 changes: 2 additions & 2 deletions core/zms/src/main/java/com/yahoo/athenz/zms/DomainMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class DomainMeta {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Integer roleCertExpiryMins;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String signAlgorithm;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -90,7 +90,7 @@ public class DomainMeta {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Map<String, String> contacts;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String environment;

public DomainMeta setDescription(String description) {
Expand Down
6 changes: 3 additions & 3 deletions core/zms/src/main/java/com/yahoo/athenz/zms/Group.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ public class Group {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Boolean reviewEnabled;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String notifyRoles;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String userAuthorityFilter;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String userAuthorityExpiration;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down
6 changes: 3 additions & 3 deletions core/zms/src/main/java/com/yahoo/athenz/zms/GroupMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ public class GroupMeta {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Boolean reviewEnabled;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String notifyRoles;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String userAuthorityFilter;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String userAuthorityExpiration;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down
10 changes: 5 additions & 5 deletions core/zms/src/main/java/com/yahoo/athenz/zms/Role.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class Role {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Integer certExpiryMins;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String signAlgorithm;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand All @@ -48,13 +48,13 @@ public class Role {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Boolean reviewEnabled;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String notifyRoles;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String userAuthorityFilter;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String userAuthorityExpiration;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand All @@ -66,7 +66,7 @@ public class Role {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Map<String, TagValueList> tags;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String description;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down
10 changes: 5 additions & 5 deletions core/zms/src/main/java/com/yahoo/athenz/zms/RoleMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class RoleMeta {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Integer certExpiryMins;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String signAlgorithm;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand All @@ -42,13 +42,13 @@ public class RoleMeta {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Boolean reviewEnabled;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String notifyRoles;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String userAuthorityFilter;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String userAuthorityExpiration;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand All @@ -60,7 +60,7 @@ public class RoleMeta {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Map<String, TagValueList> tags;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String description;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down
4 changes: 2 additions & 2 deletions core/zms/src/main/java/com/yahoo/athenz/zms/SubDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class SubDomain {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Integer roleCertExpiryMins;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String signAlgorithm;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -90,7 +90,7 @@ public class SubDomain {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Map<String, String> contacts;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String environment;
public String name;
public List<String> adminUsers;
Expand Down
4 changes: 2 additions & 2 deletions core/zms/src/main/java/com/yahoo/athenz/zms/TopLevelDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class TopLevelDomain {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Integer roleCertExpiryMins;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String signAlgorithm;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -91,7 +91,7 @@ public class TopLevelDomain {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Map<String, String> contacts;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String environment;
public String name;
public List<String> adminUsers;
Expand Down
4 changes: 2 additions & 2 deletions core/zms/src/main/java/com/yahoo/athenz/zms/UserDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class UserDomain {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Integer roleCertExpiryMins;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String signAlgorithm;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -90,7 +90,7 @@ public class UserDomain {
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public Map<String, String> contacts;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@JsonInclude(JsonInclude.Include.NON_NULL)
public String environment;
public String name;
@RdlOptional
Expand Down
Loading