Skip to content

Add Azure resource ID to protos #15673

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

Merged
GavinFrazar merged 12 commits into from
Aug 25, 2022
Merged

Add Azure resource ID to protos #15673

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
f28ac40
Add Azure auto-discovery configuration fields
GavinFrazar Aug 17, 2022
ccf04e7
Init databases if azure matchers are in config
GavinFrazar Aug 17, 2022
eb631a8
Use AzureMatchers in db service
GavinFrazar Aug 17, 2022
053a2f9
Use all azure subscriptions/resource groups if omitted in matcher
GavinFrazar Aug 17, 2022
38e1df7
Add azure config tests
GavinFrazar Aug 17, 2022
53ae03b
Update protobuf and fix database serialization
GavinFrazar Aug 19, 2022
292f1a2
Update azure database spec/status
GavinFrazar Aug 19, 2022
7de222b
Change proto to use resource id string
GavinFrazar Aug 25, 2022
d09df1b
Fix database serialization test
GavinFrazar Aug 25, 2022
0c88531
Merge branch 'master' into gavinfrazar/azure_mysql_postgres_auto_disc…
GavinFrazar Aug 25, 2022
524a48a
Merge branch 'master' into gavinfrazar/azure_mysql_postgres_auto_disc…
GavinFrazar Aug 25, 2022
bdae7b5
Merge branch 'master' into gavinfrazar/azure_mysql_postgres_auto_disc…
GavinFrazar Aug 25, 2022
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
15 changes: 15 additions & 0 deletions api/types/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ type Database interface {
GetGCP() GCPCloudSQL
// GetAzure returns Azure database server metadata.
GetAzure() Azure
// SetStatusAzure sets the database Azure metadata in the status field.
SetStatusAzure(Azure)
// GetAD returns Active Directory database configuration.
GetAD() AD
// GetType returns the database authentication type: self-hosted, RDS, Redshift or Cloud SQL.
Expand Down Expand Up @@ -316,11 +318,24 @@ func (d *DatabaseV3) GetGCP() GCPCloudSQL {
return d.Spec.GCP
}

// IsEmpty returns true if Azure metadata is empty.
func (a Azure) IsEmpty() bool {
return cmp.Equal(a, Azure{})
}

// GetAzure returns Azure database server metadata.
func (d *DatabaseV3) GetAzure() Azure {
if !d.Status.Azure.IsEmpty() {
return d.Status.Azure
}
return d.Spec.Azure
}

// SetStatusAzure sets the database Azure metadata in the status field.
func (d *DatabaseV3) SetStatusAzure(azure Azure) {
d.Status.Azure = azure
}

// GetAD returns Active Directory database configuration.
func (d *DatabaseV3) GetAD() AD {
return d.Spec.AD
Expand Down
Loading