Skip to content

Fix for ram shared vmc delete #45552

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
pooja-choudhury wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix for ram shared vmc delete #45552

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58eeefe
Use arn field retuened by aws sdk for exa infra arn and odb network arn
pooja-choudhury Dec 11, 2025
970291a
fixed typo
pooja-choudhury Dec 11, 2025
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
68 changes: 8 additions & 60 deletions internal/service/odb/cloud_vm_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,41 +575,11 @@
return
}
plan.GiVersion = flex.StringToFramework(ctx, giVersionMajor)
odbNetwork = plan.OdbNetworkId
if odbNetwork.IsNull() || odbNetwork.IsUnknown() {
odbNetwork = plan.OdbNetworkArn
}
getOdbNetworkInput := odb.GetOdbNetworkInput{
OdbNetworkId: odbNetwork.ValueStringPointer(),
}
odbNetworkOutput, err := conn.GetOdbNetwork(ctx, &getOdbNetworkInput)
if err != nil {
resp.Diagnostics.AddError(
create.ProblemStandardMessage(names.ODB, create.ErrActionWaitingForCreation, ResNameCloudVmCluster, plan.CloudVmClusterId.ValueString(), err),
err.Error(),
)
return
}
plan.OdbNetworkId = flex.StringToFramework(ctx, odbNetworkOutput.OdbNetwork.OdbNetworkId)
plan.OdbNetworkArn = flex.StringToFramework(ctx, odbNetworkOutput.OdbNetwork.OdbNetworkArn)
cloudExadataInfra = plan.CloudExadataInfrastructureId
if cloudExadataInfra.IsNull() || cloudExadataInfra.IsUnknown() {
cloudExadataInfra = plan.CloudExadataInfrastructureArn
}
getCloudExadataInfraInput := odb.GetCloudExadataInfrastructureInput{
CloudExadataInfrastructureId: cloudExadataInfra.ValueStringPointer(),
}
cloudExadataInfraOutput, err := conn.GetCloudExadataInfrastructure(ctx, &getCloudExadataInfraInput)
if err != nil {
resp.Diagnostics.AddError(
create.ProblemStandardMessage(names.ODB, create.ErrActionWaitingForCreation, ResNameCloudVmCluster, plan.CloudVmClusterId.ValueString(), err),
err.Error(),
)
return
}
plan.CloudExadataInfrastructureId = flex.StringToFramework(ctx, cloudExadataInfraOutput.CloudExadataInfrastructure.CloudExadataInfrastructureId)
plan.CloudExadataInfrastructureArn = flex.StringToFramework(ctx, cloudExadataInfraOutput.CloudExadataInfrastructure.CloudExadataInfrastructureArn)
plan.OdbNetworkId = flex.StringToFramework(ctx, createdVmCluster.OdbNetworkId)
plan.OdbNetworkArn = flex.StringToFramework(ctx, createdVmCluster.OdbNetworkArn)
plan.CloudExadataInfrastructureId = flex.StringToFramework(ctx, createdVmCluster.CloudExadataInfrastructureId)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 3 of 5 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 2 of 5 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 5 of 5 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 4 of 5 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / go build 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 580 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

createdVmCluster.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)
plan.CloudExadataInfrastructureArn = flex.StringToFramework(ctx, createdVmCluster.CloudExadataInfrastructureArn)
resp.Diagnostics.Append(flex.Flatten(ctx, createdVmCluster, &plan)...)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 3 of 5 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 2 of 5 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 5 of 5 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 4 of 5 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / go build 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 582 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

createdVmCluster.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)
if resp.Diagnostics.HasError() {
return
}
Expand Down Expand Up @@ -651,33 +621,11 @@
return
}
state.GiVersion = flex.StringToFramework(ctx, giVersionMajor)
getOdbNetworkInput := odb.GetOdbNetworkInput{
OdbNetworkId: out.OdbNetworkId,
}
odbNetworkOutput, err := conn.GetOdbNetwork(ctx, &getOdbNetworkInput)
if err != nil {
resp.Diagnostics.AddError(
create.ProblemStandardMessage(names.ODB, create.ErrActionWaitingForCreation, ResNameCloudVmCluster, state.CloudVmClusterId.ValueString(), err),
err.Error(),
)
return
}
state.OdbNetworkId = flex.StringToFramework(ctx, odbNetworkOutput.OdbNetwork.OdbNetworkId)
state.OdbNetworkArn = flex.StringToFramework(ctx, odbNetworkOutput.OdbNetwork.OdbNetworkArn)
getCloudExadataInfraInput := odb.GetCloudExadataInfrastructureInput{
CloudExadataInfrastructureId: out.CloudExadataInfrastructureId,
}
cloudExadataInfraOutput, err := conn.GetCloudExadataInfrastructure(ctx, &getCloudExadataInfraInput)
if err != nil {
resp.Diagnostics.AddError(
create.ProblemStandardMessage(names.ODB, create.ErrActionWaitingForCreation, ResNameCloudVmCluster, state.CloudVmClusterId.ValueString(), err),
err.Error(),
)
return
}
state.CloudExadataInfrastructureId = flex.StringToFramework(ctx, cloudExadataInfraOutput.CloudExadataInfrastructure.CloudExadataInfrastructureId)
state.CloudExadataInfrastructureArn = flex.StringToFramework(ctx, cloudExadataInfraOutput.CloudExadataInfrastructure.CloudExadataInfrastructureArn)
state.OdbNetworkId = flex.StringToFramework(ctx, out.OdbNetworkId)
state.OdbNetworkArn = flex.StringToFramework(ctx, out.OdbNetworkArn)
state.CloudExadataInfrastructureId = flex.StringToFramework(ctx, out.CloudExadataInfrastructureId)

Check failure on line 626 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 3 of 5 

out.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 626 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 2 of 5 

out.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 626 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 5 of 5 

out.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 626 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 4 of 5 

out.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 626 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / go build 

out.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 626 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

out.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 626 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

out.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 626 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

out.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)

Check failure on line 626 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

out.OdbNetworkArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method OdbNetworkArn)
state.CloudExadataInfrastructureArn = flex.StringToFramework(ctx, out.CloudExadataInfrastructureArn)
resp.Diagnostics.Append(flex.Flatten(ctx, out, &state)...)

Check failure on line 628 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 3 of 5 

out.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn) (typecheck)

Check failure on line 628 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 2 of 5 

out.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn) (typecheck)

Check failure on line 628 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 5 of 5 

out.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn))) (typecheck)

Check failure on line 628 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / 4 of 5 

out.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn) (typecheck)

Check failure on line 628 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / go build 

out.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 628 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

out.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 628 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / providerlint 

out.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 628 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

out.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)

Check failure on line 628 in internal/service/odb/cloud_vm_cluster.go

View workflow job for this annotation

GitHub Actions / Check for modern Go code 

out.CloudExadataInfrastructureArn undefined (type *"github.com/aws/aws-sdk-go-v2/service/odb/types".CloudVmCluster has no field or method CloudExadataInfrastructureArn)
if resp.Diagnostics.HasError() {
return
}
Expand Down
Loading