Merge branch 'master' of ssh://bitbucket.oci.oraclecorp.com:7999/orc/terraform-provider into release_gh

Author: sahilg11

CHANGELOG.md

@@ -1,3 +1,20 @@
+## 4.94.0 (Unreleased)
+
+### Added
+- Support for Data Integration Service (DIS) Feature/Enhancement Release - 22b removing one check in test
+- Improve Resource discovery error messaging
+- Support for Cost Management: Scheduled Reports 2.0
+- Terraform support for Activate and Deactivate actions of Model Deployment
+- Support for GoldenGate Display Trails and Size
+- Support for VBS integration in CDTS
+- Support for Oracle Cloud Bridge
+- Support for Ingest Time Rules and new optional attributes in Object Collection Rule
+- Support for Oracle Cloud Migrations
+### Bug Fix
+- update the load balancer ports
+- Resource discovery bug for export drg route distribution
+- Remove Rrset from resource discovery to fix duplicate resource in config
+
 ## 4.93.0 (September 14, 2022)
 
 ### Added

examples/cloudBridge/AgentPlugins/agent_plugin.tf

@@ -0,0 +1,42 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+
+variable "agent_plugin_desired_state" {
+  default = "ENABLED"
+}
+
+variable "agent_plugin_plugin_name" {
+  default = "pluginName"
+}
+
+
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+resource "oci_cloud_bridge_agent_plugin" "test_agent_plugin" {
+  #Required
+  agent_id    = oci_cloud_bridge_agent.test_agent.id
+  plugin_name = var.agent_plugin_plugin_name
+
+  #Optional
+  desired_state = var.agent_plugin_desired_state
+}
+
+data "oci_cloud_bridge_agent_plugins" "test_agent_plugins" {
+  #Required
+  agent_id    = oci_cloud_bridge_agent.test_agent.id
+  plugin_name = var.agent_plugin_plugin_name
+}
+

examples/cloudBridge/Agents/agent.tf

@@ -0,0 +1,73 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_id" {}
+
+variable "agent_agent_type" {
+  default = "APPLIANCE"
+}
+
+variable "agent_agent_version" {
+  default = "agentVersion"
+}
+
+variable "agent_defined_tags_value" {
+  default = "value"
+}
+
+variable "agent_display_name" {
+  default = "displayName"
+}
+
+variable "agent_freeform_tags" {
+  default = { "Department" = "Finance" }
+}
+
+variable "agent_os_version" {
+  default = "osVersion"
+}
+
+variable "agent_state" {
+  default = "AVAILABLE"
+}
+
+
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+resource "oci_cloud_bridge_agent" "test_agent" {
+  #Required
+  agent_type     = var.agent_agent_type
+  agent_version  = var.agent_agent_version
+  compartment_id = var.compartment_id
+  display_name   = var.agent_display_name
+  environment_id = oci_cloud_bridge_environment.test_environment.id
+  os_version     = var.agent_os_version
+
+  #Optional
+  defined_tags  = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.agent_defined_tags_value)
+  freeform_tags = var.agent_freeform_tags
+}
+
+data "oci_cloud_bridge_agents" "test_agents" {
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  agent_id       = oci_cloud_bridge_agent.test_agent.id
+  display_name   = var.agent_display_name
+  environment_id = oci_cloud_bridge_environment.test_environment.id
+  state          = var.agent_state
+}
+

examples/cloudBridge/ApplianceImages/appliance_image.tf

@@ -0,0 +1,32 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_id" {}
+
+variable "appliance_image_display_name" {
+  default = "displayName"
+}
+
+
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+data "oci_cloud_bridge_appliance_images" "test_appliance_images" {
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  display_name = var.appliance_image_display_name
+}
+

examples/cloudBridge/AssetSources/asset_source.tf

@@ -0,0 +1,103 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+variable "compartment_id" {}
+
+variable "asset_source_are_historical_metrics_collected" {
+  default = false
+}
+
+variable "asset_source_are_realtime_metrics_collected" {
+  default = false
+}
+
+variable "asset_source_defined_tags_value" {
+  default = "value"
+}
+
+variable "asset_source_discovery_credentials_type" {
+  default = "BASIC"
+}
+
+variable "asset_source_display_name" {
+  default = "displayName"
+}
+
+variable "asset_source_freeform_tags" {
+  default = { "Department" = "Finance" }
+}
+
+variable "asset_source_replication_credentials_type" {
+  default = "BASIC"
+}
+
+variable "asset_source_state" {
+  default = "AVAILABLE"
+}
+
+variable "asset_source_system_tags" {
+  default = "value"
+}
+
+variable "asset_source_type" {
+  default = "VMWARE"
+}
+
+variable "asset_source_vcenter_endpoint" {
+  default = "vcenterEndpoint"
+}
+
+
+
+provider "oci" {
+  tenancy_ocid     = var.tenancy_ocid
+  user_ocid        = var.user_ocid
+  fingerprint      = var.fingerprint
+  private_key_path = var.private_key_path
+  region           = var.region
+}
+
+resource "oci_cloud_bridge_asset_source" "test_asset_source" {
+  #Required
+  assets_compartment_id = oci_identity_compartment.test_compartment.id
+  compartment_id        = var.compartment_id
+  discovery_credentials {
+    #Required
+    secret_id = oci_vault_secret.test_secret.id
+    type      = var.asset_source_discovery_credentials_type
+  }
+  environment_id   = oci_cloud_bridge_environment.test_environment.id
+  inventory_id     = oci_cloud_bridge_inventory.test_inventory.id
+  type             = var.asset_source_type
+  vcenter_endpoint = var.asset_source_vcenter_endpoint
+
+  #Optional
+  are_historical_metrics_collected = var.asset_source_are_historical_metrics_collected
+  are_realtime_metrics_collected   = var.asset_source_are_realtime_metrics_collected
+  defined_tags                     = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.asset_source_defined_tags_value)
+  discovery_schedule_id            = oci_cloud_bridge_discovery_schedule.test_discovery_schedule.id
+  display_name                     = var.asset_source_display_name
+  freeform_tags                    = var.asset_source_freeform_tags
+  replication_credentials {
+    #Required
+    secret_id = oci_vault_secret.test_secret.id
+    type      = var.asset_source_replication_credentials_type
+  }
+  system_tags = var.asset_source_system_tags
+}
+
+data "oci_cloud_bridge_asset_sources" "test_asset_sources" {
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  asset_source_id = oci_cloud_bridge_asset_source.test_asset_source.id
+  display_name    = var.asset_source_display_name
+  state           = var.asset_source_state
+}
+