Skip to content

Commit 6fe3acf

Browse files
varmax2511varmax2511
committed
support for ExaCS proxy field update
1 parent 306ffb7 commit 6fe3acf

17 files changed

+45
-41
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
## 3.56.1 (Unreleased)
1+
## 3.57.0 (Unreleased)
2+
3+
### Added
4+
- Support for change in `corporate_proxy` parameter in `oci_database_exadata_infrastructure`
5+
26
## 3.56.0 (December 18, 2019)
37

48
### Added

‎examples/database/exadata_cc/exadata-infrastructure.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
2222
cloud_control_plane_server1 = "192.168.19.1"
2323
cloud_control_plane_server2 = "192.168.19.2"
2424
compartment_id = "${var.compartment_id}"
25-
corporate_proxy = "http://192.168.19.1:80"
2625
display_name = "tstExaInfra"
2726
dns_server = ["192.168.10.10"]
2827
gateway = "192.168.20.1"
@@ -34,7 +33,8 @@ resource "oci_database_exadata_infrastructure" "test_exadata_infrastructure" {
3433
activation_file = "activation.zip"
3534

3635
#Optional
37-
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedvalue")}"
36+
corporate_proxy = "http://192.168.19.1:80"
37+
defined_tags = "${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedvalue")}"
3838

3939
freeform_tags = {
4040
"Department" = "Accounting"

‎oci/database_exadata_infrastructure_resource.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ func DatabaseExadataInfrastructureResource() *schema.Resource {
4040
Type: schema.TypeString,
4141
Required: true,
4242
},
43-
"corporate_proxy": {
44-
Type: schema.TypeString,
45-
Required: true,
46-
},
4743
"display_name": {
4844
Type: schema.TypeString,
4945
Required: true,
@@ -86,6 +82,11 @@ func DatabaseExadataInfrastructureResource() *schema.Resource {
8682
},
8783

8884
// Optional
85+
"corporate_proxy": {
86+
Type: schema.TypeString,
87+
Optional: true,
88+
Computed: true,
89+
},
8990
"activation_file": {
9091
Type: schema.TypeString,
9192
Optional: true,

‎oci/database_exadata_infrastructure_resource_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ var (
2525
"cloud_control_plane_server1": Representation{repType: Required, create: `192.168.19.1`, update: `192.168.19.3`},
2626
"cloud_control_plane_server2": Representation{repType: Required, create: `192.168.19.2`, update: `192.168.19.4`},
2727
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
28-
"corporate_proxy": Representation{repType: Required, create: `http://192.168.19.1:80`, update: `http://192.168.19.2:80`},
2928
"display_name": Representation{repType: Required, create: `tstExaInfra`},
3029
"dns_server": Representation{repType: Required, create: []string{`192.168.10.10`}, update: []string{`192.168.10.11`, `192.168.10.12`}},
3130
"gateway": Representation{repType: Required, create: `192.168.20.1`, update: `192.168.20.2`},
@@ -34,6 +33,7 @@ var (
3433
"ntp_server": Representation{repType: Required, create: []string{`192.168.10.20`}, update: []string{`192.168.10.22`, `192.168.10.24`}},
3534
"shape": Representation{repType: Required, create: `ExadataCC.Quarter3.100`},
3635
"time_zone": Representation{repType: Required, create: `US/Pacific`, update: `UTC`},
36+
"corporate_proxy": Representation{repType: Optional, create: `http://192.168.19.1:80`, update: `http://192.168.19.2:80`},
3737
"defined_tags": Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
3838
"freeform_tags": Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
3939
}

‎oci/database_exadata_infrastructure_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ var (
4444
"cloud_control_plane_server1": Representation{repType: Required, create: `192.168.19.1`, update: `192.168.19.3`},
4545
"cloud_control_plane_server2": Representation{repType: Required, create: `192.168.19.2`, update: `192.168.19.4`},
4646
"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
47-
"corporate_proxy": Representation{repType: Required, create: `http://192.168.19.1:80`, update: `http://192.168.19.2:80`},
4847
"display_name": Representation{repType: Required, create: `tstExaInfra`},
4948
"dns_server": Representation{repType: Required, create: []string{`192.168.10.10`}, update: []string{`192.168.10.11`, `192.168.10.12`}},
5049
"gateway": Representation{repType: Required, create: `192.168.20.1`, update: `192.168.20.2`},
@@ -53,6 +52,7 @@ var (
5352
"ntp_server": Representation{repType: Required, create: []string{`192.168.10.20`}, update: []string{`192.168.10.22`, `192.168.10.24`}},
5453
"shape": Representation{repType: Required, create: `ExadataCC.Quarter3.100`},
5554
"time_zone": Representation{repType: Required, create: `US/Pacific`, update: `UTC`},
55+
"corporate_proxy": Representation{repType: Optional, create: `http://192.168.19.1:80`, update: `http://192.168.19.2:80`},
5656
"defined_tags": Representation{repType: Optional, create: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "value")}`, update: `${map("${oci_identity_tag_namespace.tag-namespace1.name}.${oci_identity_tag.tag1.name}", "updatedValue")}`},
5757
"freeform_tags": Representation{repType: Optional, create: map[string]string{"Department": "Finance"}, update: map[string]string{"Department": "Accounting"}},
5858
}
@@ -95,7 +95,6 @@ func TestDatabaseExadataInfrastructureResource_basic(t *testing.T) {
9595
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server1", "192.168.19.1"),
9696
resource.TestCheckResourceAttr(resourceName, "cloud_control_plane_server2", "192.168.19.2"),
9797
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
98-
resource.TestCheckResourceAttr(resourceName, "corporate_proxy", "http://192.168.19.1:80"),
9998
resource.TestCheckResourceAttr(resourceName, "display_name", "tstExaInfra"),
10099
resource.TestCheckResourceAttr(resourceName, "dns_server.#", "1"),
101100
resource.TestCheckResourceAttr(resourceName, "gateway", "192.168.20.1"),

‎website/docs/d/database_data_guard_association.html.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The following attributes are exported:
4242
* `lifecycle_details` - Additional information about the current lifecycleState, if available.
4343
* `peer_data_guard_association_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the peer database's Data Guard association.
4444
* `peer_database_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the associated peer database.
45-
* `peer_db_home_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the database home containing the associated peer database.
45+
* `peer_db_home_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Database Home containing the associated peer database.
4646
* `peer_db_system_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the DB system containing the associated peer database.
4747
* `peer_role` - The role of the peer database in this Data Guard association.
4848
* `protection_mode` - The protection mode of this Data Guard association. For more information, see [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) in the Oracle Data Guard documentation.

‎website/docs/d/database_data_guard_associations.html.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ The following attributes are exported:
4646
* `lifecycle_details` - Additional information about the current lifecycleState, if available.
4747
* `peer_data_guard_association_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the peer database's Data Guard association.
4848
* `peer_database_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the associated peer database.
49-
* `peer_db_home_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the database home containing the associated peer database.
49+
* `peer_db_home_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Database Home containing the associated peer database.
5050
* `peer_db_system_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the DB system containing the associated peer database.
5151
* `peer_role` - The role of the peer database in this Data Guard association.
5252
* `protection_mode` - The protection mode of this Data Guard association. For more information, see [Oracle Data Guard Protection Modes](http://docs.oracle.com/database/122/SBYDB/oracle-data-guard-protection-modes.htm#SBYDB02000) in the Oracle Data Guard documentation.

‎website/docs/d/database_database.html.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The following attributes are exported:
4545
* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the backup destination.
4646
* `type` - Type of the database backup destination.
4747
* `recovery_window_in_days` - Number of days between the current and the earliest point of recoverability covered by automatic backups. This value applies to automatic backups only. After a new automatic backup has been created, Oracle removes old automatic backups that are created before the window. When the value is updated, it is applied to all existing automatic backups.
48-
* `db_home_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the database home.
48+
* `db_home_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Database Home.
4949
* `db_name` - The database name.
5050
* `db_unique_name` - A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed.
5151
* `db_workload` - The database workload type.

‎website/docs/d/database_databases.html.markdown‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: |-
1010
# Data Source: oci_database_databases
1111
This data source provides the list of Databases in Oracle Cloud Infrastructure Database service.
1212

13-
Gets a list of the databases in the specified database home.
13+
Gets a list of the databases in the specified Database Home.
1414

1515

1616
## Example Usage
@@ -32,7 +32,7 @@ data "oci_database_databases" "test_databases" {
3232
The following arguments are supported:
3333

3434
* `compartment_id` - (Required) The compartment [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).
35-
* `db_home_id` - (Required) A database home [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).
35+
* `db_home_id` - (Required) A Database Home [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).
3636
* `db_name` - (Optional) A filter to return only resources that match the entire database name given. The match is not case sensitive.
3737
* `state` - (Optional) A filter to return only resources that match the given lifecycle state exactly.
3838

@@ -60,7 +60,7 @@ The following attributes are exported:
6060
* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the backup destination.
6161
* `type` - Type of the database backup destination.
6262
* `recovery_window_in_days` - Number of days between the current and the earliest point of recoverability covered by automatic backups. This value applies to automatic backups only. After a new automatic backup has been created, Oracle removes old automatic backups that are created before the window. When the value is updated, it is applied to all existing automatic backups.
63-
* `db_home_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the database home.
63+
* `db_home_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Database Home.
6464
* `db_name` - The database name.
6565
* `db_unique_name` - A system-generated name for the database to ensure uniqueness within an Oracle Data Guard group (a primary database and its standby databases). The unique name cannot be changed.
6666
* `db_workload` - The database workload type.

‎website/docs/d/database_db_home.html.markdown‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: |-
1010
# Data Source: oci_database_db_home
1111
This data source provides details about a specific Db Home resource in Oracle Cloud Infrastructure Database service.
1212

13-
Gets information about the specified database home.
13+
Gets information about the specified Database Home.
1414

1515
## Example Usage
1616

@@ -25,7 +25,7 @@ data "oci_database_db_home" "test_db_home" {
2525

2626
The following arguments are supported:
2727

28-
* `db_home_id` - (Required) The database home [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).
28+
* `db_home_id` - (Required) The Database Home [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm).
2929

3030

3131
## Attributes Reference
@@ -35,10 +35,10 @@ The following attributes are exported:
3535
* `compartment_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment.
3636
* `db_system_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the DB system.
3737
* `db_version` - The Oracle Database version.
38-
* `display_name` - The user-provided name for the database home. The name does not need to be unique.
39-
* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the database home.
38+
* `display_name` - The user-provided name for the Database Home. The name does not need to be unique.
39+
* `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the Database Home.
4040
* `last_patch_history_entry_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the last patch history. This value is updated as soon as a patch operation is started.
41-
* `state` - The current state of the database home.
42-
* `time_created` - The date and time the database home was created.
41+
* `state` - The current state of the Database Home.
42+
* `time_created` - The date and time the Database Home was created.
4343
* `vm_cluster_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the VM cluster.
4444

0 commit comments

Comments
 (0)