Skip to content

Commit ce7e0a4

Browse files
feat: add gcp_oracle_zone field in Oracledatabase OdbNetwork resource (#15200)
1 parent 84b955d commit ce7e0a4

File tree

3 files changed

+36
-1
lines changed

3 files changed

+36
-1
lines changed

mmv1/products/oracledatabase/OdbNetwork.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import_format:
2727
custom_code:
2828
pre_delete: 'templates/terraform/pre_delete/oracledatabase_odbnetwork.go.tmpl'
2929
examples:
30-
- name: oracledatabase_odbnetwork
30+
- name: oracledatabase_odbnetwork_basic
3131
primary_resource_id: my-odbnetwork
3232
vars:
3333
project: my-project
@@ -39,6 +39,18 @@ examples:
3939
deletion_protection: 'false'
4040
project: '"oci-terraform-testing-prod"'
4141
odb_network_id: 'fmt.Sprintf("tf-test-odbnetwork-%s", acctest.RandString(t, 10))'
42+
- name: oracledatabase_odbnetwork_full
43+
primary_resource_id: my-odbnetwork
44+
vars:
45+
project: my-project
46+
odb_network_id: my-odbnetwork
47+
deletion_protection: 'true'
48+
ignore_read_extra:
49+
- 'deletion_protection'
50+
test_vars_overrides:
51+
deletion_protection: 'false'
52+
project: '"oci-terraform-testing-prod"'
53+
odb_network_id: 'fmt.Sprintf("tf-test-odbnetwork-full-%s", acctest.RandString(t, 10))'
4254
virtual_fields:
4355
- name: 'deletion_protection'
4456
type: Boolean
@@ -104,6 +116,13 @@ properties:
104116
The name of the VPC network in the following format:
105117
projects/{project}/global/networks/{network}
106118
required: true
119+
- name: gcpOracleZone
120+
type: String
121+
description: |-
122+
The GCP Oracle zone where OdbNetwork is hosted.
123+
Example: us-east4-b-r2.
124+
If not specified, the system will pick a zone based on availability.
125+
default_from_api: true
107126
- name: state
108127
type: String
109128
description: |-

mmv1/templates/terraform/examples/oracledatabase_odbnetwork.tf.tmpl renamed to mmv1/templates/terraform/examples/oracledatabase_odbnetwork_basic.tf.tmpl

File renamed without changes.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
resource "google_oracle_database_odb_network" "{{$.PrimaryResourceId}}"{
2+
odb_network_id = "{{index $.Vars "odb_network_id"}}"
3+
location = "us-west3"
4+
project = "{{index $.Vars "project"}}"
5+
network = data.google_compute_network.default.id
6+
gcp_oracle_zone = "us-west3-a-r1"
7+
labels = {
8+
terraform_created = "true"
9+
}
10+
deletion_protection = "{{index $.Vars "deletion_protection"}}"
11+
}
12+
13+
data "google_compute_network" "default" {
14+
name = "new"
15+
project = "{{index $.Vars "project"}}"
16+
}

0 commit comments

Comments
 (0)