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

resource_cloud_project: factorize serviceName discovery and manage possible domain discrepancies #478

Merged
merged 2 commits into from
Feb 14, 2024
Merged

resource_cloud_project: factorize serviceName discovery and manage possible domain discrepancies #478

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63b207e
resource_cloud_project: factorize serviceName discovery and manage po…
gxben Oct 5, 2023
43659ae
fix: Public Cloud Project spawn handling special case in the US when …
rbeuque74 Feb 14, 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
86 changes: 35 additions & 51 deletions ovh/resource_cloud_project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,32 +78,44 @@ func resourceCloudProjectCreate(d *schema.ResourceData, meta interface{}) error
return resourceCloudProjectUpdate(d, meta)
}

func resourceCloudProjectUpdate(d *schema.ResourceData, meta interface{}) error {
order, details, err := orderRead(d, meta)
if err != nil {
return fmt.Errorf("Could not read cloud project order: %q", err)
func resourceCloudProjectGetServiceName(config *Config, order *MeOrder, details []*MeOrderDetail) (string, error) {
// Looking for an order detail associated to a Public Cloud Project.
// Cloud Project has a specific resource_name that we can grep through a Regexp
for _, d := range details {
domain := d.Domain
if publicCloudProjectNameFormatRegex.MatchString(domain) {
return domain, nil
}
}

config := meta.(*Config)
serviceName := details[0].Domain

// in the US, for reasons too long to be detailled here, cloud project order domain is not the public cloud project id, but "*".
// There have been discussions to align US & EU, but they've failed.
// So we end up making a few extra queries to fetch the project id from operations details.
if !publicCloudProjectNameFormatRegex.MatchString(serviceName) {
orderDetailId := details[0].OrderDetailId
operations, err := orderDetailOperations(config.OVHClient, order.OrderId, orderDetailId)
// For OVHcloud US, resource_name are not stored inside order detail, but inside the operation associated to the order detail.
for _, orderDetail := range details {
operations, err := orderDetailOperations(config.OVHClient, order.OrderId, orderDetail.OrderDetailId)
if err != nil {
return fmt.Errorf("Could not read cloudProject order details operations: %q", err)
return "", fmt.Errorf("Could not read cloudProject order details operations: %q", err)
}
for _, operation := range operations {
if !publicCloudProjectNameFormatRegex.MatchString(operation.Resource.Name) {
continue
if publicCloudProjectNameFormatRegex.MatchString(operation.Resource.Name) {
return operation.Resource.Name, nil
}
serviceName = operation.Resource.Name
}
}

return "", fmt.Errorf("Unknown service name")
}

func resourceCloudProjectUpdate(d *schema.ResourceData, meta interface{}) error {
order, details, err := orderRead(d, meta)
if err != nil {
return fmt.Errorf("Could not read cloud project order: %q", err)
}

config := meta.(*Config)
serviceName, err := resourceCloudProjectGetServiceName(config, order, details)
if err != nil {
return err
}

log.Printf("[DEBUG] Will update cloudProject: %s", serviceName)
opts := (&CloudProjectUpdateOpts{}).FromResource(d)
endpoint := fmt.Sprintf("/cloud/project/%s", serviceName)
Expand All @@ -121,23 +133,9 @@ func resourceCloudProjectRead(d *schema.ResourceData, meta interface{}) error {
}

config := meta.(*Config)
serviceName := details[0].Domain

// in the US, for reasons too long to be detailled here, cloud project order domain is not the public cloud project id, but "*".
// There have been discussions to align US & EU, but they've failed.
// So we end up making a few extra queries to fetch the project id from operations details.
if !publicCloudProjectNameFormatRegex.MatchString(serviceName) {
orderDetailId := details[0].OrderDetailId
operations, err := orderDetailOperations(config.OVHClient, order.OrderId, orderDetailId)
if err != nil {
return fmt.Errorf("Could not read cloudProject order details operations: %q", err)
}
for _, operation := range operations {
if !publicCloudProjectNameFormatRegex.MatchString(operation.Resource.Name) {
continue
}
serviceName = operation.Resource.Name
}
serviceName, err := resourceCloudProjectGetServiceName(config, order, details)
if err != nil {
return err
}

log.Printf("[DEBUG] Will read cloudProject: %s", serviceName)
Expand All @@ -164,23 +162,9 @@ func resourceCloudProjectDelete(d *schema.ResourceData, meta interface{}) error
}

config := meta.(*Config)
serviceName := details[0].Domain

// in the US, for reasons too long to be detailled here, cloud project order domain is not the public cloud project id, but "*".
// There have been discussions to align US & EU, but they've failed.
// So we end up making a few extra queries to fetch the project id from operations details.
if !publicCloudProjectNameFormatRegex.MatchString(serviceName) {
orderDetailId := details[0].OrderDetailId
operations, err := orderDetailOperations(config.OVHClient, order.OrderId, orderDetailId)
if err != nil {
return fmt.Errorf("Could not read cloudProject order details operations: %q", err)
}
for _, operation := range operations {
if !publicCloudProjectNameFormatRegex.MatchString(operation.Resource.Name) {
continue
}
serviceName = operation.Resource.Name
}
serviceName, err := resourceCloudProjectGetServiceName(config, order, details)
if err != nil {
return err
}

id := d.Id()
Expand Down