Releasing version v5.0.0

Author: jotruon

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 5.0.0 (June 06, 2023)
+
+### Added
+- Support for Capacity Availability API
+- Support for Datalake/Lakehouse Feature for MySQL HeatWave
+- Support for Bulk include/exclude of migration objects enhancement. DatabaseMigration service
+- Support for region override in resource principal
+- Changes to README.md, License.txt, security.md and CONTRIBUTING.md for Github Audit Compliance.
+### Deprecation
+- Removed oci_identity_swift_password resource and datasource
+
 ## 4.123.0 (May 31, 2023)
 
 ### Added

CONTRIBUTING.md

@@ -1,24 +1,57 @@
-# Contributing to the Terraform provider for Oracle Cloud Infrastructure
+# Contributing to this repository
 
 *Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.*
 
-Pull requests can be made under
-[The Oracle Contributor Agreement](https://oca.opensource.oracle.com/)
-(OCA).
+We welcome your contributions! There are multiple ways to contribute.
 
-For pull requests to be accepted, the bottom of
-your commit message must have the following line using your name and
-e-mail address as it appears in the OCA Signatories list.
+## Opening issues
 
-```
+For bugs or enhancement requests, please file a GitHub issue unless it's
+security related. When filing a bug remember that the better written the bug is,
+the more likely it is to be fixed. If you think you've found a security
+vulnerability, do not raise a GitHub issue and follow the instructions in our
+[security policy](./SECURITY.md).
+
+## Contributing code
+
+We welcome your code contributions. Before submitting code via a pull request,
+you will need to have signed the [Oracle Contributor Agreement][OCA] (OCA) and
+your commits need to include the following line using the name and e-mail
+address you used to sign the OCA:
+
+```text
 Signed-off-by: Your Name <[email protected]>
 ```
 
-This can be automatically added to pull requests by committing with:
+This can be automatically added to pull requests by committing with `--sign-off`
+or `-s`, e.g.
 
-```
+```text
 git commit --signoff
-````
+```
+
+Only pull requests from committers that can be verified as having signed the OCA
+can be accepted.
+
+## Pull request process
+
+1. Ensure there is an issue created to track and discuss the fix or enhancement
+   you intend to submit.
+1. Fork this repository.
+1. Create a branch in your fork to implement the changes. We recommend using
+   the issue number as part of your branch name, e.g. `1234-fixes`.
+1. Ensure that any documentation is updated with the changes that are required
+   by your change.
+1. Ensure that any samples are updated if the base image has been changed.
+1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
+   what your changes are meant to do and provide simple steps on how to validate.
+   your changes. Ensure that you reference the issue you created as well.
+1. We will assign the pull request to 2-3 people for review before it is merged.
+
+## Code of conduct
+
+Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
+like more specific guidelines, see the [Contributor Covenant Code of Conduct][COC].
 
-Only pull requests from committers that can be verified as having
-signed the OCA can be accepted.
+[OCA]: https://oca.opensource.oracle.com
+[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/

LICENSE.md renamed to LICENSE.txt

@@ -1,13 +1,9 @@
-## NOTICE  
-**The OCI Terraform Provider is now available for automatic download through the Terraform Provider Registry. 
-For more information on how to get started view the [documentation](https://www.terraform.io/docs/providers/oci/index.html) 
-and [setup guide](https://www.terraform.io/docs/providers/oci/guides/version-3-upgrade.html).**
+# Terraform Provider for Oracle Cloud Infrastructure
 
-
-Terraform Provider for Oracle Cloud Infrastructure
-==================
+**The OCI Terraform Provider is now available for automatic download through the Terraform Provider Registry.**
 
 - [Documentation](https://www.terraform.io/docs/providers/oci/index.html)
+- [Setup guide](https://www.terraform.io/docs/providers/oci/guides/version-3-upgrade.html)
 - [Examples](https://github.com/oracle/terraform-provider-oci/tree/master/examples)
 - [OCI forums](https://cloudcustomerconnect.oracle.com/resources/9c8fa8f96f/summary)
 - [Github issues](https://github.com/oracle/terraform-provider-oci/issues)
@@ -16,15 +12,13 @@ Terraform Provider for Oracle Cloud Infrastructure
 [![wercker status](https://app.wercker.com/status/666d2ee10f45dde41189bb03248aadf9/s/master "wercker status")](https://app.wercker.com/project/byKey/666d2ee10f45dde41189bb03248aadf9)
 
 
-Requirements
-------------
+## Requirements
 
 - [Terraform](https://www.terraform.io/downloads.html) v0.12.31 or greater
 - [Go](https://golang.org/doc/install) 1.18.8 (recommended)
 
 
-Building the Provider
----------------------
+## Building the Provider
 
 Clone repository to: `$GOPATH/src/terraform-provider-oci`
 
@@ -41,19 +35,17 @@ $ make build
 ```
 
 
-Using the Provider
-----------------------
+## Installation
+
 If you're building the provider, follow the instructions to [install it as a plugin.](https://www.terraform.io/docs/plugins/basics.html#installing-a-plugin) 
 After placing it into your plugins directory,  run `terraform init` to initialize it and begin using Terraform with the Oracle Cloud Infrastructure provider.
 
 
-Troubleshooting the Provider
-----------------------
+## Troubleshooting the Provider
 
 See [verbose logging](https://www.terraform.io/docs/providers/oci/guides/troubleshooting.html#verbose-logging-for-oci-terraform-provider) for the details.
 
-Developing the Provider
----------------------------
+## Developing the Provider
 
 To add features to the provider, install [Go](http://www.golang.org) and configure your your [GOPATH](http://golang.org/doc/code.html#GOPATH)
 
@@ -70,3 +62,17 @@ $ make testacc
 ```
 
 > **Note:** The tests run against live OCI service APIs, you will need to configure environment variables with valid credientials as shown in the [documentation](https://www.terraform.io/docs/providers/oci/index.html).
+
+## Contributing
+
+This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)
+
+## Security
+
+Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
+
+## License
+
+Copyright (c) 2017, 2023 Oracle and/or its affiliates.
+
+Released under the Mozilla Public License 2.0

README.md

@@ -0,0 +1,38 @@
+# Reporting security vulnerabilities
+
+Oracle values the independent security research community and believes that
+responsible disclosure of security vulnerabilities helps us ensure the security
+and privacy of all our users.
+
+Please do NOT raise a GitHub Issue to report a security vulnerability. If you
+believe you have found a security vulnerability, please submit a report to
+[[email protected]][1] preferably with a proof of concept. Please review
+some additional information on [how to report security vulnerabilities to Oracle][2].
+We encourage people who contact Oracle Security to use email encryption using
+[our encryption key][3].
+
+We ask that you do not use other channels or contact the project maintainers
+directly.
+
+Non-vulnerability related security issues including ideas for new or improved
+security features are welcome on GitHub Issues.
+
+## Security updates, alerts and bulletins
+
+Security updates will be released on a regular cadence. Many of our projects
+will typically release security fixes in conjunction with the
+Oracle Critical Patch Update program. Additional
+information, including past advisories, is available on our [security alerts][4]
+page.
+
+## Security-related information
+
+We will provide security related information such as a threat model, considerations
+for secure use, or any known security issues in our documentation. Please note
+that labs and sample code are intended to demonstrate a concept and may not be
+sufficiently hardened for production use.
+
+[1]: mailto:[email protected]
+[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
+[3]: https://www.oracle.com/security-alerts/encryptionkey.html
+[4]: https://www.oracle.com/security-alerts/

SECURITY.md

@@ -0,0 +1,43 @@
+provider "oci" {
+  tenancy_ocid     = var.compartment_ocid
+  region           = var.region
+  user_ocid = var.user_ocid
+  fingerprint = var.fingerprint
+  private_key_path = var.private_key_path
+  retry_duration_seconds = "1800"
+}
+
+data "oci_identity_availability_domain" "ad" {
+  compartment_id = var.tenancy_ocid
+  ad_number      = 1
+}
+
+resource "oci_core_compute_capacity_report" "test_compute_capacity_report_flex_shape" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  shape_availabilities {
+    #Required
+    instance_shape = var.compute_capacity_report_shape_availabilities_instance_shape_flex
+
+    #Optional
+    fault_domain = var.compute_capacity_report_shape_availabilities_fault_domain
+    instance_shape_config {
+
+      #Optional
+      memory_in_gbs = var.compute_capacity_report_shape_availabilities_instance_shape_config_memory_in_gbs
+      nvmes         = var.compute_capacity_report_shape_availabilities_instance_shape_config_nvmes
+      ocpus         = var.compute_capacity_report_shape_availabilities_instance_shape_config_ocpus
+    }
+  }
+}
+
+resource "oci_core_compute_capacity_report" "test_compute_capacity_report_fix_shape" {
+  #Required
+  availability_domain = data.oci_identity_availability_domain.ad.name
+  compartment_id      = var.compartment_ocid
+  shape_availabilities {
+    #Required
+    instance_shape = var.compute_capacity_report_shape_availabilities_instance_shape_fix
+  }
+}

examples/compute/capacity_report/main.tf

@@ -0,0 +1,51 @@
+variable "region" {
+  description = "region in which to call API."
+}
+
+variable "compartment_ocid" {
+  description = "compartment_id in which to call API."
+}
+
+variable "tenancy_ocid" {
+  description = "tenancy OCID in which to launch instances."
+}
+
+variable "user_ocid" {
+  description = "user OCID for the user account with which to connect to the API."
+}
+
+variable "private_key_path" {
+  description = "full file path of the private key to use for API access with the user account. Does not support environment variables or ~ to abbreviate a user's home directory."
+}
+
+variable "fingerprint" {
+  description = "PEM fingerprint for private key."
+}
+
+variable "compute_capacity_report_availability_domain" {
+  description = "AD in which to call API."
+  default = "UgLr:PHX-AD-1"
+}
+
+variable "compute_capacity_report_shape_availabilities_fault_domain" {
+  description = "FD in which to call API."
+}
+
+variable "compute_capacity_report_shape_availabilities_instance_shape_flex" {
+  default = "VM.Standard.E4.Flex"
+}
+variable "compute_capacity_report_shape_availabilities_instance_shape_fix" {
+  default = "VM.Standard1.8"
+}
+
+variable "compute_capacity_report_shape_availabilities_instance_shape_config_memory_in_gbs" {
+  default = 16
+}
+
+variable "compute_capacity_report_shape_availabilities_instance_shape_config_nvmes" {
+  default = 2
+}
+
+variable "compute_capacity_report_shape_availabilities_instance_shape_config_ocpus" {
+  default = 1
+}

examples/compute/capacity_report/variablies.tf

@@ -19,6 +19,39 @@ variable "private_key_path" {
 variable "compartment_ocid" {
 }
 
+variable "kms_key_id" {
+}
+
+variable "kms_vault_id" {
+}
+
+variable "ssh_public_keys" {
+}
+
+variable "compartment_id" {
+}
+
+variable "database_id" {
+}
+
+variable "subnet_id" {
+}
+
+variable "vcn_id" {
+}
+
+variable "source_connection_id"{
+}
+
+variable "source_connection_container_id"{
+}
+
+variable "target_connection_id"{
+}
+
+variable "ssh_key" {
+}
+
 provider "oci" {
   tenancy_ocid     = var.tenancy_ocid
   user_ocid        = var.user_ocid
@@ -38,21 +71,6 @@ resource "random_string" "autonomous_database_admin_password" {
   override_special = "-_#"
 }
 
-variable "kms_key_id" {
-}
-
-variable "kms_vault_id" {
-}
-
-variable "ssh_public_keys" {
-}
-
-variable "compartment_id" {
-}
-
-variable "database_id" {
-}
-
 resource "oci_core_subnet" "test_subnet" {
   cidr_block = "10.0.0.0/24"
   compartment_id = var.compartment_id
@@ -153,10 +171,14 @@ resource "oci_database_migration_connection" "test_connection_source" {
 
 resource "oci_database_migration_migration" "test_migration" {
   compartment_id = var.compartment_id
+
+  #csvText - Optional
+  csv_text = "MY_BIZZ,SRC_CITY,TABLE,EXCLUDE"
+
   data_transfer_medium_details {
     object_storage_details {
-    bucket = "bucket"
-    namespace = "namespace"
+      bucket = "bucket"
+      namespace = "namespace"
     }
   }
   datapump_settings {
@@ -190,11 +212,12 @@ resource "oci_database_migration_migration" "test_migration" {
         username = "ggadmin"
       }
       target_microservices_deployment_name = "Target"
-      url = "https://130.35.83.125"
+      url = "https://10.0.0.0"
     }
   }
-  source_database_connection_id = "${oci_database_migration_connection.test_connection_source.id}"
-  target_database_connection_id = "${oci_database_migration_connection.test_connection_target.id}"
+  source_database_connection_id = var.source_connection_id
+  source_container_database_connection_id = var.source_connection_container_id
+  target_database_connection_id = var.target_connection_id
   type = "ONLINE"
   vault_details {
     compartment_id = var.compartment_id