Skip to content

fix 2155 #2168

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix 2155 #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
108e60a
fix 2155
jansonkwo-ora Aug 2, 2024
a7ab106
Merge branch 'oracle:master' into master
jansonkwo-ora Aug 12, 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
4 changes: 3 additions & 1 deletion internal/service/core/core_boot_volume_backup_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ type CoreBootVolumeBackupResourceCrud struct {
Client *oci_core.BlockstorageClient
SourceRegionClient *oci_core.BlockstorageClient
workRequestClient *oci_work_requests.WorkRequestClient
SourceRegionWRClient *oci_work_requests.WorkRequestClient
Res *oci_core.BootVolumeBackup
DisableNotFoundRetries bool
}
Expand Down Expand Up @@ -371,7 +372,8 @@ func (s *CoreBootVolumeBackupResourceCrud) createBootVolumeBackupCopy() error {
s.Res = &response.BootVolumeBackup

if workRequestId != nil {
_, err := tfresource.WaitForWorkRequestWithErrorHandling(s.workRequestClient, workRequestId, "bootVolumeBackup", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
//_, err := tfresource.WaitForWorkRequestWithErrorHandling(s.workRequestClient, workRequestId, "bootVolumeBackup", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
_, err := tfresource.WaitForWorkRequestWithErrorHandling(s.SourceRegionWRClient, workRequestId, "bootVolumeBackup", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
if err != nil {
return err
}
Expand Down
4 changes: 3 additions & 1 deletion internal/service/core/core_volume_backup_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ type CoreVolumeBackupResourceCrud struct {
Client *oci_core.BlockstorageClient
SourceRegionClient *oci_core.BlockstorageClient
workRequestClient *oci_work_requests.WorkRequestClient
SourceRegionWRClient *oci_work_requests.WorkRequestClient
Res *oci_core.VolumeBackup
DisableNotFoundRetries bool
}
Expand Down Expand Up @@ -323,7 +324,8 @@ func (s *CoreVolumeBackupResourceCrud) createVolumeBackupCopy() error {
s.Res = &response.VolumeBackup

if workRequestId != nil {
_, err := tfresource.WaitForWorkRequestWithErrorHandling(s.workRequestClient, workRequestId, "volumeBackup", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
//_, err := tfresource.WaitForWorkRequestWithErrorHandling(s.workRequestClient, workRequestId, "volumeBackup", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
_, err := tfresource.WaitForWorkRequestWithErrorHandling(s.SourceRegionWRClient, workRequestId, "volumeBackup", oci_work_requests.WorkRequestResourceActionTypeCreated, s.D.Timeout(schema.TimeoutCreate), s.DisableNotFoundRetries)
if err != nil {
return err
}
Expand Down
28 changes: 28 additions & 0 deletions internal/service/core/helpers_core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
oci_core "github.com/oracle/oci-go-sdk/v65/core"
oci_work_requests "github.com/oracle/oci-go-sdk/v65/workrequests"
)

// This applies the differences between the regular schema and the one
Expand Down Expand Up @@ -100,9 +101,23 @@ func (s *CoreVolumeBackupResourceCrud) createBlockStorageSourceRegionClient(regi
return fmt.Errorf("cannot configure client for the source region: %v", err)
}
s.SourceRegionClient = &sourceBlockStorageClient

}
s.SourceRegionClient.SetRegion(region)

if s.SourceRegionWRClient == nil {
sourceWorkRequestClient, err := oci_work_requests.NewWorkRequestClientWithConfigurationProvider(*s.workRequestClient.ConfigurationProvider())
if err != nil {
return fmt.Errorf("cannot Create WorkRequestclient for the source region: %v", err)
}
err = tf_client.ConfigureClientVar(&sourceWorkRequestClient.BaseClient)
if err != nil {
return fmt.Errorf("cannot configure client for the source region: %v", err)
}
s.SourceRegionWRClient = &sourceWorkRequestClient
}
s.SourceRegionWRClient.SetRegion(region)

return nil
}

Expand Down Expand Up @@ -137,6 +152,19 @@ func (s *CoreBootVolumeBackupResourceCrud) createBlockStorageSourceRegionClient(
}
s.SourceRegionClient.SetRegion(region)

if s.SourceRegionWRClient == nil {
sourceWorkRequestClient, err := oci_work_requests.NewWorkRequestClientWithConfigurationProvider(*s.workRequestClient.ConfigurationProvider())
if err != nil {
return fmt.Errorf("cannot Create WorkRequestclient for the source region: %v", err)
}
err = tf_client.ConfigureClientVar(&sourceWorkRequestClient.BaseClient)
if err != nil {
return fmt.Errorf("cannot configure client for the source region: %v", err)
}
s.SourceRegionWRClient = &sourceWorkRequestClient
}
s.SourceRegionWRClient.SetRegion(region)

return nil
}

Expand Down