Oracle update exadata infra to support X11M shape #29801

mihretkidane-OCI · 2025-06-04T16:38:05Z

Community Note

Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

The following changes have been made to the Oracle provider to support the new Oracle Cloud Infrastructure Exadata Infrastructure X11M shape.

oracle_exadata_infrastructure_resource , oracle_exadata_infrastructure_data_source

Added new Optional Arguments

database_server_type: The database server mo del type of the cloud Exadata infrastructure resource.
storage_server_type: The storage server model type of the cloud Exadata infrastructure resource.

New Attributes:

compute_model: The compute model of the Exadata Infrastructure was added to the following resource

oracle_db_system_shapes_data_source

New Optional argument

zone : the availability zone filter added

New attributes

are_server_types_supported: Indicates if the shape supports database and storage server types
display_name: The display name of the shape used for the DB system
compute_model: The compute model of the Exadata Infrastructure was added to the following resource

oracle_cloud_vm_cluster_data_source, oracle_cloud_vm_cluster_resource

New attributes

compute_model: The compute model of the Exadata Infrastructure was added to the following resource

oracle_db_servers_data_source

New attributes

compute_model: The compute model of the Exadata Infrastructure was added to the following resource

PR Checklist

I have followed the guidelines in our Contributing Documentation.
I have checked to ensure there aren't other open Pull Requests for the same update/change.
I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
For example: “resource_name_here - description of change e.g. adding property new_property_name_here”

Changes to existing Resource / Data Source

I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
I have written new tests for my resource or datasource changes & updated any relevant documentation.
I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
(For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)
[ ]

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

azurerm_resource - support for the thing1 property [GH-00000]

This is a (please select all that apply):

Bug Fix
New Feature (ie adding a service, resource, or data source)
Enhancement
Breaking Change

Related Issue(s)

Fixes #29820

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the provider.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

mybayern1974 · 2025-06-18T07:13:55Z

@mihretkidane-OCI , thank you for composing this PR. To add a new feature that resides in a new Azure service API version, the best practice recommended in AzureRM is to split them into several PRs for better fine granularity mgmt. Take this PR as example, it does two actions: 1) introduce the new version of Hashicorp Azure SDK to this repo + Have related services consume the new service API version 2) business code update. These two actions are expected to be split into 2 PRs, separately, and we can imagine the first PR could be reviewed and merged quickly.

With the current state, we can see another Azure Oracle PR 29833 would have to rebase to this PR, or vice versa.

Another suggestion is to use the same API version to manage all resources in a Resource Provider though using multiple API versions in parallel is not forbidden. To use the latter way as this PR does that co-uses 2024-06-01 and 2025-03-01, it’s recommended to comment why the latter new API version cannot solely cover all needed functionalities.

I’m sharing here a previous PR 28825 as a reference that embodies the above 2 suggested practices.

mihretkidane-OCI · 2025-06-18T16:06:31Z

@mybayern1974 I have another PR to upgrade the client to the new version , however I couldn't merge it because it will introduce a breaking change if merged right away. For that reason we are working on a fix to our service so we wont introduce a breaking change , However with the timeline that we have and business requirement we are requesting to keep both clients in this PR and merge it. The other PRs like oracle 29833 will rebase once this PR is merged or vice versa.

jackofallops

Hi @mihretkidane-OCI - There's a few review comments to check below if you can take a look. Thanks!

jackofallops · 2025-06-24T12:04:41Z

internal/services/oracle/oracle_cloud_vm_cluster_data_source.go

@@ -466,6 +472,7 @@ func (d CloudVmClusterDataSource) Read() sdk.ResourceFunc {
 					state.CloudExadataInfrastructureId = props.CloudExadataInfrastructureId
 					state.ClusterName = pointer.From(props.ClusterName)
 					state.CompartmentId = pointer.From(props.CompartmentId)
+					state.ComputeModel = string(pointer.From(props.ComputeModel))


we have a helper for this

Suggested change

state.ComputeModel = string(pointer.From(props.ComputeModel))

state.ComputeModel = pointer.FromEnum(props.ComputeModel)

jackofallops · 2025-06-24T12:08:29Z

internal/services/oracle/oracle_db_system_shapes_data_source.go

@@ -192,7 +220,9 @@ func (d DbSystemShapesDataSource) Read() sdk.ResourceFunc {
 							AvailableDbNodeStorageInGbs:        pointer.From(props.AvailableDbNodeStorageInGbs),
 							AvailableMemoryInGbs:               pointer.From(props.AvailableMemoryInGbs),
 							AvailableMemoryPerNodeInGbs:        pointer.From(props.AvailableMemoryPerNodeInGbs),
+							ComputeModel:                       string(pointer.From(props.ComputeModel)),


as above

Suggested change

ComputeModel: string(pointer.From(props.ComputeModel)),

ComputeModel: pointer.FromEnum(props.ComputeModel),

jackofallops · 2025-06-24T12:25:49Z

internal/services/oracle/oracle_exadata_infrastructure_resource_test.go

+				check.That(data.ResourceName).Key("shape").HasValue("Exadata.X11M"),
+				check.That(data.ResourceName).Key("database_server_type").HasValue("X11M"),
+				check.That(data.ResourceName).Key("storage_server_type").HasValue("X11M-HC"),


These should be unnecessary as the import check will validate that all values match those in the config on read.

Suggested change

check.That(data.ResourceName).Key("shape").HasValue("Exadata.X11M"),

check.That(data.ResourceName).Key("database_server_type").HasValue("X11M"),

check.That(data.ResourceName).Key("storage_server_type").HasValue("X11M-HC"),

jackofallops · 2025-06-24T12:31:17Z

internal/services/oracle/validate/cloud_vm_cluster.go

+	}
+
+	if len(v) < 1 || len(v) > 255 {
+		errors = append(errors, fmt.Errorf("databse_server_type must be %d to %d characters", 1, 255))


Suggested change

errors = append(errors, fmt.Errorf("databse_server_type must be %d to %d characters", 1, 255))

errors = append(errors, fmt.Errorf("%s must be %d to %d characters", k, 1, 255))

jackofallops · 2025-06-24T12:31:45Z

internal/services/oracle/validate/cloud_vm_cluster.go

+	}
+
+	if len(v) < 1 || len(v) > 255 {
+		errors = append(errors, fmt.Errorf("storage_server_type must be %d to %d characters", 1, 255))


Suggested change

errors = append(errors, fmt.Errorf("storage_server_type must be %d to %d characters", 1, 255))

errors = append(errors, fmt.Errorf("%s must be %d to %d characters", k, 1, 255))

jackofallops · 2025-06-24T12:34:51Z

internal/services/oracle/oracle_exadata_infrastructure_resource.go

+			if len(model.DatabaseServerType) > 0 {
+				param.Properties.DatabaseServerType = pointer.To(model.DatabaseServerType)
+			}
+			if len(model.StorageServerType) > 0 {
+				param.Properties.StorageServerType = pointer.To(model.StorageServerType)
+			}


checks should be type specific:

Suggested change

if len(model.DatabaseServerType) > 0 {

param.Properties.DatabaseServerType = pointer.To(model.DatabaseServerType)

}

if len(model.StorageServerType) > 0 {

param.Properties.StorageServerType = pointer.To(model.StorageServerType)

}

if model.DatabaseServerType != "" {

param.Properties.DatabaseServerType = pointer.To(model.DatabaseServerType)

}

if model.StorageServerType != "" {

param.Properties.StorageServerType = pointer.To(model.StorageServerType)

}

website/docs/d/oracle_db_system_shapes.html.markdown

…base 2025-03-01

jackofallops

Thanks @mihretkidane-OCI - Just a couple of items to take a look at below, but this should be fine after those are addressed.

website/docs/r/oracle_exadata_infrastructure.html.markdown

internal/services/oracle/oracle_exadata_infrastructure_resource.go

internal/services/oracle/validate/cloud_vm_cluster.go

mihretkidane-OCI · 2025-07-04T16:10:37Z

@jackofallops please help review the PR

jackofallops

Thanks for the changes @mihretkidane-OCI - This LGTM now 👍

mihretkidane-OCI requested a review from a team as a code owner June 4, 2025 16:38

github-actions bot added the dependencies label Jun 4, 2025

evgen-work force-pushed the oracle-update-exadata-infra branch from 126bd5a to 331811d Compare June 4, 2025 16:38

github-actions bot added size/XL waiting-response documentation enhancement and removed waiting-response labels Jun 4, 2025

evgen-work force-pushed the oracle-update-exadata-infra branch 2 times, most recently from 8107220 to 7dc06e5 Compare June 6, 2025 14:54

v-ehua mentioned this pull request Jun 10, 2025

Oracle Exascale Feature #29833

Closed

14 tasks

jackofallops requested changes Jun 24, 2025

View reviewed changes

github-actions bot assigned jackofallops Jun 24, 2025

github-actions bot added the waiting-response label Jun 24, 2025

jackofallops mentioned this pull request Jun 25, 2025

oracle - update to API version 2025-03-01 #29721

Merged

14 tasks

evgen-work force-pushed the oracle-update-exadata-infra branch from 7dc06e5 to 5d3a013 Compare June 25, 2025 20:16

github-actions bot removed the waiting-response label Jun 25, 2025

jackofallops added the waiting-response label Jul 2, 2025

jackofallops mentioned this pull request Jul 3, 2025

azurerm_oracle_autonomous_database - Add support for allowed_ips #29412

Merged

14 tasks

evgen-work force-pushed the oracle-update-exadata-infra branch from 5d3a013 to 176b252 Compare July 3, 2025 15:54

github-actions bot added size/L and removed waiting-response labels Jul 3, 2025

Update oracle exadata/vmcluster/db-system-shapes to follow oracledata…

79915b2

…base 2025-03-01

evgen-work force-pushed the oracle-update-exadata-infra branch from 176b252 to 79915b2 Compare July 3, 2025 15:57

jackofallops requested changes Jul 4, 2025

View reviewed changes

website/docs/r/oracle_exadata_infrastructure.html.markdown Outdated Show resolved Hide resolved

internal/services/oracle/oracle_exadata_infrastructure_resource.go Outdated Show resolved Hide resolved

internal/services/oracle/validate/cloud_vm_cluster.go Outdated Show resolved Hide resolved

github-actions bot added waiting-response and removed waiting-response labels Jul 4, 2025

github-actions bot added size/M and removed waiting-response labels Jul 4, 2025

github-actions bot added waiting-response and removed waiting-response labels Jul 4, 2025

mihretkidane-OCI and others added 2 commits July 4, 2025 12:42

Comment resolution, update documentation and small refactoring

70c94e6

Oracle - remove unused old vendor files

ef5e626

evgen-work force-pushed the oracle-update-exadata-infra branch from e2ec5ad to ef5e626 Compare July 4, 2025 16:44

jackofallops approved these changes Jul 7, 2025

View reviewed changes

jackofallops merged commit bdaa0bf into hashicorp:main Jul 7, 2025
33 checks passed

github-actions bot added this to the v4.36.0 milestone Jul 7, 2025

jackofallops added a commit that referenced this pull request Jul 7, 2025

Update CHANGELOG.md for #29801

360a154

mbfrahry pushed a commit that referenced this pull request Jul 10, 2025

Update CHANGELOG.md for #29801

8180c6b

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Oracle update exadata infra to support X11M shape #29801

Oracle update exadata infra to support X11M shape #29801

Uh oh!

mihretkidane-OCI commented Jun 4, 2025 •

edited

Loading

Uh oh!

mybayern1974 commented Jun 18, 2025

Uh oh!

mihretkidane-OCI commented Jun 18, 2025 •

edited

Loading

Uh oh!

jackofallops left a comment

Uh oh!

jackofallops Jun 24, 2025

Uh oh!

jackofallops Jun 24, 2025

Uh oh!

jackofallops Jun 24, 2025

Uh oh!

jackofallops Jun 24, 2025

Uh oh!

jackofallops Jun 24, 2025

Uh oh!

jackofallops Jun 24, 2025

Uh oh!

Uh oh!

jackofallops left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mihretkidane-OCI commented Jul 4, 2025

Uh oh!

jackofallops left a comment

Uh oh!

Uh oh!

Uh oh!

	state.ComputeModel = string(pointer.From(props.ComputeModel))
	state.ComputeModel = pointer.FromEnum(props.ComputeModel)

	ComputeModel: string(pointer.From(props.ComputeModel)),
	ComputeModel: pointer.FromEnum(props.ComputeModel),

	check.That(data.ResourceName).Key("shape").HasValue("Exadata.X11M"),
	check.That(data.ResourceName).Key("database_server_type").HasValue("X11M"),
	check.That(data.ResourceName).Key("storage_server_type").HasValue("X11M-HC"),

	errors = append(errors, fmt.Errorf("databse_server_type must be %d to %d characters", 1, 255))
	errors = append(errors, fmt.Errorf("%s must be %d to %d characters", k, 1, 255))

	errors = append(errors, fmt.Errorf("storage_server_type must be %d to %d characters", 1, 255))
	errors = append(errors, fmt.Errorf("%s must be %d to %d characters", k, 1, 255))

Oracle update exadata infra to support X11M shape #29801

Oracle update exadata infra to support X11M shape #29801

Uh oh!

Conversation

mihretkidane-OCI commented Jun 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Community Note

Description

oracle_exadata_infrastructure_resource , oracle_exadata_infrastructure_data_source

oracle_db_system_shapes_data_source

oracle_cloud_vm_cluster_data_source, oracle_cloud_vm_cluster_resource

oracle_db_servers_data_source

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

Rollback Plan

Changes to Security Controls

Uh oh!

mybayern1974 commented Jun 18, 2025

Uh oh!

mihretkidane-OCI commented Jun 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jackofallops left a comment

Choose a reason for hiding this comment

Uh oh!

jackofallops Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

jackofallops Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

jackofallops Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

jackofallops Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

jackofallops Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

jackofallops Jun 24, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jackofallops left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mihretkidane-OCI commented Jul 4, 2025

Uh oh!

jackofallops left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

mihretkidane-OCI commented Jun 4, 2025 •

edited

Loading

mihretkidane-OCI commented Jun 18, 2025 •

edited

Loading