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

Jonmv/assume azure services #2634

Merged
merged 12 commits into from
Jun 5, 2024
Merged

Jonmv/assume azure services #2634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e2c74a3
Add Azure tenant id and client id to domain
jonmv May 31, 2024
d7a6842
Refactor slightly for external creds, and verify GCP project is set
jonmv May 31, 2024
4e0b9c4
Add AzureAccessTokenProvider with tests
jonmv May 31, 2024
66cd97e
Modify InstanceAzureProvider to run in ZTS, for multiple subscriptions
jonmv May 31, 2024
438b41d
Add design doc for Azure integration
jonmv May 31, 2024
de03756
Fix markdown
jonmv May 31, 2024
b632b9c
Fix markdown a bit more
jonmv May 31, 2024
6c940e1
Inline default interface method to avoid coverage failure
jonmv May 31, 2024
dc62dfb
Fix some unit tests, and avoid "confusing varargs parameter"
jonmv Jun 3, 2024
ac5e041
Expect updated error message
jonmv Jun 3, 2024
cfa560c
Make the coverage gods happy
jonmv Jun 3, 2024
48f77d3
Address review
jonmv Jun 4, 2024
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
132 changes: 132 additions & 0 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.

2 changes: 2 additions & 0 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.

22 changes: 22 additions & 0 deletions clients/go/zts/model.go
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions clients/go/zts/zts_schema.go
View file
Open in desktop

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

26 changes: 26 additions & 0 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 @@ -71,6 +71,12 @@ public class Domain {
public String azureSubscription;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String azureTenant;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String azureClient;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String gcpProject;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -226,6 +232,20 @@ public Domain setAzureSubscription(String azureSubscription) {
public String getAzureSubscription() {
return azureSubscription;
}
public Domain setAzureTenant(String azureTenant) {
this.azureTenant = azureTenant;
return this;
}
public String getAzureTenant() {
return azureTenant;
}
public Domain setAzureClient(String azureClient) {
this.azureClient = azureClient;
return this;
}
public String getAzureClient() {
return azureClient;
}
public Domain setGcpProject(String gcpProject) {
this.gcpProject = gcpProject;
return this;
Expand Down Expand Up @@ -376,6 +396,12 @@ public boolean equals(Object another) {
if (azureSubscription == null ? a.azureSubscription != null : !azureSubscription.equals(a.azureSubscription)) {
return false;
}
if (azureTenant == null ? a.azureTenant != null : !azureTenant.equals(a.azureTenant)) {
return false;
}
if (azureClient == null ? a.azureClient != null : !azureClient.equals(a.azureClient)) {
return false;
}
if (gcpProject == null ? a.gcpProject != null : !gcpProject.equals(a.gcpProject)) {
return false;
}
Expand Down
26 changes: 26 additions & 0 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 @@ -67,6 +67,12 @@ public class DomainData {
public String azureSubscription;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String azureTenant;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String azureClient;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public String gcpProject;
@RdlOptional
@JsonInclude(JsonInclude.Include.NON_EMPTY)
Expand Down Expand Up @@ -222,6 +228,20 @@ public DomainData setAzureSubscription(String azureSubscription) {
public String getAzureSubscription() {
return azureSubscription;
}
public DomainData setAzureTenant(String azureTenant) {
this.azureTenant = azureTenant;
return this;
}
public String getAzureTenant() {
return azureTenant;
}
public DomainData setAzureClient(String azureClient) {
this.azureClient = azureClient;
return this;
}
public String getAzureClient() {
return azureClient;
}
public DomainData setGcpProject(String gcpProject) {
this.gcpProject = gcpProject;
return this;
Expand Down Expand Up @@ -400,6 +420,12 @@ public boolean equals(Object another) {
if (azureSubscription == null ? a.azureSubscription != null : !azureSubscription.equals(a.azureSubscription)) {
return false;
}
if (azureTenant == null ? a.azureTenant != null : !azureTenant.equals(a.azureTenant)) {
return false;
}
if (azureClient == null ? a.azureClient != null : !azureClient.equals(a.azureClient)) {
return false;
}
if (gcpProject == null ? a.gcpProject != null : !gcpProject.equals(a.gcpProject)) {
return false;
}
Expand Down
Loading