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

update error messages/formatting + fix zts property name in docs #2637

Merged
merged 1 commit into from
Jun 6, 2024
Merged

update error messages/formatting + fix zts property name in docs #2637

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
20 changes: 10 additions & 10 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.

1 change: 1 addition & 0 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 @@ -68,6 +68,7 @@ public class SubDomain {
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String azureTenant;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String azureClient;
@RdlOptional
Expand Down
4 changes: 2 additions & 2 deletions libs/go/zmscli/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,8 +1121,8 @@ func (cli Zms) SetDomainAccount(dn string, account string) (*string, error) {
func (cli Zms) SetDomainSubscription(dn, subscription, tenant, client string) (*string, error) {
meta := zms.DomainMeta{
AzureSubscription: subscription,
AzureTenant: tenant,
AzureClient: client,
AzureTenant: tenant,
AzureClient: client,
}
err := cli.Zms.PutDomainSystemMeta(zms.DomainName(dn), "azuresubscription", cli.AuditRef, &meta)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion servers/zts/conf/zts.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,4 +760,4 @@ athenz.zts.k8s_provider_distribution_validator_factory_class=com.yahoo.athenz.in
# caller can only include a single system allowed role in the request.
# The most common case for this setting would be to avoid increasing the limit
# of maximum domains in a request from 1 to 2.
#athenz.zts.id_token_system_allowed_roles=
#athenz.zts.id_token_allowed_roles=
Loading