diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a0265c67f1..a6f2bf9bef3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +## 6.16.0 (October 30, 2024) + +### Added +- Support for ESP & ICMP traffic support in NLB +- override_existing flag for container_engine.addon resource +- Support for Extending LBaaS to send traffic to gRPC backends +- Support to return the generated secret in response +- Support for Model Version Set - DataScience BugFix +- pdated resource scheduler public documentation +### Bug Fix +- Updated oci_core_instance_pool resource to allow unordered attach/detach operationsupdating tests to generate reports for Acceptance and Backward compatibility +- Fix Audit and SQL Firewall bugs - DataSafe + ## 6.15.0 (October 23, 2024) ### Added diff --git a/examples/compute/instance_pool/instance_pool.tf b/examples/compute/instance_pool/instance_pool.tf index 798297b1cef..8788cc33e24 100644 --- a/examples/compute/instance_pool/instance_pool.tf +++ b/examples/compute/instance_pool/instance_pool.tf @@ -333,11 +333,6 @@ data "oci_core_instance" "test_instance_pool_instance_singular_datasource" { instance_id = data.oci_core_instance_pool_instances.test_instance_pool_instances_datasource.instances[count.index]["id"] } -data "oci_core_instance_pool_load_balancer_attachment" "test_instance_pool_load_balancer_attachment" { - instance_pool_id = oci_core_instance_pool.test_instance_pool.id - instance_pool_load_balancer_attachment_id = oci_core_instance_pool.test_instance_pool.load_balancers[0].id -} - output "pooled_instances_private_ips" { value = [data.oci_core_instance.test_instance_pool_instance_singular_datasource.*.private_ip] } @@ -350,7 +345,3 @@ output "pooled_instances_hostname_labels" { value = [data.oci_core_instance.test_instance_pool_instance_singular_datasource.*.hostname_label] } -output "load_balancer_backend_set_name" { - value = [data.oci_core_instance_pool_load_balancer_attachment.test_instance_pool_load_balancer_attachment.backend_set_name] -} - diff --git a/examples/compute/instance_pool/instance_pool_ipv6.tf b/examples/compute/instance_pool/instance_pool_ipv6.tf index dfcf68df715..fb637a0abb8 100644 --- a/examples/compute/instance_pool/instance_pool_ipv6.tf +++ b/examples/compute/instance_pool/instance_pool_ipv6.tf @@ -140,7 +140,7 @@ resource "oci_core_instance_configuration" "test_instance_configuration_ipv6" { assign_public_ip = true display_name = "TestInstanceConfigurationVNIC" skip_source_dest_check = false - subnet_id = oci_core_subnet.test_subnet.id + subnet_id = oci_core_subnet.test_subnet_ipv6.id assign_ipv6ip = true ipv6address_ipv6subnet_cidr_pair_details { ipv6subnet_cidr = oci_core_subnet.test_subnet_ipv6.ipv6cidr_blocks[0] @@ -161,7 +161,7 @@ resource "oci_core_instance_configuration" "test_instance_configuration_ipv6" { secondary_vnics { display_name = "TestInstancePoolSecondaryVNIC" create_vnic_details { - subnet_id = oci_core_subnet.test_subnet.id + subnet_id = oci_core_subnet.test_subnet_ipv6.id assign_ipv6ip = true display_name = "TestInstancePoolSecondaryVNIC" ipv6address_ipv6subnet_cidr_pair_details { diff --git a/examples/container_engine/addons/main.tf b/examples/container_engine/addons/main.tf index 6e52f56c207..cd7ebb430be 100644 --- a/examples/container_engine/addons/main.tf +++ b/examples/container_engine/addons/main.tf @@ -20,7 +20,7 @@ provider "oci" { } /* -A complete example to setup a cluster, then configure add-ons, then create node pool. +A complete example to setup a cluster, then configure add-ons. */ data "oci_identity_availability_domain" "ad1" { compartment_id = var.tenancy_ocid @@ -51,17 +51,16 @@ resource "oci_core_route_table" "test_route_table" { } } -resource "oci_core_subnet" "nodePool_Subnet_1" { - #Required - availability_domain = data.oci_identity_availability_domain.ad1.name - cidr_block = "10.0.22.0/24" - compartment_id = var.compartment_ocid - vcn_id = oci_core_vcn.test_vcn.id - - # Provider code tries to maintain compatibility with old versions. - security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id] - display_name = "tfSubNet1ForNodePool" - route_table_id = oci_core_route_table.test_route_table.id +resource "oci_core_subnet" "api_endpoint_subnet" { + #Required + cidr_block = "10.0.23.0/24" + compartment_id = var.compartment_ocid + vcn_id = oci_core_vcn.test_vcn.id + + # Provider code tries to maintain compatibility with old versions. + security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id] + display_name = "apiEndpointSubnet" + route_table_id = oci_core_route_table.test_route_table.id } resource "oci_containerengine_cluster" "test_cluster" { @@ -71,6 +70,9 @@ resource "oci_containerengine_cluster" "test_cluster" { name = "tfTestCluster" vcn_id = oci_core_vcn.test_vcn.id type = "ENHANCED_CLUSTER" + endpoint_config { + subnet_id = oci_core_subnet.api_endpoint_subnet.id + } } resource "oci_containerengine_addon" "dashboard" { @@ -80,6 +82,11 @@ resource "oci_containerengine_addon" "dashboard" { cluster_id = oci_containerengine_cluster.test_cluster.id #Required, remove the resource on addon deletion remove_addon_resources_on_delete = true + + #Optional, will override an existing installation if true and Addon already exists + override_existing = false + + #Optional dynamic configurations { for_each = local.addon_mappings @@ -90,60 +97,11 @@ resource "oci_containerengine_addon" "dashboard" { } } -resource "oci_containerengine_node_pool" "test_node_pool" { - #Required - cluster_id = oci_containerengine_cluster.test_cluster.id - compartment_id = var.compartment_ocid - kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0] - name = "tfPool" - node_shape = "VM.Standard2.1" - - node_config_details { - size = 1 - placement_configs { - availability_domain = data.oci_identity_availability_domain.ad1.name - subnet_id = oci_core_subnet.nodePool_Subnet_1.id - } - } - - node_source_details { - #Required - image_id = local.image_id - source_type = "IMAGE" - - #Optional - boot_volume_size_in_gbs = "60" - } - - //use terraform depends_on to enforce cluster->add-on->node pool DAG - depends_on = [oci_containerengine_addon.dashboard] -} - data "oci_containerengine_cluster_option" "test_cluster_option" { cluster_option_id = "all" } -data "oci_containerengine_node_pool_option" "test_node_pool_option" { - node_pool_option_id = "all" - compartment_id = var.compartment_ocid -} - -data "oci_core_images" "shape_specific_images" { - #Required - compartment_id = var.tenancy_ocid - shape = "VM.Standard2.1" -} - locals { - all_images = "${data.oci_core_images.shape_specific_images.images}" - all_sources = "${data.oci_containerengine_node_pool_option.test_node_pool_option.sources}" - - compartment_images = [for image in local.all_images : image.id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",image.display_name)) > 0 ] - - oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0] - - image_id = tolist(setintersection( toset(local.compartment_images), toset(local.oracle_linux_images)))[0] - addon_mappings = { mapping1 = { key = "numOfReplicas" diff --git a/examples/globally_distributed_database/README.md b/examples/globally_distributed_database/README.md index 46e150c2789..35db21c33cb 100644 --- a/examples/globally_distributed_database/README.md +++ b/examples/globally_distributed_database/README.md @@ -1,4 +1,6 @@ -# Overview -This is a Terraform configuration that creates the Globally Distributed Database service on Oracle Cloud Infrastructure. +# Overview +This is a Terraform configuration that creates the `globally_distributed_database` service on Oracle Cloud Infrastructure. + +The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources. ## Magic Button [![Deploy to Oracle Cloud](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle/terraform-provider-oci/raw/master/examples/zips/globally_distributed_database.zip) \ No newline at end of file diff --git a/examples/globally_distributed_database/description.md b/examples/globally_distributed_database/description.md new file mode 100644 index 00000000000..4252927019c --- /dev/null +++ b/examples/globally_distributed_database/description.md @@ -0,0 +1,4 @@ +# Overview +This is a Terraform configuration that creates the `globally_distributed_database` service on Oracle Cloud Infrastructure. + +The Terraform code is used to create a Resource Manager stack, that creates the required resources and configures the application on the created resources. \ No newline at end of file diff --git a/examples/network_load_balancer/network_load_balancer_full/nlb_full.tf b/examples/network_load_balancer/network_load_balancer_full/nlb_full.tf index 4f4ea8fe5ac..8f67e50a622 100644 --- a/examples/network_load_balancer/network_load_balancer_full/nlb_full.tf +++ b/examples/network_load_balancer/network_load_balancer_full/nlb_full.tf @@ -409,6 +409,32 @@ resource "oci_network_load_balancer_backend_set" "nlb-bes3" { depends_on = [oci_network_load_balancer_backend_set.nlb-bes2] } +resource "oci_network_load_balancer_backend_set" "nlb-bes4" { + name = "nlb-bes4" + network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb1.id + policy = "THREE_TUPLE" + is_fail_open = false + is_instant_failover_enabled = true + is_preserve_source = true + + health_checker { + port = "53" + protocol = "DNS" + timeout_in_millis = 10000 + interval_in_millis = 10000 + retries = 3 + dns { + domain_name = "oracle.com" + query_class = "IN" + query_type = "A" + rcodes = ["NOERROR", "SERVFAIL"] + transport_protocol = "UDP" + } + } + depends_on = [oci_network_load_balancer_backend_set.nlb-bes3] +} + + resource "oci_network_load_balancer_listener" "nlb-listener1" { network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb1.id name = "tcp_listener" @@ -417,7 +443,7 @@ resource "oci_network_load_balancer_listener" "nlb-listener1" { protocol = "TCP" tcp_idle_timeout = 360 is_ppv2enabled = true - depends_on = [oci_network_load_balancer_backend_set.nlb-bes3] + depends_on = [oci_network_load_balancer_backend_set.nlb-bes4] } resource "oci_network_load_balancer_listener" "nlb-listener2" { @@ -441,6 +467,18 @@ resource "oci_network_load_balancer_listener" "nlb-listener3" { depends_on = [oci_network_load_balancer_listener.nlb-listener2] } +resource "oci_network_load_balancer_listener" "nlb-listener4" { + network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb1.id + name = "l3_ip_listener" + default_backend_set_name = oci_network_load_balancer_backend_set.nlb-bes4.name + port = 0 + protocol = "L3IP" + tcp_idle_timeout = 240 + udp_idle_timeout = 180 + l3ip_idle_timeout = 360 + depends_on = [oci_network_load_balancer_listener.nlb-listener3] +} + resource "oci_network_load_balancer_backend" "nlb-be1" { network_load_balancer_id = oci_network_load_balancer_network_load_balancer.nlb1.id backend_set_name = oci_network_load_balancer_backend_set.nlb-bes1.name @@ -450,7 +488,7 @@ resource "oci_network_load_balancer_backend" "nlb-be1" { is_drain = false is_offline = false weight = 1 - depends_on = [oci_network_load_balancer_listener.nlb-listener3] + depends_on = [oci_network_load_balancer_listener.nlb-listener4] } resource "oci_network_load_balancer_backend" "nlb-be2" { diff --git a/examples/resourcescheduler/main.tf b/examples/resourcescheduler/main.tf index 1f49d0c7bdd..3ac2c97248a 100644 --- a/examples/resourcescheduler/main.tf +++ b/examples/resourcescheduler/main.tf @@ -29,11 +29,11 @@ variable "schedule_freeform_tags" { } variable "schedule_recurrence_details" { - default = "recurrenceDetails" + default = "FREQ=DAILY;INTERVAL=1" } variable "schedule_recurrence_type" { - default = "CRON" + default = "ICAL" } variable "schedule_resource_filters_attribute" { @@ -69,19 +69,18 @@ variable "schedule_resources_metadata" { } variable "schedule_state" { - default = "AVAILABLE" + default = "ACTIVE" } variable "schedule_time_ends" { - default = "timeEnds" + default = "2024-07-23T17:45:44.408Z" } variable "schedule_time_starts" { - default = "timeStarts" + default = "2024-07-13T17:45:44.408Z" } - provider "oci" { tenancy_ocid = var.tenancy_ocid user_ocid = var.user_ocid @@ -97,33 +96,38 @@ resource "oci_resource_scheduler_schedule" "test_schedule" { recurrence_details = var.schedule_recurrence_details recurrence_type = var.schedule_recurrence_type - #Optional - defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.schedule_defined_tags_value) - description = var.schedule_description - display_name = var.schedule_display_name - freeform_tags = var.schedule_freeform_tags resource_filters { - #Required - attribute = var.schedule_resource_filters_attribute - - #Optional - condition = var.schedule_resource_filters_condition - should_include_child_compartments = var.schedule_resource_filters_should_include_child_compartments + # Required + attribute = "DEFINED_TAGS" value { - - #Optional - namespace = var.schedule_resource_filters_value_namespace - tag_key = var.schedule_resource_filters_value_tag_key - value = var.schedule_resource_filters_value_value + namespace="ResourceSchedulerCanary" + tag_key="ScheduleTagFilterTestKey" + value="foo" } } - resources { - #Required - id = var.schedule_resources_id - - #Optional - metadata = var.schedule_resources_metadata + resource_filters { + # Required + attribute = "LIFECYCLE_STATE" + value { + value="running" + } + value { + value="stopped" + } + } + resource_filters { + # Required + attribute = "COMPARTMENT_ID" + value { + value=var.compartment_id + } } + + #Optional + defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.schedule_defined_tags_value) + description = var.schedule_description + display_name = var.schedule_display_name + freeform_tags = var.schedule_freeform_tags time_ends = var.schedule_time_ends time_starts = var.schedule_time_starts } diff --git a/examples/zips/adm.zip b/examples/zips/adm.zip index a3250cfb88b..7332d987e83 100644 Binary files a/examples/zips/adm.zip and b/examples/zips/adm.zip differ diff --git a/examples/zips/aiAnomalyDetection.zip b/examples/zips/aiAnomalyDetection.zip index 9ee9915b9a5..0defb2b23f5 100644 Binary files a/examples/zips/aiAnomalyDetection.zip and b/examples/zips/aiAnomalyDetection.zip differ diff --git a/examples/zips/aiDocument.zip b/examples/zips/aiDocument.zip index e4f07238ec9..72078729b53 100644 Binary files a/examples/zips/aiDocument.zip and b/examples/zips/aiDocument.zip differ diff --git a/examples/zips/aiLanguage.zip b/examples/zips/aiLanguage.zip index f6c952f09ee..4b228a8d623 100644 Binary files a/examples/zips/aiLanguage.zip and b/examples/zips/aiLanguage.zip differ diff --git a/examples/zips/aiVision.zip b/examples/zips/aiVision.zip index fc8e12547a4..824b3b2c2c5 100644 Binary files a/examples/zips/aiVision.zip and b/examples/zips/aiVision.zip differ diff --git a/examples/zips/always_free.zip b/examples/zips/always_free.zip index 95eb8721e2c..f2eba006b1e 100644 Binary files a/examples/zips/always_free.zip and b/examples/zips/always_free.zip differ diff --git a/examples/zips/analytics.zip b/examples/zips/analytics.zip index 5262ca4c3e9..07fe00ba6f3 100644 Binary files a/examples/zips/analytics.zip and b/examples/zips/analytics.zip differ diff --git a/examples/zips/announcements_service.zip b/examples/zips/announcements_service.zip index 9bbcd0c47d6..c44ac649dec 100644 Binary files a/examples/zips/announcements_service.zip and b/examples/zips/announcements_service.zip differ diff --git a/examples/zips/api_gateway.zip b/examples/zips/api_gateway.zip index df5d193012c..43e47616200 100644 Binary files a/examples/zips/api_gateway.zip and b/examples/zips/api_gateway.zip differ diff --git a/examples/zips/apm.zip b/examples/zips/apm.zip index 244bf68015b..34426694484 100644 Binary files a/examples/zips/apm.zip and b/examples/zips/apm.zip differ diff --git a/examples/zips/appmgmt_control.zip b/examples/zips/appmgmt_control.zip index 69102157839..071700da2d7 100644 Binary files a/examples/zips/appmgmt_control.zip and b/examples/zips/appmgmt_control.zip differ diff --git a/examples/zips/artifacts.zip b/examples/zips/artifacts.zip index c781aab2ab3..ca64591be63 100644 Binary files a/examples/zips/artifacts.zip and b/examples/zips/artifacts.zip differ diff --git a/examples/zips/audit.zip b/examples/zips/audit.zip index b2fbe7d1b75..fb408813f37 100644 Binary files a/examples/zips/audit.zip and b/examples/zips/audit.zip differ diff --git a/examples/zips/autoscaling.zip b/examples/zips/autoscaling.zip index dff8e3cd9f7..7f6d4276852 100644 Binary files a/examples/zips/autoscaling.zip and b/examples/zips/autoscaling.zip differ diff --git a/examples/zips/bastion.zip b/examples/zips/bastion.zip index 9564047446b..80bd6708aeb 100644 Binary files a/examples/zips/bastion.zip and b/examples/zips/bastion.zip differ diff --git a/examples/zips/big_data_service.zip b/examples/zips/big_data_service.zip index 4c6be6b7d4e..318585bb19c 100644 Binary files a/examples/zips/big_data_service.zip and b/examples/zips/big_data_service.zip differ diff --git a/examples/zips/blockchain.zip b/examples/zips/blockchain.zip index 503556c5a57..d129745177b 100644 Binary files a/examples/zips/blockchain.zip and b/examples/zips/blockchain.zip differ diff --git a/examples/zips/budget.zip b/examples/zips/budget.zip index d2d6c349069..bd495a769a0 100644 Binary files a/examples/zips/budget.zip and b/examples/zips/budget.zip differ diff --git a/examples/zips/capacity_management.zip b/examples/zips/capacity_management.zip index 0a9a99d413e..3868f780217 100644 Binary files a/examples/zips/capacity_management.zip and b/examples/zips/capacity_management.zip differ diff --git a/examples/zips/certificatesManagement.zip b/examples/zips/certificatesManagement.zip index f305ac35859..ac99606b049 100644 Binary files a/examples/zips/certificatesManagement.zip and b/examples/zips/certificatesManagement.zip differ diff --git a/examples/zips/cloudBridge.zip b/examples/zips/cloudBridge.zip index 4408b41db22..3827b76f798 100644 Binary files a/examples/zips/cloudBridge.zip and b/examples/zips/cloudBridge.zip differ diff --git a/examples/zips/cloudMigrations.zip b/examples/zips/cloudMigrations.zip index fb109fef696..ade3b7c93fc 100644 Binary files a/examples/zips/cloudMigrations.zip and b/examples/zips/cloudMigrations.zip differ diff --git a/examples/zips/cloudguard.zip b/examples/zips/cloudguard.zip index 680a6027f22..3663b24dd5d 100644 Binary files a/examples/zips/cloudguard.zip and b/examples/zips/cloudguard.zip differ diff --git a/examples/zips/cluster_placement_groups.zip b/examples/zips/cluster_placement_groups.zip index 96cbf2b7779..fcee8054aac 100644 Binary files a/examples/zips/cluster_placement_groups.zip and b/examples/zips/cluster_placement_groups.zip differ diff --git a/examples/zips/compute.zip b/examples/zips/compute.zip index 3160dcaa7bb..515667b9f09 100644 Binary files a/examples/zips/compute.zip and b/examples/zips/compute.zip differ diff --git a/examples/zips/computecloudatcustomer.zip b/examples/zips/computecloudatcustomer.zip index 94ad93a3683..0965c43a304 100644 Binary files a/examples/zips/computecloudatcustomer.zip and b/examples/zips/computecloudatcustomer.zip differ diff --git a/examples/zips/computeinstanceagent.zip b/examples/zips/computeinstanceagent.zip index 4da76e2ba8f..f8e57285428 100644 Binary files a/examples/zips/computeinstanceagent.zip and b/examples/zips/computeinstanceagent.zip differ diff --git a/examples/zips/concepts.zip b/examples/zips/concepts.zip index 6fc0fdda86d..c624610be90 100644 Binary files a/examples/zips/concepts.zip and b/examples/zips/concepts.zip differ diff --git a/examples/zips/container_engine.zip b/examples/zips/container_engine.zip index 95313b28ddd..2f772a4e8c1 100644 Binary files a/examples/zips/container_engine.zip and b/examples/zips/container_engine.zip differ diff --git a/examples/zips/container_instances.zip b/examples/zips/container_instances.zip index c797a1de4f5..6daf88ad68f 100644 Binary files a/examples/zips/container_instances.zip and b/examples/zips/container_instances.zip differ diff --git a/examples/zips/database.zip b/examples/zips/database.zip index 6bdad235daa..92437eb769a 100644 Binary files a/examples/zips/database.zip and b/examples/zips/database.zip differ diff --git a/examples/zips/databaseTools.zip b/examples/zips/databaseTools.zip index b451ba5d968..0fee1d23441 100644 Binary files a/examples/zips/databaseTools.zip and b/examples/zips/databaseTools.zip differ diff --git a/examples/zips/databasemanagement.zip b/examples/zips/databasemanagement.zip index a5aa3cfefe4..74dc10e34f9 100644 Binary files a/examples/zips/databasemanagement.zip and b/examples/zips/databasemanagement.zip differ diff --git a/examples/zips/databasemigration.zip b/examples/zips/databasemigration.zip index e926fde8f3f..90cd9e60bf3 100644 Binary files a/examples/zips/databasemigration.zip and b/examples/zips/databasemigration.zip differ diff --git a/examples/zips/datacatalog.zip b/examples/zips/datacatalog.zip index 6273b6ac43a..ae028a9defb 100644 Binary files a/examples/zips/datacatalog.zip and b/examples/zips/datacatalog.zip differ diff --git a/examples/zips/dataflow.zip b/examples/zips/dataflow.zip index 77e505cbcc2..c40f66cf4a7 100644 Binary files a/examples/zips/dataflow.zip and b/examples/zips/dataflow.zip differ diff --git a/examples/zips/dataintegration.zip b/examples/zips/dataintegration.zip index cbc0926621c..dc3811f5b19 100644 Binary files a/examples/zips/dataintegration.zip and b/examples/zips/dataintegration.zip differ diff --git a/examples/zips/datalabeling.zip b/examples/zips/datalabeling.zip index 2fd55903bb3..03e815dac4c 100644 Binary files a/examples/zips/datalabeling.zip and b/examples/zips/datalabeling.zip differ diff --git a/examples/zips/datasafe.zip b/examples/zips/datasafe.zip index fc969db2466..49b873dd104 100644 Binary files a/examples/zips/datasafe.zip and b/examples/zips/datasafe.zip differ diff --git a/examples/zips/datascience.zip b/examples/zips/datascience.zip index cb642046188..a380a42efdb 100644 Binary files a/examples/zips/datascience.zip and b/examples/zips/datascience.zip differ diff --git a/examples/zips/delegation_management.zip b/examples/zips/delegation_management.zip index 1d894f32b86..dbcb94ebcee 100644 Binary files a/examples/zips/delegation_management.zip and b/examples/zips/delegation_management.zip differ diff --git a/examples/zips/demand_signal.zip b/examples/zips/demand_signal.zip index f22732b8d11..e72ecc190f1 100644 Binary files a/examples/zips/demand_signal.zip and b/examples/zips/demand_signal.zip differ diff --git a/examples/zips/desktops.zip b/examples/zips/desktops.zip index daced576eca..608a3a519bb 100644 Binary files a/examples/zips/desktops.zip and b/examples/zips/desktops.zip differ diff --git a/examples/zips/devops.zip b/examples/zips/devops.zip index 8fd7459cfaa..df7392913ad 100644 Binary files a/examples/zips/devops.zip and b/examples/zips/devops.zip differ diff --git a/examples/zips/disaster_recovery.zip b/examples/zips/disaster_recovery.zip index cf05d451acd..70e40dd238e 100644 Binary files a/examples/zips/disaster_recovery.zip and b/examples/zips/disaster_recovery.zip differ diff --git a/examples/zips/dns.zip b/examples/zips/dns.zip index bfb14cbc20f..31789aa98c1 100644 Binary files a/examples/zips/dns.zip and b/examples/zips/dns.zip differ diff --git a/examples/zips/em_warehouse.zip b/examples/zips/em_warehouse.zip index f3b7fdea08a..148468453ea 100644 Binary files a/examples/zips/em_warehouse.zip and b/examples/zips/em_warehouse.zip differ diff --git a/examples/zips/email.zip b/examples/zips/email.zip index b9160177222..053e2865739 100644 Binary files a/examples/zips/email.zip and b/examples/zips/email.zip differ diff --git a/examples/zips/events.zip b/examples/zips/events.zip index 1113f2cb8f3..264e405e518 100644 Binary files a/examples/zips/events.zip and b/examples/zips/events.zip differ diff --git a/examples/zips/fast_connect.zip b/examples/zips/fast_connect.zip index cbeee5589d7..e5d56172bb0 100644 Binary files a/examples/zips/fast_connect.zip and b/examples/zips/fast_connect.zip differ diff --git a/examples/zips/fleet_apps_management.zip b/examples/zips/fleet_apps_management.zip index 6a9bc9febbb..74dc6242cf5 100644 Binary files a/examples/zips/fleet_apps_management.zip and b/examples/zips/fleet_apps_management.zip differ diff --git a/examples/zips/fleetsoftwareupdate.zip b/examples/zips/fleetsoftwareupdate.zip index 3b839fe367a..17173dd4322 100644 Binary files a/examples/zips/fleetsoftwareupdate.zip and b/examples/zips/fleetsoftwareupdate.zip differ diff --git a/examples/zips/functions.zip b/examples/zips/functions.zip index 230d21933c5..de7f6e51e4d 100644 Binary files a/examples/zips/functions.zip and b/examples/zips/functions.zip differ diff --git a/examples/zips/fusionapps.zip b/examples/zips/fusionapps.zip index 18aecb50f8e..7c3767de353 100644 Binary files a/examples/zips/fusionapps.zip and b/examples/zips/fusionapps.zip differ diff --git a/examples/zips/generative_ai.zip b/examples/zips/generative_ai.zip index da2fcd90bb8..a30928520c9 100644 Binary files a/examples/zips/generative_ai.zip and b/examples/zips/generative_ai.zip differ diff --git a/examples/zips/globally_distributed_database.zip b/examples/zips/globally_distributed_database.zip index 457a52c317e..ee9a2ed70d8 100644 Binary files a/examples/zips/globally_distributed_database.zip and b/examples/zips/globally_distributed_database.zip differ diff --git a/examples/zips/goldengate.zip b/examples/zips/goldengate.zip index 8aca4f72d7e..76f315a906f 100644 Binary files a/examples/zips/goldengate.zip and b/examples/zips/goldengate.zip differ diff --git a/examples/zips/health_checks.zip b/examples/zips/health_checks.zip index f465e53aa6d..c6af129609a 100644 Binary files a/examples/zips/health_checks.zip and b/examples/zips/health_checks.zip differ diff --git a/examples/zips/id6.zip b/examples/zips/id6.zip index e0015eae19a..22877aafa63 100644 Binary files a/examples/zips/id6.zip and b/examples/zips/id6.zip differ diff --git a/examples/zips/identity.zip b/examples/zips/identity.zip index 94db8065ff8..93428c83310 100644 Binary files a/examples/zips/identity.zip and b/examples/zips/identity.zip differ diff --git a/examples/zips/identity_data_plane.zip b/examples/zips/identity_data_plane.zip index 52880caeb27..c00536064f5 100644 Binary files a/examples/zips/identity_data_plane.zip and b/examples/zips/identity_data_plane.zip differ diff --git a/examples/zips/identity_domains.zip b/examples/zips/identity_domains.zip index 5d86ee79f7c..9c23f6dfc4c 100644 Binary files a/examples/zips/identity_domains.zip and b/examples/zips/identity_domains.zip differ diff --git a/examples/zips/integration.zip b/examples/zips/integration.zip index 359d9bdd14d..e5384f0fa9c 100644 Binary files a/examples/zips/integration.zip and b/examples/zips/integration.zip differ diff --git a/examples/zips/jms.zip b/examples/zips/jms.zip index 21c79a20748..a2a1e2674b8 100644 Binary files a/examples/zips/jms.zip and b/examples/zips/jms.zip differ diff --git a/examples/zips/jms_java_downloads.zip b/examples/zips/jms_java_downloads.zip index f501d2301ab..da384567d84 100644 Binary files a/examples/zips/jms_java_downloads.zip and b/examples/zips/jms_java_downloads.zip differ diff --git a/examples/zips/kms.zip b/examples/zips/kms.zip index ffc2b606a51..a22357a61cc 100644 Binary files a/examples/zips/kms.zip and b/examples/zips/kms.zip differ diff --git a/examples/zips/license_manager.zip b/examples/zips/license_manager.zip index a1b16e8dae7..cb18b44e591 100644 Binary files a/examples/zips/license_manager.zip and b/examples/zips/license_manager.zip differ diff --git a/examples/zips/limits.zip b/examples/zips/limits.zip index ec5cb4ef854..db18a16fa8a 100644 Binary files a/examples/zips/limits.zip and b/examples/zips/limits.zip differ diff --git a/examples/zips/load_balancer.zip b/examples/zips/load_balancer.zip index 993208b0af5..92d5a4a5b2f 100644 Binary files a/examples/zips/load_balancer.zip and b/examples/zips/load_balancer.zip differ diff --git a/examples/zips/log_analytics.zip b/examples/zips/log_analytics.zip index 73010542c74..c97a85ac9ef 100644 Binary files a/examples/zips/log_analytics.zip and b/examples/zips/log_analytics.zip differ diff --git a/examples/zips/logging.zip b/examples/zips/logging.zip index 112d44eb9f8..963e3f66aed 100644 Binary files a/examples/zips/logging.zip and b/examples/zips/logging.zip differ diff --git a/examples/zips/management_agent.zip b/examples/zips/management_agent.zip index c6d49a3864c..b22d6beb4ac 100644 Binary files a/examples/zips/management_agent.zip and b/examples/zips/management_agent.zip differ diff --git a/examples/zips/management_dashboard.zip b/examples/zips/management_dashboard.zip index 5a84d50b19c..6c131aa1676 100644 Binary files a/examples/zips/management_dashboard.zip and b/examples/zips/management_dashboard.zip differ diff --git a/examples/zips/marketplace.zip b/examples/zips/marketplace.zip index c4757c9c2cf..d75cd5276bc 100644 Binary files a/examples/zips/marketplace.zip and b/examples/zips/marketplace.zip differ diff --git a/examples/zips/media_services.zip b/examples/zips/media_services.zip index cde8e58171a..a0dfc6597f7 100644 Binary files a/examples/zips/media_services.zip and b/examples/zips/media_services.zip differ diff --git a/examples/zips/metering_computation.zip b/examples/zips/metering_computation.zip index c95281545ff..2c4f2ba1741 100644 Binary files a/examples/zips/metering_computation.zip and b/examples/zips/metering_computation.zip differ diff --git a/examples/zips/monitoring.zip b/examples/zips/monitoring.zip index 5d9a4d7292d..0233ad9ad9e 100644 Binary files a/examples/zips/monitoring.zip and b/examples/zips/monitoring.zip differ diff --git a/examples/zips/mysql.zip b/examples/zips/mysql.zip index 409424400a8..3300d0162ca 100644 Binary files a/examples/zips/mysql.zip and b/examples/zips/mysql.zip differ diff --git a/examples/zips/network_firewall.zip b/examples/zips/network_firewall.zip index 6bff6c15753..9add6fcc0da 100644 Binary files a/examples/zips/network_firewall.zip and b/examples/zips/network_firewall.zip differ diff --git a/examples/zips/network_load_balancer.zip b/examples/zips/network_load_balancer.zip index 1a89afbd3a4..d63b63a573d 100644 Binary files a/examples/zips/network_load_balancer.zip and b/examples/zips/network_load_balancer.zip differ diff --git a/examples/zips/networking.zip b/examples/zips/networking.zip index dd722aa236e..dce0c06e1e5 100644 Binary files a/examples/zips/networking.zip and b/examples/zips/networking.zip differ diff --git a/examples/zips/nosql.zip b/examples/zips/nosql.zip index eb3c3536edb..5683a5a7d11 100644 Binary files a/examples/zips/nosql.zip and b/examples/zips/nosql.zip differ diff --git a/examples/zips/notifications.zip b/examples/zips/notifications.zip index eadd6bebab5..64168c0e157 100644 Binary files a/examples/zips/notifications.zip and b/examples/zips/notifications.zip differ diff --git a/examples/zips/object_storage.zip b/examples/zips/object_storage.zip index bcc8e6e5fc2..cef3d36587b 100644 Binary files a/examples/zips/object_storage.zip and b/examples/zips/object_storage.zip differ diff --git a/examples/zips/ocvp.zip b/examples/zips/ocvp.zip index e04e070da53..5abef5efae5 100644 Binary files a/examples/zips/ocvp.zip and b/examples/zips/ocvp.zip differ diff --git a/examples/zips/onesubscription.zip b/examples/zips/onesubscription.zip index 422f8a57a04..c848225e35a 100644 Binary files a/examples/zips/onesubscription.zip and b/examples/zips/onesubscription.zip differ diff --git a/examples/zips/opa.zip b/examples/zips/opa.zip index b802cbaad53..b8192c62a71 100644 Binary files a/examples/zips/opa.zip and b/examples/zips/opa.zip differ diff --git a/examples/zips/opensearch.zip b/examples/zips/opensearch.zip index 5e3e9b17104..e94e9c5e492 100644 Binary files a/examples/zips/opensearch.zip and b/examples/zips/opensearch.zip differ diff --git a/examples/zips/operator_access_control.zip b/examples/zips/operator_access_control.zip index a00dbf99e2f..976e6224c38 100644 Binary files a/examples/zips/operator_access_control.zip and b/examples/zips/operator_access_control.zip differ diff --git a/examples/zips/opsi.zip b/examples/zips/opsi.zip index b47e2c97116..31abc2e1876 100644 Binary files a/examples/zips/opsi.zip and b/examples/zips/opsi.zip differ diff --git a/examples/zips/optimizer.zip b/examples/zips/optimizer.zip index 4e084d458ef..aea0cb3ec88 100644 Binary files a/examples/zips/optimizer.zip and b/examples/zips/optimizer.zip differ diff --git a/examples/zips/oracle_cloud_vmware_solution.zip b/examples/zips/oracle_cloud_vmware_solution.zip index 1cd4047c7a8..a6f47498c97 100644 Binary files a/examples/zips/oracle_cloud_vmware_solution.zip and b/examples/zips/oracle_cloud_vmware_solution.zip differ diff --git a/examples/zips/oracle_content_experience.zip b/examples/zips/oracle_content_experience.zip index 46ae9de5b26..cb99777356f 100644 Binary files a/examples/zips/oracle_content_experience.zip and b/examples/zips/oracle_content_experience.zip differ diff --git a/examples/zips/oracle_digital_assistant.zip b/examples/zips/oracle_digital_assistant.zip index c209eb2998b..7f0ca83050b 100644 Binary files a/examples/zips/oracle_digital_assistant.zip and b/examples/zips/oracle_digital_assistant.zip differ diff --git a/examples/zips/os_management_hub.zip b/examples/zips/os_management_hub.zip index b942d2eafe7..cf9d68a5e30 100644 Binary files a/examples/zips/os_management_hub.zip and b/examples/zips/os_management_hub.zip differ diff --git a/examples/zips/osmanagement.zip b/examples/zips/osmanagement.zip index f3bbd6f541e..42476b884f5 100644 Binary files a/examples/zips/osmanagement.zip and b/examples/zips/osmanagement.zip differ diff --git a/examples/zips/osp_gateway.zip b/examples/zips/osp_gateway.zip index 4e84655a59e..1d0b1d0f42d 100644 Binary files a/examples/zips/osp_gateway.zip and b/examples/zips/osp_gateway.zip differ diff --git a/examples/zips/osub_billing_schedule.zip b/examples/zips/osub_billing_schedule.zip index df9c27ae417..d4ef976c99b 100644 Binary files a/examples/zips/osub_billing_schedule.zip and b/examples/zips/osub_billing_schedule.zip differ diff --git a/examples/zips/osub_organization_subscription.zip b/examples/zips/osub_organization_subscription.zip index df86242e848..67e3643869f 100644 Binary files a/examples/zips/osub_organization_subscription.zip and b/examples/zips/osub_organization_subscription.zip differ diff --git a/examples/zips/osub_subscription.zip b/examples/zips/osub_subscription.zip index 94e38b5c1c5..69e811330d7 100644 Binary files a/examples/zips/osub_subscription.zip and b/examples/zips/osub_subscription.zip differ diff --git a/examples/zips/osub_usage.zip b/examples/zips/osub_usage.zip index b0a39258004..69dbb8ade65 100644 Binary files a/examples/zips/osub_usage.zip and b/examples/zips/osub_usage.zip differ diff --git a/examples/zips/pic.zip b/examples/zips/pic.zip index 69bb53ab84f..7c944735809 100644 Binary files a/examples/zips/pic.zip and b/examples/zips/pic.zip differ diff --git a/examples/zips/psql.zip b/examples/zips/psql.zip index 4bf4d2a23ac..f383397e085 100644 Binary files a/examples/zips/psql.zip and b/examples/zips/psql.zip differ diff --git a/examples/zips/queue.zip b/examples/zips/queue.zip index 08f385fcb89..69643798dca 100644 Binary files a/examples/zips/queue.zip and b/examples/zips/queue.zip differ diff --git a/examples/zips/recovery.zip b/examples/zips/recovery.zip index 0c5ed2587b6..2a0f4d4a3e6 100644 Binary files a/examples/zips/recovery.zip and b/examples/zips/recovery.zip differ diff --git a/examples/zips/redis.zip b/examples/zips/redis.zip index c1f8aa8ded9..2c5fc5f849a 100644 Binary files a/examples/zips/redis.zip and b/examples/zips/redis.zip differ diff --git a/examples/zips/resourcemanager.zip b/examples/zips/resourcemanager.zip index ab6ca6f3052..098934b284f 100644 Binary files a/examples/zips/resourcemanager.zip and b/examples/zips/resourcemanager.zip differ diff --git a/examples/zips/resourcescheduler.zip b/examples/zips/resourcescheduler.zip index b675a1dbe2d..46c1853e3cd 100644 Binary files a/examples/zips/resourcescheduler.zip and b/examples/zips/resourcescheduler.zip differ diff --git a/examples/zips/security_attribute.zip b/examples/zips/security_attribute.zip index bcc936a1f1e..777a34a5781 100644 Binary files a/examples/zips/security_attribute.zip and b/examples/zips/security_attribute.zip differ diff --git a/examples/zips/serviceManagerProxy.zip b/examples/zips/serviceManagerProxy.zip index de2490f78d4..598595c0249 100644 Binary files a/examples/zips/serviceManagerProxy.zip and b/examples/zips/serviceManagerProxy.zip differ diff --git a/examples/zips/service_catalog.zip b/examples/zips/service_catalog.zip index 8c392ce5d78..05c03374120 100644 Binary files a/examples/zips/service_catalog.zip and b/examples/zips/service_catalog.zip differ diff --git a/examples/zips/service_connector_hub.zip b/examples/zips/service_connector_hub.zip index 333866dfbe0..301c0e5a2d8 100644 Binary files a/examples/zips/service_connector_hub.zip and b/examples/zips/service_connector_hub.zip differ diff --git a/examples/zips/service_mesh.zip b/examples/zips/service_mesh.zip index c1cf559f689..56ef3ce4948 100644 Binary files a/examples/zips/service_mesh.zip and b/examples/zips/service_mesh.zip differ diff --git a/examples/zips/stack_monitoring.zip b/examples/zips/stack_monitoring.zip index 1cbbe5ee5c8..f74fa0c8a88 100644 Binary files a/examples/zips/stack_monitoring.zip and b/examples/zips/stack_monitoring.zip differ diff --git a/examples/zips/storage.zip b/examples/zips/storage.zip index af5543585ce..97de08f77a0 100644 Binary files a/examples/zips/storage.zip and b/examples/zips/storage.zip differ diff --git a/examples/zips/streaming.zip b/examples/zips/streaming.zip index e7c64035c98..f8b1eac8ff8 100644 Binary files a/examples/zips/streaming.zip and b/examples/zips/streaming.zip differ diff --git a/examples/zips/usage_proxy.zip b/examples/zips/usage_proxy.zip index eea0ade28ff..006380b19f5 100644 Binary files a/examples/zips/usage_proxy.zip and b/examples/zips/usage_proxy.zip differ diff --git a/examples/zips/vault_secret.zip b/examples/zips/vault_secret.zip index 01b06d383c7..2dc30dcadeb 100644 Binary files a/examples/zips/vault_secret.zip and b/examples/zips/vault_secret.zip differ diff --git a/examples/zips/vbs_inst.zip b/examples/zips/vbs_inst.zip index 3e7e6680d87..f9302cadf3a 100644 Binary files a/examples/zips/vbs_inst.zip and b/examples/zips/vbs_inst.zip differ diff --git a/examples/zips/visual_builder.zip b/examples/zips/visual_builder.zip index 1d949a9689c..f1ae10951e9 100644 Binary files a/examples/zips/visual_builder.zip and b/examples/zips/visual_builder.zip differ diff --git a/examples/zips/vn_monitoring.zip b/examples/zips/vn_monitoring.zip index 024120fab0b..ec97a7aad30 100644 Binary files a/examples/zips/vn_monitoring.zip and b/examples/zips/vn_monitoring.zip differ diff --git a/examples/zips/vulnerability_scanning_service.zip b/examples/zips/vulnerability_scanning_service.zip index 9321be369f9..b5463d42f93 100644 Binary files a/examples/zips/vulnerability_scanning_service.zip and b/examples/zips/vulnerability_scanning_service.zip differ diff --git a/examples/zips/web_app_acceleration.zip b/examples/zips/web_app_acceleration.zip index a8e087cea4c..78e9a404931 100644 Binary files a/examples/zips/web_app_acceleration.zip and b/examples/zips/web_app_acceleration.zip differ diff --git a/examples/zips/web_app_firewall.zip b/examples/zips/web_app_firewall.zip index 2938e0f8e6d..c9ec9d0afa9 100644 Binary files a/examples/zips/web_app_firewall.zip and b/examples/zips/web_app_firewall.zip differ diff --git a/examples/zips/web_application_acceleration_and_security.zip b/examples/zips/web_application_acceleration_and_security.zip index de799a08641..d4aabb9441b 100644 Binary files a/examples/zips/web_application_acceleration_and_security.zip and b/examples/zips/web_application_acceleration_and_security.zip differ diff --git a/examples/zips/zpr.zip b/examples/zips/zpr.zip index e1e8386602a..2ce7d098ee7 100644 Binary files a/examples/zips/zpr.zip and b/examples/zips/zpr.zip differ diff --git a/internal/globalvar/version.go b/internal/globalvar/version.go index 0aa62503d35..03d91730e4c 100644 --- a/internal/globalvar/version.go +++ b/internal/globalvar/version.go @@ -7,9 +7,9 @@ import ( "log" ) -const Version = "6.15.0" +const Version = "6.16.0" -const ReleaseDate = "2024-10-28" +const ReleaseDate = "2024-10-30" func PrintVersion() { log.Printf("[INFO] terraform-provider-oci %s\n", Version) diff --git a/internal/integrationtest/containerengine_addon_test.go b/internal/integrationtest/containerengine_addon_test.go index ad40f8249a5..38dd353d6bd 100644 --- a/internal/integrationtest/containerengine_addon_test.go +++ b/internal/integrationtest/containerengine_addon_test.go @@ -36,6 +36,10 @@ var ( addonConfigValue = "1" addonConfigValueUpdate = "2" + essentialAddonName = "CoreDNS" + essentialAddonConfigKey = "minReplica" + essentialAddonConfigValue = "4" + ContainerengineAddonSingularDataSourceRepresentation = map[string]interface{}{ "addon_name": acctest.Representation{RepType: acctest.Required, Create: `${oci_containerengine_addon.test_addon.addon_name}`}, "cluster_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_containerengine_cluster.test_cluster.id}`}, @@ -57,71 +61,31 @@ var ( "version": acctest.Representation{RepType: acctest.Optional, Create: nil, Update: `${data.oci_containerengine_addon_options.adddon_options_dashboard.addon_options[0].versions[0].version_number}`}, } + ContainerengineEssentialAddonRepresentation = map[string]interface{}{ + "cluster_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_containerengine_cluster.test_cluster.id}`}, + "addon_name": acctest.Representation{RepType: acctest.Required, Create: essentialAddonName}, + "remove_addon_resources_on_delete": acctest.Representation{RepType: acctest.Required, Create: `false`}, + "override_existing": acctest.Representation{RepType: acctest.Optional, Create: `true`}, + "configurations": acctest.RepresentationGroup{RepType: acctest.Optional, Group: ContainerengineEssentialAddonConfigurationsRepresentation}, + } + ContainerengineAddonConfigurationsRepresentation = map[string]interface{}{ "key": acctest.Representation{RepType: acctest.Optional, Create: addonConfigKey, Update: addonConfigKey}, "value": acctest.Representation{RepType: acctest.Optional, Create: addonConfigValue, Update: addonConfigValueUpdate}, } + ContainerengineEssentialAddonConfigurationsRepresentation = map[string]interface{}{ + "key": acctest.Representation{RepType: acctest.Optional, Create: essentialAddonConfigKey}, + "value": acctest.Representation{RepType: acctest.Optional, Create: essentialAddonConfigValue}, + } + ContainerengineAddonRequiredOnlyResourceCreate = acctest.GenerateResourceFromRepresentationMap("oci_containerengine_addon", "test_addon", acctest.Required, acctest.Create, ContainerengineAddonRepresentation) ContainerengineAddonOptionalResourceCreate = acctest.GenerateResourceFromRepresentationMap("oci_containerengine_addon", "test_addon", acctest.Optional, acctest.Create, ContainerengineAddonRepresentation) ContainerengineAddonOptionalResourceConfigUpdate = acctest.GenerateResourceFromRepresentationMap("oci_containerengine_addon", "test_addon", acctest.Optional, acctest.Update, ContainerengineAddonRepresentation) - clusterOptionAddonDataSourceRepresentation = map[string]interface{}{ - "cluster_option_id": acctest.Representation{RepType: acctest.Required, Create: `all`}, - "compartment_id": acctest.Representation{RepType: acctest.Optional, Create: `${var.compartment_id}`}, - } - - clusterAddonVcnRepresentation = map[string]interface{}{ - "cidr_block": acctest.Representation{RepType: acctest.Required, Create: `10.0.0.0/16`}, - "compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`}, - "defined_tags": acctest.Representation{RepType: acctest.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")}`}, - "display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`}, - "dns_label": acctest.Representation{RepType: acctest.Optional, Create: `dnslabel`}, - "freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}}, - "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsChangesRep}, - } - - clusterAddonSubnetRepresentation = map[string]interface{}{ - "cidr_block": acctest.Representation{RepType: acctest.Required, Create: `10.0.0.0/24`, Update: "10.0.0.0/16"}, - "compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`}, - "vcn_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_vcn.test_vcn.id}`}, - "availability_domain": acctest.Representation{RepType: acctest.Optional, Create: `${lower("${data.oci_identity_availability_domains.test_availability_domains.availability_domains.0.name}")}`}, - "defined_tags": acctest.Representation{RepType: acctest.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")}`}, - "dhcp_options_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_vcn.test_vcn.default_dhcp_options_id}`, Update: `${oci_core_dhcp_options.test_dhcp_options.id}`}, - "display_name": acctest.Representation{RepType: acctest.Optional, Create: `MySubnet`, Update: `displayName2`}, - "dns_label": acctest.Representation{RepType: acctest.Optional, Create: `dnslabel`}, - "freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}}, - "prohibit_public_ip_on_vnic": acctest.Representation{RepType: acctest.Optional, Create: `false`}, - "prohibit_internet_ingress": acctest.Representation{RepType: acctest.Optional, Create: `false`}, - "route_table_id": acctest.Representation{RepType: acctest.Optional, Create: `${oci_core_vcn.test_vcn.default_route_table_id}`, Update: `${oci_core_route_table.test_route_table.id}`}, - "security_list_ids": acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_vcn.test_vcn.default_security_list_id}`}, Update: []string{`${oci_core_security_list.test_security_list.id}`}}, - "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreDefinedTagsChangesRep}, - } - - containerengineClusterRepresentation = map[string]interface{}{ - "compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`}, - "kubernetes_version": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions[length(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)-2]}`, Update: `${data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions[length(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)-1]}`}, - "name": acctest.Representation{RepType: acctest.Required, Create: `name`, Update: `name2`}, - "vcn_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_vcn.test_vcn.id}`}, - "defined_tags": acctest.Representation{RepType: acctest.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")}`}, - "endpoint_config": acctest.RepresentationGroup{RepType: acctest.Optional, Group: clusterAddonEndpointConfigRepresentation}, - "freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}}, - "image_policy_config": acctest.RepresentationGroup{RepType: acctest.Optional, Group: clusterAddonImagePolicyConfigRepresentation}, - "kms_key_id": acctest.Representation{RepType: acctest.Optional, Create: `${lookup(data.oci_kms_keys.test_keys_dependency.keys[0], "id")}`}, - "options": acctest.RepresentationGroup{RepType: acctest.Optional, Group: ContainerengineClusterOptionsRepresentation}, - } - - clusterAddonEndpointConfigRepresentation = map[string]interface{}{ - "nsg_ids": acctest.Representation{RepType: acctest.Optional, Create: []string{`${oci_core_network_security_group.test_network_security_group.id}`}, Update: []string{}}, - "subnet_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_core_subnet.test_subnet.id}`}, - } - - clusterAddonImagePolicyConfigRepresentation = map[string]interface{}{ - "is_policy_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`}, - "key_details": acctest.RepresentationGroup{RepType: acctest.Optional, Group: ContainerengineClusterImagePolicyConfigKeyDetailsRepresentation}, - } + ContainerengineEssentialAddonResourceCreate = acctest.GenerateResourceFromRepresentationMap("oci_containerengine_addon", "test_essential_addon", acctest.Optional, acctest.Create, ContainerengineEssentialAddonRepresentation) AddonOptionDashboardDataSourceRepresentation = map[string]interface{}{ "kubernetes_version": acctest.Representation{RepType: acctest.Required, Create: `${data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions[length(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)-2]}`}, @@ -131,8 +95,12 @@ var ( ContainerengineAddonResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_containerengine_cluster", "test_cluster", acctest.Required, acctest.Create, acctest.RepresentationCopyWithNewProperties(ContainerengineClusterRepresentation, map[string]interface{}{ "type": acctest.Representation{RepType: acctest.Required, Create: `ENHANCED_CLUSTER`, Update: `ENHANCED_CLUSTER`}, + //"cluster_pod_network_options": acctest.RepresentationGroup{RepType: acctest.Required, Group: clusterClusterPodNetworkOptionsRepresentation}, + "endpoint_config": acctest.RepresentationGroup{RepType: acctest.Required, Group: ContainerengineClusterEndpointConfigRepresentation}, })) + acctest.GenerateDataSourceFromRepresentationMap("oci_containerengine_cluster_option", "test_cluster_option", acctest.Required, acctest.Create, ContainerengineContainerengineClusterOptionSingularDataSourceRepresentation) + + acctest.GenerateResourceFromRepresentationMap("oci_core_network_security_group", "test_network_security_group", acctest.Required, acctest.Create, CoreNetworkSecurityGroupRepresentation) + + acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) + acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, acctest.RepresentationCopyWithNewProperties(CoreVcnRepresentation, map[string]interface{}{ "dns_label": acctest.Representation{RepType: acctest.Required, Create: `dnslabel`}, })) + @@ -145,12 +113,15 @@ func TestContainerengineAddonResource_basic(t *testing.T) { httpreplay.SetScenario("TestContainerengineAddonResource_basic") defer httpreplay.SaveScenario() + fmt.Printf("ContainerengineEssentialAddonResourceCreate: %v", ContainerengineEssentialAddonResourceCreate) + config := acctest.ProviderTestConfig() compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid") compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId) resourceName := "oci_containerengine_addon.test_addon" + essentialAddonResourceName := "oci_containerengine_addon.test_essential_addon" datasourceName := "data.oci_containerengine_addons.test_addons" singularDatasourceName := "data.oci_containerengine_addon.test_addon" @@ -230,6 +201,20 @@ func TestContainerengineAddonResource_basic(t *testing.T) { }, ), }, + // verify update-on-install of an essential addon + { + Config: baseConfig + ContainerengineAddonOptionalResourceConfigUpdate + ContainerengineEssentialAddonResourceCreate, + + Check: acctest.ComposeAggregateTestCheckFuncWrapper( + resource.TestCheckResourceAttrSet(essentialAddonResourceName, "cluster_id"), + resource.TestCheckResourceAttr(essentialAddonResourceName, "configurations.#", "1"), + resource.TestCheckResourceAttr(essentialAddonResourceName, "configurations.0.key", essentialAddonConfigKey), + resource.TestCheckResourceAttr(essentialAddonResourceName, "configurations.0.value", essentialAddonConfigValue), + resource.TestCheckResourceAttrSet(essentialAddonResourceName, "current_installed_version"), + resource.TestCheckResourceAttr(essentialAddonResourceName, "addon_name", essentialAddonName), + resource.TestCheckResourceAttrSet(essentialAddonResourceName, "state"), + ), + }, // verify datasource { Config: baseConfig + ContainerengineAddonDataSource + ContainerengineAddonOptionalResourceConfigUpdate, @@ -246,7 +231,6 @@ func TestContainerengineAddonResource_basic(t *testing.T) { Config: baseConfig + ContainerengineAddonSingularDataSource + ContainerengineAddonOptionalResourceConfigUpdate, Check: acctest.ComposeAggregateTestCheckFuncWrapper( - resource.TestCheckNoResourceAttr(singularDatasourceName, "addon_error"), resource.TestCheckResourceAttrSet(singularDatasourceName, "time_created"), resource.TestCheckResourceAttr(singularDatasourceName, "configurations.#", "1"), resource.TestCheckResourceAttr(singularDatasourceName, "configurations.0.key", addonConfigKey), @@ -262,7 +246,7 @@ func TestContainerengineAddonResource_basic(t *testing.T) { Config: baseConfig + ContainerengineAddonRequiredOnlyResourceCreate, ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"remove_addon_resources_on_delete"}, + ImportStateVerifyIgnore: []string{"remove_addon_resources_on_delete", "override_existing"}, ResourceName: resourceName, }, }) @@ -272,7 +256,7 @@ func testAccCheckContainerengineAddonDestroy(s *terraform.State) error { noResourceFound := true client := acctest.TestAccProvider.Meta().(*tf_client.OracleClients).ContainerEngineClient() for _, rs := range s.RootModule().Resources { - if rs.Type == "oci_containerengine_addon" { + if rs.Type == "oci_containerengine_addon" && rs.Primary.Attributes["addon_name"] != essentialAddonName { noResourceFound = false request := oci_containerengine.GetAddonRequest{} diff --git a/internal/integrationtest/core_instance_pool_test.go b/internal/integrationtest/core_instance_pool_test.go index 8aab1038b6a..62e774c5817 100644 --- a/internal/integrationtest/core_instance_pool_test.go +++ b/internal/integrationtest/core_instance_pool_test.go @@ -171,6 +171,13 @@ var ( "vnic_selection": acctest.Representation{RepType: acctest.Required, Create: `PrimaryVnic`}, } + CoreInstancePoolLoadBalancers3Representation = map[string]interface{}{ + "backend_set_name": acctest.Representation{RepType: acctest.Required, Create: `${oci_load_balancer_backend_set.test_backend_set3.name}`}, + "load_balancer_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_load_balancer_load_balancer.test_load_balancer3.id}`}, + "port": acctest.Representation{RepType: acctest.Required, Create: `10`}, + "vnic_selection": acctest.Representation{RepType: acctest.Required, Create: `PrimaryVnic`}, + } + CoreInstancePoolConfigurationPoolRepresentation = map[string]interface{}{ "compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`}, "instance_details": acctest.RepresentationGroup{RepType: acctest.Required, Group: CoreInstancePoolInstanceConfigurationInstanceDetailsPoolRepresentation}, @@ -240,9 +247,11 @@ var ( DefinedTagsDependencies + acctest.GenerateResourceFromRepresentationMap("oci_load_balancer_backend_set", "test_backend_set", acctest.Required, acctest.Create, backendSetRepresentation) + acctest.GenerateResourceFromRepresentationMap("oci_load_balancer_backend_set", "test_backend_set2", acctest.Required, acctest.Create, backendSet2Representation) + + acctest.GenerateResourceFromRepresentationMap("oci_load_balancer_backend_set", "test_backend_set3", acctest.Required, acctest.Create, backendSet3Representation) + acctest.GenerateResourceFromRepresentationMap("oci_load_balancer_certificate", "test_certificate", acctest.Required, acctest.Create, certificateRepresentation) + acctest.GenerateResourceFromRepresentationMap("oci_load_balancer_load_balancer", "test_load_balancer", acctest.Required, acctest.Create, loadBalancerRepresentation) + acctest.GenerateResourceFromRepresentationMap("oci_load_balancer_load_balancer", "test_load_balancer2", acctest.Required, acctest.Create, loadBalancer2Representation) + + acctest.GenerateResourceFromRepresentationMap("oci_load_balancer_load_balancer", "test_load_balancer3", acctest.Required, acctest.Create, loadBalancer3Representation) + LoadBalancerSubnetDependencies CoreInstancePoolResourceDependenciesIpv6 = utils.OciImageIdsVariable + @@ -481,6 +490,93 @@ func TestCoreInstancePoolResource_basic(t *testing.T) { }, ), }, + // verify unordered attach + { + Config: config + compartmentIdVariableStr + CoreInstancePoolResourceDependencies + + acctest.GenerateResourceFromRepresentationMap("oci_core_instance_pool", "test_instance_pool", acctest.Optional, acctest.Update, acctest.RepresentationCopyWithNewProperties(CoreInstancePoolRepresentation, map[string]interface{}{ + "load_balancers": []acctest.RepresentationGroup{{RepType: acctest.Optional, Group: CoreInstancePoolLoadBalancersRepresentation}, {RepType: acctest.Optional, Group: CoreInstancePoolLoadBalancers3Representation}, {RepType: acctest.Optional, Group: CoreInstancePoolLoadBalancers2Representation}}, + })), + Check: acctest.ComposeAggregateTestCheckFuncWrapper( + resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId), + resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"), + resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"), + resource.TestCheckResourceAttrSet(resourceName, "id"), + resource.TestCheckResourceAttrSet(resourceName, "instance_configuration_id"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.#", "3"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.backend_set_name"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.instance_pool_id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.load_balancer_id"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.0.port", "10"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.state"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.0.vnic_selection", "PrimaryVnic"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.backend_set_name"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.instance_pool_id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.load_balancer_id"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.1.port", "10"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.state"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.1.vnic_selection", "PrimaryVnic"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.2.backend_set_name"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.2.id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.2.instance_pool_id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.2.load_balancer_id"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.2.port", "10"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.2.state"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.2.vnic_selection", "PrimaryVnic"), + resource.TestCheckResourceAttr(resourceName, "placement_configurations.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.availability_domain"), + resource.TestCheckResourceAttr(resourceName, "placement_configurations.0.fault_domains.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.primary_subnet_id"), + resource.TestCheckResourceAttr(resourceName, "size", "3"), + resource.TestCheckResourceAttr(resourceName, "state", "RUNNING"), + resource.TestCheckResourceAttrSet(resourceName, "time_created"), + ), + }, + // verify unordered detach + { + Config: config + compartmentIdVariableStr + CoreInstancePoolResourceDependencies + + acctest.GenerateResourceFromRepresentationMap("oci_core_instance_pool", "test_instance_pool", acctest.Optional, acctest.Update, acctest.RepresentationCopyWithNewProperties(CoreInstancePoolRepresentation, map[string]interface{}{ + "load_balancers": []acctest.RepresentationGroup{{RepType: acctest.Optional, Group: CoreInstancePoolLoadBalancersRepresentation}, {RepType: acctest.Optional, Group: CoreInstancePoolLoadBalancers2Representation}}, + })), + Check: acctest.ComposeAggregateTestCheckFuncWrapper( + resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId), + resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"), + resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"), + resource.TestCheckResourceAttrSet(resourceName, "id"), + resource.TestCheckResourceAttrSet(resourceName, "instance_configuration_id"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.#", "2"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.backend_set_name"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.instance_pool_id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.load_balancer_id"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.0.port", "10"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.0.state"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.0.vnic_selection", "PrimaryVnic"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.backend_set_name"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.instance_pool_id"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.load_balancer_id"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.1.port", "10"), + resource.TestCheckResourceAttrSet(resourceName, "load_balancers.1.state"), + resource.TestCheckResourceAttr(resourceName, "load_balancers.1.vnic_selection", "PrimaryVnic"), + resource.TestCheckResourceAttr(resourceName, "placement_configurations.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.availability_domain"), + resource.TestCheckResourceAttr(resourceName, "placement_configurations.0.fault_domains.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "placement_configurations.0.primary_subnet_id"), + resource.TestCheckResourceAttr(resourceName, "size", "3"), + resource.TestCheckResourceAttr(resourceName, "state", "RUNNING"), + resource.TestCheckResourceAttrSet(resourceName, "time_created"), + + func(s *terraform.State) (err error) { + resId2, err = acctest.FromInstanceState(s, resourceName, "id") + if resId != resId2 { + return fmt.Errorf("Resource recreated when it was supposed to be updated.") + } + return err + }, + ), + }, // verify detach { Config: config + compartmentIdVariableStr + CoreInstancePoolResourceDependencies + diff --git a/internal/integrationtest/data_safe_alert_policy_test.go b/internal/integrationtest/data_safe_alert_policy_test.go index a186da9fb74..0b78d1e3898 100644 --- a/internal/integrationtest/data_safe_alert_policy_test.go +++ b/internal/integrationtest/data_safe_alert_policy_test.go @@ -130,7 +130,6 @@ func TestDataSafeAlertPolicyResource_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId), resource.TestCheckResourceAttr(resourceName, "description", "Check if remote login password file is exclusive and remote login is enabled "), resource.TestCheckResourceAttr(resourceName, "display_name", "Check remote login"), - resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"), resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttr(resourceName, "severity", "CRITICAL"), resource.TestCheckResourceAttrSet(resourceName, "state"), @@ -165,7 +164,6 @@ func TestDataSafeAlertPolicyResource_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU), resource.TestCheckResourceAttr(resourceName, "description", "Check if remote login password file is exclusive and remote login is enabled "), resource.TestCheckResourceAttr(resourceName, "display_name", "Check remote login"), - resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"), resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttr(resourceName, "severity", "CRITICAL"), resource.TestCheckResourceAttrSet(resourceName, "state"), @@ -195,7 +193,6 @@ func TestDataSafeAlertPolicyResource_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId), resource.TestCheckResourceAttr(resourceName, "description", "description2"), resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"), - resource.TestCheckResourceAttr(resourceName, "freeform_tags.%", "1"), resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttr(resourceName, "severity", "HIGH"), resource.TestCheckResourceAttrSet(resourceName, "state"), diff --git a/internal/integrationtest/datascience_model_test.go b/internal/integrationtest/datascience_model_test.go index e2a49b033b7..c4e81fcccbf 100644 --- a/internal/integrationtest/datascience_model_test.go +++ b/internal/integrationtest/datascience_model_test.go @@ -83,9 +83,9 @@ var ( "value": acctest.Representation{RepType: acctest.Optional, Create: `ner`, Update: `ner`}, } DatascienceModelRetentionSettingRepresentation = map[string]interface{}{ - "archive_after_days": acctest.Representation{RepType: acctest.Required, Create: `40`, Update: `41`}, + "archive_after_days": acctest.Representation{RepType: acctest.Required, Create: `40`, Update: `40`}, "customer_notification_type": acctest.Representation{RepType: acctest.Optional, Create: `NONE`, Update: `ALL`}, - "delete_after_days": acctest.Representation{RepType: acctest.Optional, Create: `45`, Update: `46`}, + "delete_after_days": acctest.Representation{RepType: acctest.Optional, Create: `45`, Update: `45`}, } DatascienceModelResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_datascience_project", "test_project", acctest.Required, acctest.Create, DatascienceProjectRepresentation) + @@ -226,9 +226,9 @@ func TestDatascienceModelResource_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "project_id"), resource.TestCheckResourceAttr(resourceName, "retention_operation_details.#", "1"), resource.TestCheckResourceAttr(resourceName, "retention_setting.#", "1"), - resource.TestCheckResourceAttr(resourceName, "retention_setting.0.archive_after_days", "10"), + resource.TestCheckResourceAttr(resourceName, "retention_setting.0.archive_after_days", "40"), resource.TestCheckResourceAttr(resourceName, "retention_setting.0.customer_notification_type", "NONE"), - resource.TestCheckResourceAttr(resourceName, "retention_setting.0.delete_after_days", "10"), + resource.TestCheckResourceAttr(resourceName, "retention_setting.0.delete_after_days", "45"), //resource.TestCheckResourceAttr(resourceName, "state", ACTIVE), resource.TestCheckResourceAttrSet(resourceName, "state"), resource.TestCheckResourceAttrSet(resourceName, "time_created"), @@ -272,9 +272,9 @@ func TestDatascienceModelResource_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "project_id"), resource.TestCheckResourceAttr(resourceName, "retention_operation_details.#", "1"), resource.TestCheckResourceAttr(resourceName, "retention_setting.#", "1"), - resource.TestCheckResourceAttr(resourceName, "retention_setting.0.archive_after_days", "11"), + resource.TestCheckResourceAttr(resourceName, "retention_setting.0.archive_after_days", "40"), resource.TestCheckResourceAttr(resourceName, "retention_setting.0.customer_notification_type", "ALL"), - resource.TestCheckResourceAttr(resourceName, "retention_setting.0.delete_after_days", "11"), + resource.TestCheckResourceAttr(resourceName, "retention_setting.0.delete_after_days", "45"), //resource.TestCheckResourceAttr(resourceName, "state", ACTIVE), resource.TestCheckResourceAttrSet(resourceName, "state"), resource.TestCheckResourceAttrSet(resourceName, "time_created"), @@ -309,8 +309,7 @@ func TestDatascienceModelResource_basic(t *testing.T) { resource.TestCheckResourceAttrSet(datasourceName, "models.0.project_id"), resource.TestCheckResourceAttrSet(datasourceName, "models.0.state"), resource.TestCheckResourceAttrSet(datasourceName, "models.0.time_created"), - resource.TestCheckResourceAttrSet(datasourceName, "models.0.version_id"), - resource.TestCheckResourceAttr(datasourceName, "models.0.version_label", "versionLabel2"), + resource.TestCheckResourceAttr(datasourceName, "models.0.version_label", ""), ), }, diff --git a/internal/integrationtest/identity_domains_auth_token_test.go b/internal/integrationtest/identity_domains_auth_token_test.go index ca56f0cb9c7..1f0119239c1 100644 --- a/internal/integrationtest/identity_domains_auth_token_test.go +++ b/internal/integrationtest/identity_domains_auth_token_test.go @@ -112,6 +112,7 @@ func TestIdentityDomainsAuthTokenResource_basic(t *testing.T) { Check: acctest.ComposeAggregateTestCheckFuncWrapper( resource.TestCheckResourceAttrSet(resourceName, "idcs_endpoint"), resource.TestCheckResourceAttr(resourceName, "schemas.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "token"), ), }, @@ -136,6 +137,7 @@ func TestIdentityDomainsAuthTokenResource_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.0.value", "value"), resource.TestCheckResourceAttr(resourceName, "user.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "user.0.value"), + resource.TestCheckResourceAttrSet(resourceName, "token"), func(s *terraform.State) (err error) { resId, err = acctest.FromInstanceState(s, resourceName, "id") @@ -202,6 +204,7 @@ func TestIdentityDomainsAuthTokenResource_basic(t *testing.T) { "idcs_endpoint", "resource_type_schema_version", "tags", + "token", }, ResourceName: resourceName, }, diff --git a/internal/integrationtest/identity_domains_customer_secret_key_test.go b/internal/integrationtest/identity_domains_customer_secret_key_test.go index 004035954d5..2c566aa35d4 100644 --- a/internal/integrationtest/identity_domains_customer_secret_key_test.go +++ b/internal/integrationtest/identity_domains_customer_secret_key_test.go @@ -113,6 +113,7 @@ func TestIdentityDomainsCustomerSecretKeyResource_basic(t *testing.T) { Check: acctest.ComposeAggregateTestCheckFuncWrapper( resource.TestCheckResourceAttrSet(resourceName, "idcs_endpoint"), resource.TestCheckResourceAttr(resourceName, "schemas.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "secret_key"), ), }, @@ -138,6 +139,7 @@ func TestIdentityDomainsCustomerSecretKeyResource_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.0.value", "value"), resource.TestCheckResourceAttr(resourceName, "user.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "user.0.value"), + resource.TestCheckResourceAttrSet(resourceName, "secret_key"), func(s *terraform.State) (err error) { resId, err = acctest.FromInstanceState(s, resourceName, "id") @@ -205,6 +207,7 @@ func TestIdentityDomainsCustomerSecretKeyResource_basic(t *testing.T) { "idcs_endpoint", "resource_type_schema_version", "tags", + "secret_key", }, ResourceName: resourceName, }, diff --git a/internal/integrationtest/identity_domains_oauth2client_credential_test.go b/internal/integrationtest/identity_domains_oauth2client_credential_test.go index e6f371a1ce6..38fbd52b0f8 100644 --- a/internal/integrationtest/identity_domains_oauth2client_credential_test.go +++ b/internal/integrationtest/identity_domains_oauth2client_credential_test.go @@ -124,6 +124,7 @@ func TestIdentityDomainsOAuth2ClientCredentialResource_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scopes.#", "1"), resource.TestCheckResourceAttr(resourceName, "scopes.0.audience", "audience"), resource.TestCheckResourceAttr(resourceName, "scopes.0.scope", "scope"), + resource.TestCheckResourceAttrSet(resourceName, "secret"), ), }, @@ -152,6 +153,7 @@ func TestIdentityDomainsOAuth2ClientCredentialResource_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.0.value", "value"), resource.TestCheckResourceAttr(resourceName, "user.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "user.0.value"), + resource.TestCheckResourceAttrSet(resourceName, "secret"), func(s *terraform.State) (err error) { resId, err = acctest.FromInstanceState(s, resourceName, "id") @@ -223,6 +225,7 @@ func TestIdentityDomainsOAuth2ClientCredentialResource_basic(t *testing.T) { "resource_type_schema_version", "tags", "is_reset_secret", + "secret", }, ResourceName: resourceName, }, diff --git a/internal/integrationtest/identity_domains_smtp_credential_test.go b/internal/integrationtest/identity_domains_smtp_credential_test.go index a7d42a8946f..b15f602c6ff 100644 --- a/internal/integrationtest/identity_domains_smtp_credential_test.go +++ b/internal/integrationtest/identity_domains_smtp_credential_test.go @@ -111,6 +111,7 @@ func TestIdentityDomainsSmtpCredentialResource_basic(t *testing.T) { Check: acctest.ComposeAggregateTestCheckFuncWrapper( resource.TestCheckResourceAttrSet(resourceName, "idcs_endpoint"), resource.TestCheckResourceAttr(resourceName, "schemas.#", "1"), + resource.TestCheckResourceAttrSet(resourceName, "password"), ), }, @@ -136,6 +137,7 @@ func TestIdentityDomainsSmtpCredentialResource_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "user.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "user.0.value"), resource.TestCheckResourceAttrSet(resourceName, "user_name"), + resource.TestCheckResourceAttrSet(resourceName, "password"), func(s *terraform.State) (err error) { resId, err = acctest.FromInstanceState(s, resourceName, "id") @@ -201,6 +203,7 @@ func TestIdentityDomainsSmtpCredentialResource_basic(t *testing.T) { "idcs_endpoint", "resource_type_schema_version", "tags", + "password", }, ResourceName: resourceName, }, diff --git a/internal/integrationtest/load_balancer_backend_set_test.go b/internal/integrationtest/load_balancer_backend_set_test.go index 23841c3064b..49e454fa940 100644 --- a/internal/integrationtest/load_balancer_backend_set_test.go +++ b/internal/integrationtest/load_balancer_backend_set_test.go @@ -77,6 +77,13 @@ var ( "policy": acctest.Representation{RepType: acctest.Required, Create: `LEAST_CONNECTIONS`}, } + backendSet3Representation = map[string]interface{}{ + "health_checker": acctest.RepresentationGroup{RepType: acctest.Required, Group: backendSetHealthCheckerRepresentation}, + "load_balancer_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_load_balancer_load_balancer.test_load_balancer3.id}`}, + "name": acctest.Representation{RepType: acctest.Required, Create: `backendSet3`}, + "policy": acctest.Representation{RepType: acctest.Required, Create: `LEAST_CONNECTIONS`}, + } + backendSetLBRepresentation = acctest.RepresentationCopyWithNewProperties(acctest.RepresentationCopyWithRemovedProperties(backendSetRepresentation, []string{`session_persistence_configuration`}), map[string]interface{}{ "lb_cookie_session_persistence_configuration": acctest.RepresentationGroup{RepType: acctest.Optional, Group: backendSetLbCookieSessionPersistenceConfigurationRepresentation}, }) diff --git a/internal/integrationtest/load_balancer_load_balancer_test.go b/internal/integrationtest/load_balancer_load_balancer_test.go index a0649aa0cd0..4e65f497967 100644 --- a/internal/integrationtest/load_balancer_load_balancer_test.go +++ b/internal/integrationtest/load_balancer_load_balancer_test.go @@ -70,6 +70,14 @@ var ( "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreChangesLBRepresentation}, } + loadBalancer3Representation = map[string]interface{}{ + "compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`}, + "display_name": acctest.Representation{RepType: acctest.Required, Create: `example_load_balancer3`, Update: `displayName4`}, + "shape": acctest.Representation{RepType: acctest.Required, Create: `100Mbps`, Update: `400Mbps`}, + "subnet_ids": acctest.Representation{RepType: acctest.Required, Create: []string{`${oci_core_subnet.lb_test_subnet_3.id}`, `${oci_core_subnet.lb_test_subnet_4.id}`}}, + "lifecycle": acctest.RepresentationGroup{RepType: acctest.Required, Group: ignoreChangesLBRepresentation}, + } + ignoreChangesLBRepresentation = map[string]interface{}{ "ignore_changes": acctest.Representation{RepType: acctest.Required, Create: []string{`defined_tags`}}, } diff --git a/internal/integrationtest/network_load_balancer_listener_test.go b/internal/integrationtest/network_load_balancer_listener_test.go index 2eee0daf86e..0da67a2cede 100644 --- a/internal/integrationtest/network_load_balancer_listener_test.go +++ b/internal/integrationtest/network_load_balancer_listener_test.go @@ -74,9 +74,26 @@ var ( "ip_version": acctest.Representation{RepType: acctest.Optional, Create: `IPV4`}, } + NetworkLoadBalancerL3IPListenerRepresentation = map[string]interface{}{ + "default_backend_set_name": acctest.Representation{RepType: acctest.Required, Create: `${oci_network_load_balancer_backend_set.test_backend_set.name}`}, + "name": acctest.Representation{RepType: acctest.Required, Create: `example_listener`}, + "network_load_balancer_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_network_load_balancer_network_load_balancer.test_network_load_balancer.id}`}, + "port": acctest.Representation{RepType: acctest.Required, Create: `0`, Update: `0`}, + "tcp_idle_timeout": acctest.Representation{RepType: acctest.Optional, Create: `180`, Update: `240`}, + "udp_idle_timeout": acctest.Representation{RepType: acctest.Optional, Create: `180`, Update: `300`}, + "l3ip_idle_timeout": acctest.Representation{RepType: acctest.Optional, Create: `200`, Update: `400`}, + "protocol": acctest.Representation{RepType: acctest.Required, Create: `L3IP`}, + "ip_version": acctest.Representation{RepType: acctest.Optional, Create: `IPV4`}, + "is_ppv2enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`}, + } + NetworkLoadBalancerListenerResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_core_subnet", "test_subnet", acctest.Required, acctest.Create, CoreSubnetRepresentation) + acctest.GenerateResourceFromRepresentationMap("oci_core_vcn", "test_vcn", acctest.Required, acctest.Create, CoreVcnRepresentation) + - acctest.GenerateResourceFromRepresentationMap("oci_network_load_balancer_backend_set", "test_backend_set", acctest.Required, acctest.Create, NetworkLoadBalancerBackendSetRepresentation) + + acctest.GenerateResourceFromRepresentationMap("oci_network_load_balancer_backend_set", "test_backend_set", acctest.Required, acctest.Create, + acctest.RepresentationCopyWithNewProperties(NetworkLoadBalancerBackendSetRepresentation, map[string]interface{}{ + "is_preserve_source": acctest.Representation{RepType: acctest.Optional, Create: `true`}, + "policy": acctest.Representation{RepType: acctest.Required, Create: `TWO_TUPLE`, Update: `THREE_TUPLE`}, + })) + acctest.GenerateResourceFromRepresentationMap("oci_network_load_balancer_network_load_balancer", "test_network_load_balancer", acctest.Required, acctest.Create, NetworkLoadBalancerNetworkLoadBalancerRepresentation) ) @@ -199,7 +216,6 @@ func TestNetworkLoadBalancerListenerResource_basic(t *testing.T) { }, ), }, - // verify updates to updatable parameters { Config: config + compartmentIdVariableStr + NetworkLoadBalancerListenerResourceDependencies + @@ -228,6 +244,62 @@ func TestNetworkLoadBalancerListenerResource_basic(t *testing.T) { Config: config + compartmentIdVariableStr + NetworkLoadBalancerListenerResourceDependencies, }, + // verify L3IP Listener create with optionals + { + Config: config + compartmentIdVariableStr + NetworkLoadBalancerListenerResourceDependencies + + acctest.GenerateResourceFromRepresentationMap("oci_network_load_balancer_listener", "test_listener", acctest.Optional, acctest.Create, NetworkLoadBalancerL3IPListenerRepresentation), + Check: acctest.ComposeAggregateTestCheckFuncWrapper( + resource.TestCheckResourceAttrSet(resourceName, "default_backend_set_name"), + resource.TestCheckResourceAttr(resourceName, "ip_version", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "is_ppv2enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "name", "example_listener"), + resource.TestCheckResourceAttrSet(resourceName, "network_load_balancer_id"), + resource.TestCheckResourceAttr(resourceName, "port", "0"), + resource.TestCheckResourceAttr(resourceName, "protocol", "L3IP"), + resource.TestCheckResourceAttr(resourceName, "tcp_idle_timeout", "180"), + resource.TestCheckResourceAttr(resourceName, "udp_idle_timeout", "180"), + resource.TestCheckResourceAttr(resourceName, "l3ip_idle_timeout", "200"), + + func(s *terraform.State) (err error) { + resId, err = acctest.FromInstanceState(s, resourceName, "id") + if isEnableExportCompartment, _ := strconv.ParseBool(utils.GetEnvSettingWithDefault("enable_export_compartment", "true")); isEnableExportCompartment { + if errExport := resourcediscovery.TestExportCompartmentWithResourceName(&resId, &compartmentId, resourceName); errExport != nil { + return errExport + } + } + return err + }, + ), + }, + // verify L3IP updates to updatable parameters + { + Config: config + compartmentIdVariableStr + NetworkLoadBalancerListenerResourceDependencies + + acctest.GenerateResourceFromRepresentationMap("oci_network_load_balancer_listener", "test_listener", acctest.Optional, acctest.Update, NetworkLoadBalancerL3IPListenerRepresentation), + Check: acctest.ComposeAggregateTestCheckFuncWrapper( + resource.TestCheckResourceAttrSet(resourceName, "default_backend_set_name"), + resource.TestCheckResourceAttr(resourceName, "is_ppv2enabled", "true"), + resource.TestCheckResourceAttr(resourceName, "ip_version", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "name", "example_listener"), + resource.TestCheckResourceAttrSet(resourceName, "network_load_balancer_id"), + resource.TestCheckResourceAttr(resourceName, "port", "0"), + resource.TestCheckResourceAttr(resourceName, "protocol", "L3IP"), + resource.TestCheckResourceAttr(resourceName, "tcp_idle_timeout", "240"), + resource.TestCheckResourceAttr(resourceName, "udp_idle_timeout", "300"), + resource.TestCheckResourceAttr(resourceName, "l3ip_idle_timeout", "400"), + func(s *terraform.State) (err error) { + resId2, err = acctest.FromInstanceState(s, resourceName, "id") + if resId != resId2 { + return fmt.Errorf("Resource recreated when it was supposed to be updated.") + } + return err + }, + ), + }, + // delete before next Create + { + Config: config + compartmentIdVariableStr + NetworkLoadBalancerListenerResourceDependencies, + }, + // verify Create with optionals { Config: config + compartmentIdVariableStr + NetworkLoadBalancerListenerResourceDependencies + diff --git a/internal/integrationtest/network_load_balancer_network_load_balancer_test.go b/internal/integrationtest/network_load_balancer_network_load_balancer_test.go index 33bde93a7f5..5b674b8ebaf 100644 --- a/internal/integrationtest/network_load_balancer_network_load_balancer_test.go +++ b/internal/integrationtest/network_load_balancer_network_load_balancer_test.go @@ -156,8 +156,18 @@ func TestNetworkLoadBalancerNetworkLoadBalancerResource_basic(t *testing.T) { var resId, resId2 string acctest.ResourceTest(t, testAccCheckNetworkLoadBalancerNetworkLoadBalancerDestroy, []resource.TestStep{ + // Initialize Tag dependencies: After a tag is created, if it is defined in the resource immediately, a 400-InvalidParameter error due to invalid tags may be returned. + // However, this error is not observed if we wait for some time. To prevent the issue, a preconfigured 30-second wait is added. + { + Config: config + compartmentIdVariableStr + DefinedTagsDependencies, + }, + // verify Create with optionals { + //wait for 30 sec + PreConfig: func() { + time.Sleep(30 * time.Second) + }, Config: config + compartmentIdVariableStr + NetworkLoadBalancerNetworkLoadBalancerResourceDependencies + NetworkLoadBalancerReservedIpDependencies + acctest.GenerateResourceFromRepresentationMap("oci_network_load_balancer_network_load_balancer", "test_network_load_balancer", acctest.Optional, acctest.Create, networkLoadBalancerRepresentationIpv6), Check: acctest.ComposeAggregateTestCheckFuncWrapper( diff --git a/internal/service/containerengine/containerengine_addon_resource.go b/internal/service/containerengine/containerengine_addon_resource.go index b6324fe40e2..055d539efab 100644 --- a/internal/service/containerengine/containerengine_addon_resource.go +++ b/internal/service/containerengine/containerengine_addon_resource.go @@ -75,6 +75,11 @@ func ContainerengineAddonResource() *schema.Resource { }, }, }, + "override_existing": { + Type: schema.TypeBool, + Optional: true, + Default: false, + }, "version": { Type: schema.TypeString, Optional: true, @@ -222,6 +227,11 @@ func (s *ContainerengineAddonResourceCrud) Create() error { } } + if isOverrideExisting, ok := s.D.GetOkExists("override_existing"); ok { + tmp := isOverrideExisting.(bool) + request.IsOverrideExisting = &tmp + } + if version, ok := s.D.GetOkExists("version"); ok { tmp := version.(string) request.Version = &tmp @@ -239,24 +249,36 @@ func (s *ContainerengineAddonResourceCrud) Create() error { err = s.getAddonFromWorkRequest(workId, s.D.Timeout(schema.TimeoutCreate)) if err != nil { - // Try to delete the addon - log.Printf("[DEBUG] creation failed, attempting to delete the addon: %v\n", request.AddonName) - disableAddonRequest := oci_containerengine.DisableAddonRequest{ - AddonName: request.AddonName, - ClusterId: request.ClusterId, - RequestMetadata: oci_common.RequestMetadata{ - RetryPolicy: tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "containerengine"), - }, - } + log.Printf("[DEBUG] creation failed for addon %v\n", request.AddonName) - if isRemoveExistingAddon, ok := s.D.GetOkExists("remove_addon_resources_on_delete"); ok { - tmp := isRemoveExistingAddon.(bool) - disableAddonRequest.IsRemoveExistingAddOn = &tmp + workRequestType, wrTypeErr := s.getAddonWorkRequestType(workId) + if wrTypeErr != nil { + return fmt.Errorf("can't check if addon was creating or updating: %w\n", wrTypeErr) } - _, deleteErr := s.Client.DisableAddon(context.Background(), disableAddonRequest) - if deleteErr != nil { - return deleteErr + // Don't disable the addon if Addon already existed before, signified by UpdateAddon type WR + if workRequestType == oci_containerengine.WorkRequestOperationTypeUpdateAddon { + return err + } else { + // Try to delete the addon + log.Printf("[DEBUG] attempting to delete the addon: %v\n", request.AddonName) + disableAddonRequest := oci_containerengine.DisableAddonRequest{ + AddonName: request.AddonName, + ClusterId: request.ClusterId, + RequestMetadata: oci_common.RequestMetadata{ + RetryPolicy: tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "containerengine"), + }, + } + + if isRemoveExistingAddon, ok := s.D.GetOkExists("remove_addon_resources_on_delete"); ok { + tmp := isRemoveExistingAddon.(bool) + disableAddonRequest.IsRemoveExistingAddOn = &tmp + } + + _, deleteErr := s.Client.DisableAddon(context.Background(), disableAddonRequest) + if deleteErr != nil { + return deleteErr + } } } @@ -365,6 +387,24 @@ func getErrorFromContainerengineAddonWorkRequest(client *oci_containerengine.Con return workRequestErr } +func (s *ContainerengineAddonResourceCrud) getAddonWorkRequestType(workId *string) (oci_containerengine.WorkRequestOperationTypeEnum, error) { + retryPolicy := tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "containerengine") + response, err := s.Client.GetWorkRequest(context.Background(), + oci_containerengine.GetWorkRequestRequest{ + WorkRequestId: workId, + RequestMetadata: oci_common.RequestMetadata{ + RetryPolicy: retryPolicy, + }, + }, + ) + + if err != nil { + return "", err + } + + return response.OperationType, nil +} + func (s *ContainerengineAddonResourceCrud) Get() error { request := oci_containerengine.GetAddonRequest{} diff --git a/internal/service/core/core_instance_pool_resource.go b/internal/service/core/core_instance_pool_resource.go index faccaf41be3..9b8f6af990e 100644 --- a/internal/service/core/core_instance_pool_resource.go +++ b/internal/service/core/core_instance_pool_resource.go @@ -207,7 +207,7 @@ func CoreInstancePoolResource() *schema.Resource { Computed: true, }, "load_balancers": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Computed: true, DiffSuppressFunc: tfresource.LoadBalancersSuppressDiff, @@ -402,15 +402,12 @@ func (s *CoreInstancePoolResourceCrud) Create() error { } if loadBalancers, ok := s.D.GetOkExists("load_balancers"); ok { - interfaces := loadBalancers.([]interface{}) + set := loadBalancers.(*schema.Set) + interfaces := set.List() + tmp := make([]oci_core.AttachLoadBalancerDetails, len(interfaces)) - for i := range interfaces { - stateDataIndex := i - fieldKeyFormat := fmt.Sprintf("%s.%d.%%s", "load_balancers", stateDataIndex) - converted, err := s.mapToAttachLoadBalancerDetails(fieldKeyFormat) - if err != nil { - return err - } + for i, item := range interfaces { + converted := mapToAttachLoadBalancerDetails(item.(map[string]interface{})) tmp[i] = converted } if len(tmp) != 0 || s.D.HasChange("load_balancers") { @@ -523,7 +520,12 @@ func (s *CoreInstancePoolResourceCrud) Update() error { } if _, ok := s.D.GetOkExists("load_balancers"); ok && s.D.HasChange("load_balancers") { - oldRaw, newRaw := s.D.GetChange("load_balancers") + oldPoint, newPoint := s.D.GetChange("load_balancers") + oldSet := oldPoint.(*schema.Set) + oldRaw := oldSet.List() + newSet := newPoint.(*schema.Set) + newRaw := newSet.List() + err := s.updateLoadBalancers(oldRaw, newRaw) if err != nil { return err @@ -1070,18 +1072,24 @@ func (s *CoreInstancePoolResourceCrud) oneEditAway(oldLoadBalancers []oci_core.A if Abs(newLbsLength-oldLbsLength) == 0 { deltas, positionToUpdate := s.getLoadBalancerDeltas(oldLoadBalancers, newLoadBalancers) if deltas > 1 { - return false, "", oci_core.AttachLoadBalancerDetails{}, oci_core.AttachLoadBalancerDetails{}, "Error: Failed to update load balancers details, only one load balancer can be modified but found more than one" + uniqueDeltas := s.getUniqueLoadBalancerDeltas(oldLoadBalancers, newLoadBalancers) + if uniqueDeltas > 1 { + return false, "", oci_core.AttachLoadBalancerDetails{}, oci_core.AttachLoadBalancerDetails{}, "Error: Failed to update load balancers details, only one load balancer can be modified but found more than one" + } else { + return true, "ignoreOrder", oci_core.AttachLoadBalancerDetails{}, oci_core.AttachLoadBalancerDetails{}, "Info: Ignoring order of load balancers" + } + } else if deltas == 1 && positionToUpdate == newLbsLength-1 { return true, "update", oldLoadBalancers[positionToUpdate], newLoadBalancers[positionToUpdate], "" } - return false, "", oci_core.AttachLoadBalancerDetails{}, oci_core.AttachLoadBalancerDetails{}, "Error: Failed to update load balancers, only the load balancer which is at the end of the config can be modified" + return true, "ignoreOrder", oci_core.AttachLoadBalancerDetails{}, oci_core.AttachLoadBalancerDetails{}, "Error: Failed to update load balancers, only the load balancer which is at the end of the config can be modified" } // If the new lbs length is > old one that means an attach of an lb if newLbsLength > oldLbsLength { deltas, _ := s.getLoadBalancerDeltas(oldLoadBalancers, newLoadBalancers) if deltas != 0 { - return false, "", oci_core.AttachLoadBalancerDetails{}, oci_core.AttachLoadBalancerDetails{}, "Error: Failed to attach load balancer, only the load balancer which is at the end of the config can be attached" + return true, "ignoreOrder", oci_core.AttachLoadBalancerDetails{}, oci_core.AttachLoadBalancerDetails{}, "Error: Failed to attach load balancer, only the load balancer which is at the end of the config can be attached" } return true, "attach", oci_core.AttachLoadBalancerDetails{}, newLoadBalancers[newLbsLength-1], "" } @@ -1118,45 +1126,164 @@ func (s *CoreInstancePoolResourceCrud) updateLoadBalancers(oldRaw interface{}, n if !canEdit { return fmt.Errorf(errorMsg) } - id := s.D.Id() - if operation == "detach" || operation == "update" { - detachLoadBalancerRequest := oci_core.DetachLoadBalancerRequest{} - detachLoadBalancerRequest.LoadBalancerId = oldLoadbalancer.LoadBalancerId - detachLoadBalancerRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "core") - detachLoadBalancerRequest.InstancePoolId = &id - detachLoadBalancerRequest.BackendSetName = oldLoadbalancer.BackendSetName - _, err := s.Client.DetachLoadBalancer(context.Background(), detachLoadBalancerRequest) + if operation == "ignoreOrder" { + log.Printf("Unordered edits are present in the request") + log.Printf("Error Msg from oneEditAway func: %s\n", errorMsg) + s.multipleEdits(oldBalancers, newBalancers) + } else { + id := s.D.Id() - if err != nil { - return err + if operation == "detach" || operation == "update" { + detachLoadBalancerRequest := oci_core.DetachLoadBalancerRequest{} + detachLoadBalancerRequest.LoadBalancerId = oldLoadbalancer.LoadBalancerId + detachLoadBalancerRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "core") + detachLoadBalancerRequest.InstancePoolId = &id + detachLoadBalancerRequest.BackendSetName = oldLoadbalancer.BackendSetName + _, err := s.Client.DetachLoadBalancer(context.Background(), detachLoadBalancerRequest) + + if err != nil { + return err + } + + _, err = s.pollForLbOperationCompletion(&id, &oldLoadbalancer) + + if err != nil { + return err + } } - _, err = s.pollForLbOperationCompletion(&id, &oldLoadbalancer) + if operation == "attach" || operation == "update" { + attachLoadBalancerRequest := oci_core.AttachLoadBalancerRequest{} + attachLoadBalancerRequest.InstancePoolId = &id + attachLoadBalancerRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "core") + attachLoadBalancerRequest.AttachLoadBalancerDetails = newLoadBalancer + _, err := s.Client.AttachLoadBalancer(context.Background(), attachLoadBalancerRequest) - if err != nil { - return err + if err != nil { + return err + } + + _, err = s.pollForLbOperationCompletion(&id, &attachLoadBalancerRequest.AttachLoadBalancerDetails) + + if err != nil { + return err + } + } + } + return nil +} + +/* +* +This function handles unordered addition of load balancers and multiple changes to the load balancer list. +It is designed to manage multiple attach and detach operations + +Currently, upstream filtering ensures only unordered requests are sent to this function to maintain alignment +with the other SDK. In the future, when the other SDKs are updated to handle multiple operations on the load +balancer list, we can update the conditions upstream to forward those requests to this function as well. +*/ +func (s *CoreInstancePoolResourceCrud) multipleEdits(oldLoadBalancers []oci_core.AttachLoadBalancerDetails, newLoadBalancers []oci_core.AttachLoadBalancerDetails) { + log.Printf("entering the multiple edits") + + var noChangeLBS []int + var attachLBS []oci_core.AttachLoadBalancerDetails + var detachLBS []oci_core.AttachLoadBalancerDetails + + for _, newLoadBalancer := range newLoadBalancers { + foundMatch := false + for i, oldLoadBalancer := range oldLoadBalancers { + if lbHasChanges(newLoadBalancer, oldLoadBalancer) { + continue + } + log.Printf("Adding index to noChangeLBS list") + noChangeLBS = append(noChangeLBS, i) + foundMatch = true + //break + } + if !foundMatch { + attachLBS = append(attachLBS, newLoadBalancer) + } + } + + for i, oldLoadBalancer := range oldLoadBalancers { + foundMatch := false + for _, noChangeLB := range noChangeLBS { + if i == noChangeLB { + foundMatch = true + } + } + if !foundMatch { + detachLBS = append(detachLBS, oldLoadBalancer) } } - if operation == "attach" || operation == "update" { - attachLoadBalancerRequest := oci_core.AttachLoadBalancerRequest{} - attachLoadBalancerRequest.InstancePoolId = &id - attachLoadBalancerRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "core") - attachLoadBalancerRequest.AttachLoadBalancerDetails = newLoadBalancer - _, err := s.Client.AttachLoadBalancer(context.Background(), attachLoadBalancerRequest) + id := s.D.Id() + + for _, detachLB := range detachLBS { + log.Printf("calling detach load balancer") + err := s.detachLoadBalancer(id, detachLB) + log.Printf("Detach load balancer process complete") if err != nil { - return err + log.Printf("Error occurred while detaching load balancer: %v", err) + // return err + // *** decide if we want to return err here or continue trying to detach remaining lbs } + } - _, err = s.pollForLbOperationCompletion(&id, &attachLoadBalancerRequest.AttachLoadBalancerDetails) + for _, attachLB := range attachLBS { + log.Printf("calling attach load balancer") + err := s.attachLoadBalancer(id, attachLB) + log.Printf("Attach load balancer process complete") if err != nil { - return err + log.Printf("Error occurred while attaching load balancer: %v", err) + // return err + // *** decide if we want to return err here or continue trying to attach remaining lbs } } +} + +func (s *CoreInstancePoolResourceCrud) attachLoadBalancer(id string, newLoadBalancer oci_core.AttachLoadBalancerDetails) error { + attachLoadBalancerRequest := oci_core.AttachLoadBalancerRequest{} + attachLoadBalancerRequest.InstancePoolId = &id + attachLoadBalancerRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "core") + attachLoadBalancerRequest.AttachLoadBalancerDetails = newLoadBalancer + + // Perform the actual attach operation + _, err := s.Client.AttachLoadBalancer(context.Background(), attachLoadBalancerRequest) + if err != nil { + return err + } + + _, err = s.pollForLbOperationCompletion(&id, &attachLoadBalancerRequest.AttachLoadBalancerDetails) + if err != nil { + return err + } + + return nil +} + +func (s *CoreInstancePoolResourceCrud) detachLoadBalancer(id string, oldLoadbalancer oci_core.AttachLoadBalancerDetails) error { + detachLoadBalancerRequest := oci_core.DetachLoadBalancerRequest{} + detachLoadBalancerRequest.LoadBalancerId = oldLoadbalancer.LoadBalancerId + detachLoadBalancerRequest.InstancePoolId = &id + detachLoadBalancerRequest.BackendSetName = oldLoadbalancer.BackendSetName + detachLoadBalancerRequest.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(s.DisableNotFoundRetries, "core") + + // Perform the actual detach operation + _, err := s.Client.DetachLoadBalancer(context.Background(), detachLoadBalancerRequest) + if err != nil { + return err + } + + _, err = s.pollForLbOperationCompletion(&id, &oldLoadbalancer) + if err != nil { + return err + } + return nil } @@ -1230,6 +1357,37 @@ func (s *CoreInstancePoolResourceCrud) getLoadBalancerDeltas(balancers []oci_cor return deltas, positionToUpdate } +func (s *CoreInstancePoolResourceCrud) getUniqueLoadBalancerDeltas(balancers []oci_core.AttachLoadBalancerDetails, balancers2 []oci_core.AttachLoadBalancerDetails) int { + deltas := 0 + + for _, oldLb := range balancers { + found := false + for _, newLb := range balancers2 { + if oldLb == newLb { + found = true + break + } + } + if !found { + deltas++ + } + } + for _, newLb := range balancers2 { + found := false + for _, oldLb := range balancers { + if oldLb == newLb { + found = true + break + } + } + if !found { + deltas++ + } + } + // Dividing by 2 because we calculate same delta twice + return deltas / 2.0 +} + func lbHasChanges(details oci_core.AttachLoadBalancerDetails, details2 oci_core.AttachLoadBalancerDetails) bool { return !(*details.BackendSetName == *details2.BackendSetName && *details.LoadBalancerId == *details2.LoadBalancerId && diff --git a/internal/service/data_safe/data_safe_alert_policies_data_source.go b/internal/service/data_safe/data_safe_alert_policies_data_source.go index 0071a6c2f89..34d8fa53589 100644 --- a/internal/service/data_safe/data_safe_alert_policies_data_source.go +++ b/internal/service/data_safe/data_safe_alert_policies_data_source.go @@ -123,8 +123,10 @@ func (s *DataSafeAlertPoliciesDataSourceCrud) Get() error { request.DisplayName = &tmp } - tmp := true - request.IsUserDefined = &tmp + if isUserDefined, ok := s.D.GetOkExists("is_user_defined"); ok { + tmp := isUserDefined.(bool) + request.IsUserDefined = &tmp + } if state, ok := s.D.GetOkExists("state"); ok { request.LifecycleState = oci_data_safe.ListAlertPoliciesLifecycleStateEnum(state.(string)) diff --git a/internal/service/data_safe/data_safe_export.go b/internal/service/data_safe/data_safe_export.go index e086a9362e4..ec548b72f6a 100644 --- a/internal/service/data_safe/data_safe_export.go +++ b/internal/service/data_safe/data_safe_export.go @@ -4,7 +4,11 @@ package data_safe import ( + "context" "fmt" + "strings" + + "github.com/oracle/terraform-provider-oci/internal/tfresource" oci_data_safe "github.com/oracle/oci-go-sdk/v65/datasafe" @@ -18,6 +22,7 @@ func init() { exportDataSafeTargetDatabasePeerTargetDatabaseHints.GetIdFn = getDataSafeTargetDatabasePeerTargetDatabaseId exportDataSafeDiscoveryJobsResultHints.GetIdFn = getDataSafeDiscoveryJobsResultId + exportDataSafeAlertPolicyHints.FindResourcesOverrideFn = findAlertPolicies tf_export.RegisterCompartmentGraphs("data_safe", dataSafeResourceGraph) } @@ -457,3 +462,77 @@ var dataSafeResourceGraph = tf_export.TerraformResourceGraph{ }, }, } + +func findAlertPolicies(ctx *tf_export.ResourceDiscoveryContext, tfMeta *tf_export.TerraformResourceAssociation, parent *tf_export.OCIResource, resourceGraph *tf_export.TerraformResourceGraph) (resources []*tf_export.OCIResource, err error) { + results := []*tf_export.OCIResource{} + request := oci_data_safe.ListAlertPoliciesRequest{} + tmp := true + request.IsUserDefined = &tmp + request.CompartmentId = &parent.CompartmentId + request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "data_safe") + + response, err := ctx.Clients.DataSafeClient().ListAlertPolicies(context.Background(), request) + if err != nil { + return nil, err + } + + request.Page = response.OpcNextPage + + for request.Page != nil { + listResponse, err := ctx.Clients.DataSafeClient().ListAlertPolicies(context.Background(), request) + if err != nil { + return nil, err + } + + response.Items = append(response.Items, listResponse.Items...) + request.Page = listResponse.OpcNextPage + } + + for _, alertPolicy := range response.Items { + alertPolicyResource := tf_export.ResourcesMap[tfMeta.ResourceClass] + + d := alertPolicyResource.TestResourceData() + d.SetId(*alertPolicy.Id) + + if err := alertPolicyResource.Read(d, ctx.Clients); err != nil { + rdError := &tf_export.ResourceDiscoveryError{ResourceType: tfMeta.ResourceClass, ParentResource: parent.TerraformName, Error: err, ResourceGraph: resourceGraph} + ctx.AddErrorToList(rdError) + continue + } + + state := d.Get("state") + if state != nil && len(tfMeta.DiscoverableLifecycleStates) > 0 { + discoverable := false + for _, val := range tfMeta.DiscoverableLifecycleStates { + if strings.EqualFold(state.(string), val) { + discoverable = true + break + } + } + if !discoverable { + continue + } + } + + resource := &tf_export.OCIResource{ + CompartmentId: parent.CompartmentId, + SourceAttributes: tf_export.ConvertResourceDataToMap(alertPolicyResource.Schema, d), + RawResource: alertPolicy, + TerraformResource: tf_export.TerraformResource{ + Id: d.Id(), + TerraformClass: tfMeta.ResourceClass, + }, + GetHclStringFn: tf_export.GetHclStringFromGenericMap, + Parent: parent, + } + + if resource.TerraformName, err = tf_export.GenerateTerraformNameFromResource(resource.SourceAttributes, alertPolicyResource.Schema); err != nil { + resource.TerraformName = fmt.Sprintf("%s_%s", parent.Parent.TerraformName, *alertPolicy.DisplayName) + resource.TerraformName = tf_export.CheckDuplicateResourceName(resource.TerraformName) + } + + results = append(results, resource) + } + + return results, nil +} diff --git a/internal/service/data_safe/register_datasource.go b/internal/service/data_safe/register_datasource.go index 88e2c9268d9..7965031a0f2 100644 --- a/internal/service/data_safe/register_datasource.go +++ b/internal/service/data_safe/register_datasource.go @@ -35,9 +35,9 @@ func RegisterDatasource() { tfresource.RegisterDatasource("oci_data_safe_data_safe_configuration", DataSafeDataSafeConfigurationDataSource()) tfresource.RegisterDatasource("oci_data_safe_data_safe_private_endpoint", DataSafeDataSafePrivateEndpointDataSource()) tfresource.RegisterDatasource("oci_data_safe_data_safe_private_endpoints", DataSafeDataSafePrivateEndpointsDataSource()) - + tfresource.RegisterDatasource("oci_data_safe_database_security_config", DataSafeDatabaseSecurityConfigDataSource()) + tfresource.RegisterDatasource("oci_data_safe_database_security_configs", DataSafeDatabaseSecurityConfigsDataSource()) tfresource.RegisterDatasource("oci_data_safe_discovery_analytic", DataSafeDiscoveryAnalyticDataSource()) - tfresource.RegisterDatasource("oci_data_safe_discovery_analytics", DataSafeDiscoveryAnalyticsDataSource()) tfresource.RegisterDatasource("oci_data_safe_discovery_job", DataSafeDiscoveryJobDataSource()) tfresource.RegisterDatasource("oci_data_safe_discovery_jobs", DataSafeDiscoveryJobsDataSource()) diff --git a/internal/service/datascience/datascience_model_resource.go b/internal/service/datascience/datascience_model_resource.go index d50804c98b2..522721d1e50 100644 --- a/internal/service/datascience/datascience_model_resource.go +++ b/internal/service/datascience/datascience_model_resource.go @@ -56,6 +56,21 @@ func DatascienceModelResource() *schema.Resource { Required: true, ForceNew: true, }, + "model_version_set_name": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "model_version_set_id": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "version_label": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, // Optional "backup_setting": { @@ -253,10 +268,6 @@ func DatascienceModelResource() *schema.Resource { Type: schema.TypeString, Computed: true, }, - "model_version_set_name": { - Type: schema.TypeString, - Computed: true, - }, "retention_operation_details": { Type: schema.TypeList, Computed: true, @@ -751,6 +762,18 @@ func (s *DatascienceModelResourceCrud) SetData() error { s.D.Set("description", *s.Res.Description) } + if s.Res.ModelVersionSetName != nil { + s.D.Set("model_version_set_name", *s.Res.ModelVersionSetName) + } + + if s.Res.ModelVersionSetId != nil { + s.D.Set("model_version_set_id", *s.Res.ModelVersionSetId) + } + + if s.Res.VersionLabel != nil { + s.D.Set("version_label", *s.Res.VersionLabel) + } + if s.Res.DisplayName != nil { s.D.Set("display_name", *s.Res.DisplayName) } @@ -765,14 +788,6 @@ func (s *DatascienceModelResourceCrud) SetData() error { s.D.Set("lifecycle_details", *s.Res.LifecycleDetails) } - if s.Res.ModelVersionSetId != nil { - s.D.Set("model_version_set_id", *s.Res.ModelVersionSetId) - } - - if s.Res.ModelVersionSetName != nil { - s.D.Set("model_version_set_name", *s.Res.ModelVersionSetName) - } - if s.Res.OutputSchema != nil { s.D.Set("output_schema", *s.Res.OutputSchema) } diff --git a/internal/service/datascience/datascience_models_data_source.go b/internal/service/datascience/datascience_models_data_source.go index 6f730052fff..c97820749be 100644 --- a/internal/service/datascience/datascience_models_data_source.go +++ b/internal/service/datascience/datascience_models_data_source.go @@ -6,10 +6,12 @@ package datascience import ( "context" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" oci_datascience "github.com/oracle/oci-go-sdk/v65/datascience" + "github.com/oracle/terraform-provider-oci/internal/client" "github.com/oracle/terraform-provider-oci/internal/tfresource" + + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func DatascienceModelsDataSource() *schema.Resource { @@ -23,11 +25,15 @@ func DatascienceModelsDataSource() *schema.Resource { }, "model_version_set_name": { Type: schema.TypeString, - Required: true, + Optional: true, + }, + "model_version_set_id": { + Type: schema.TypeString, + Optional: true, }, "version_label": { Type: schema.TypeString, - Required: true, + Optional: true, }, "created_by": { Type: schema.TypeString, @@ -176,10 +182,6 @@ func (s *DatascienceModelsDataSourceCrud) SetData() error { model["lifecycle_details"] = *r.LifecycleDetails } - if r.ModelVersionSetId != nil { - model["model_version_set_id"] = *r.ModelVersionSetId - } - if r.ProjectId != nil { model["project_id"] = *r.ProjectId } @@ -188,6 +190,10 @@ func (s *DatascienceModelsDataSourceCrud) SetData() error { model["model_version_set_name"] = *r.ModelVersionSetName } + if r.ModelVersionSetId != nil { + model["model_version_set_id"] = *r.ModelVersionSetId + } + if r.VersionLabel != nil { model["version_label"] = *r.VersionLabel } diff --git a/internal/service/identity_domains/identity_domains_auth_token_data_source.go b/internal/service/identity_domains/identity_domains_auth_token_data_source.go index 0910659b4c5..fb81622b673 100644 --- a/internal/service/identity_domains/identity_domains_auth_token_data_source.go +++ b/internal/service/identity_domains/identity_domains_auth_token_data_source.go @@ -187,6 +187,10 @@ func (s *IdentityDomainsAuthTokenDataSourceCrud) SetData() error { s.D.Set("tenancy_ocid", *s.Res.TenancyOcid) } + if s.Res.Token != nil { + s.D.Set("token", *s.Res.Token) + } + if s.Res.UrnIetfParamsScimSchemasOracleIdcsExtensionSelfChangeUser != nil { s.D.Set("urnietfparamsscimschemasoracleidcsextensionself_change_user", []interface{}{ExtensionSelfChangeUserToMap(s.Res.UrnIetfParamsScimSchemasOracleIdcsExtensionSelfChangeUser)}) } else { diff --git a/internal/service/identity_domains/identity_domains_auth_token_resource.go b/internal/service/identity_domains/identity_domains_auth_token_resource.go index eab41ec2045..75bbd5b68e1 100644 --- a/internal/service/identity_domains/identity_domains_auth_token_resource.go +++ b/internal/service/identity_domains/identity_domains_auth_token_resource.go @@ -337,6 +337,10 @@ func IdentityDomainsAuthTokenResource() *schema.Resource { Type: schema.TypeString, Computed: true, }, + "token": { + Type: schema.TypeString, + Computed: true, + }, }, } } @@ -667,6 +671,10 @@ func (s *IdentityDomainsAuthTokenResourceCrud) SetData() error { s.D.Set("tenancy_ocid", *s.Res.TenancyOcid) } + if s.Res.Token != nil { + s.D.Set("token", *s.Res.Token) + } + if s.Res.UrnIetfParamsScimSchemasOracleIdcsExtensionSelfChangeUser != nil { s.D.Set("urnietfparamsscimschemasoracleidcsextensionself_change_user", []interface{}{ExtensionSelfChangeUserToMap(s.Res.UrnIetfParamsScimSchemasOracleIdcsExtensionSelfChangeUser)}) } else { @@ -766,6 +774,10 @@ func AuthTokenToMap(obj oci_identity_domains.AuthToken) map[string]interface{} { result["tenancy_ocid"] = string(*obj.TenancyOcid) } + if obj.Token != nil { + result["token"] = string(*obj.Token) + } + if obj.UrnIetfParamsScimSchemasOracleIdcsExtensionSelfChangeUser != nil { result["urnietfparamsscimschemasoracleidcsextensionself_change_user"] = []interface{}{ExtensionSelfChangeUserToMap(obj.UrnIetfParamsScimSchemasOracleIdcsExtensionSelfChangeUser)} } diff --git a/internal/service/identity_domains/identity_domains_customer_secret_key_data_source.go b/internal/service/identity_domains/identity_domains_customer_secret_key_data_source.go index 20f4581c165..d4298675359 100644 --- a/internal/service/identity_domains/identity_domains_customer_secret_key_data_source.go +++ b/internal/service/identity_domains/identity_domains_customer_secret_key_data_source.go @@ -183,6 +183,10 @@ func (s *IdentityDomainsCustomerSecretKeyDataSourceCrud) SetData() error { s.D.Set("schemas", s.Res.Schemas) + if s.Res.SecretKey != nil { + s.D.Set("secret_key", *s.Res.SecretKey) + } + s.D.Set("status", s.Res.Status) tags := []interface{}{} diff --git a/internal/service/identity_domains/identity_domains_customer_secret_key_resource.go b/internal/service/identity_domains/identity_domains_customer_secret_key_resource.go index 71785d56270..0941dcb6190 100644 --- a/internal/service/identity_domains/identity_domains_customer_secret_key_resource.go +++ b/internal/service/identity_domains/identity_domains_customer_secret_key_resource.go @@ -343,6 +343,10 @@ func IdentityDomainsCustomerSecretKeyResource() *schema.Resource { }, }, }, + "secret_key": { + Type: schema.TypeString, + Computed: true, + }, "tenancy_ocid": { Type: schema.TypeString, Computed: true, @@ -678,6 +682,10 @@ func (s *IdentityDomainsCustomerSecretKeyResourceCrud) SetData() error { s.D.Set("schemas", s.Res.Schemas) + if s.Res.SecretKey != nil { + s.D.Set("secret_key", *s.Res.SecretKey) + } + s.D.Set("status", s.Res.Status) tags := []interface{}{} @@ -785,6 +793,10 @@ func CustomerSecretKeyToMap(obj oci_identity_domains.CustomerSecretKey) map[stri result["schemas"] = obj.Schemas + if obj.SecretKey != nil { + result["secret_key"] = string(*obj.SecretKey) + } + result["status"] = string(obj.Status) tags := []interface{}{} diff --git a/internal/service/identity_domains/identity_domains_oauth2client_credential_data_source.go b/internal/service/identity_domains/identity_domains_oauth2client_credential_data_source.go index d13513b18f6..d8059978944 100644 --- a/internal/service/identity_domains/identity_domains_oauth2client_credential_data_source.go +++ b/internal/service/identity_domains/identity_domains_oauth2client_credential_data_source.go @@ -189,6 +189,10 @@ func (s *IdentityDomainsOAuth2ClientCredentialDataSourceCrud) SetData() error { } s.D.Set("scopes", scopes) + if s.Res.Secret != nil { + s.D.Set("secret", *s.Res.Secret) + } + s.D.Set("status", s.Res.Status) tags := []interface{}{} diff --git a/internal/service/identity_domains/identity_domains_oauth2client_credential_resource.go b/internal/service/identity_domains/identity_domains_oauth2client_credential_resource.go index c300b1bc2fd..dd7a39eca75 100644 --- a/internal/service/identity_domains/identity_domains_oauth2client_credential_resource.go +++ b/internal/service/identity_domains/identity_domains_oauth2client_credential_resource.go @@ -368,6 +368,10 @@ func IdentityDomainsOAuth2ClientCredentialResource() *schema.Resource { }, }, }, + "secret": { + Type: schema.TypeString, + Computed: true, + }, "tenancy_ocid": { Type: schema.TypeString, Computed: true, @@ -732,6 +736,10 @@ func (s *IdentityDomainsOAuth2ClientCredentialResourceCrud) SetData() error { } s.D.Set("scopes", scopes) + if s.Res.Secret != nil { + s.D.Set("secret", *s.Res.Secret) + } + s.D.Set("status", s.Res.Status) tags := []interface{}{} @@ -856,6 +864,10 @@ func OAuth2ClientCredentialToMap(obj oci_identity_domains.OAuth2ClientCredential } result["scopes"] = scopes + if obj.Secret != nil { + result["secret"] = string(*obj.Secret) + } + result["status"] = string(obj.Status) tags := []interface{}{} diff --git a/internal/service/identity_domains/identity_domains_smtp_credential_data_source.go b/internal/service/identity_domains/identity_domains_smtp_credential_data_source.go index 7cb2285c6b5..13aab82a543 100644 --- a/internal/service/identity_domains/identity_domains_smtp_credential_data_source.go +++ b/internal/service/identity_domains/identity_domains_smtp_credential_data_source.go @@ -173,6 +173,10 @@ func (s *IdentityDomainsSmtpCredentialDataSourceCrud) SetData() error { s.D.Set("ocid", *s.Res.Ocid) } + if s.Res.Password != nil { + s.D.Set("password", *s.Res.Password) + } + s.D.Set("schemas", s.Res.Schemas) s.D.Set("status", s.Res.Status) diff --git a/internal/service/identity_domains/identity_domains_smtp_credential_resource.go b/internal/service/identity_domains/identity_domains_smtp_credential_resource.go index ffc5f67bfff..033e963a0dc 100644 --- a/internal/service/identity_domains/identity_domains_smtp_credential_resource.go +++ b/internal/service/identity_domains/identity_domains_smtp_credential_resource.go @@ -333,6 +333,10 @@ func IdentityDomainsSmtpCredentialResource() *schema.Resource { }, }, }, + "password": { + Type: schema.TypeString, + Computed: true, + }, "tenancy_ocid": { Type: schema.TypeString, Computed: true, @@ -658,6 +662,10 @@ func (s *IdentityDomainsSmtpCredentialResourceCrud) SetData() error { s.D.Set("ocid", *s.Res.Ocid) } + if s.Res.Password != nil { + s.D.Set("password", *s.Res.Password) + } + s.D.Set("schemas", s.Res.Schemas) s.D.Set("status", s.Res.Status) @@ -772,6 +780,10 @@ func SmtpCredentialToMap(obj oci_identity_domains.SmtpCredential) map[string]int result["ocid"] = string(*obj.Ocid) } + if obj.Password != nil { + result["password"] = string(*obj.Password) + } + result["schemas"] = obj.Schemas result["status"] = string(obj.Status) diff --git a/internal/service/network_load_balancer/network_load_balancer_listener_data_source.go b/internal/service/network_load_balancer/network_load_balancer_listener_data_source.go index 67a018bab05..0f78e5dad5e 100644 --- a/internal/service/network_load_balancer/network_load_balancer_listener_data_source.go +++ b/internal/service/network_load_balancer/network_load_balancer_listener_data_source.go @@ -84,6 +84,10 @@ func (s *NetworkLoadBalancerListenerDataSourceCrud) SetData() error { s.D.Set("is_ppv2enabled", *s.Res.IsPpv2Enabled) } + if s.Res.L3IpIdleTimeout != nil { + s.D.Set("l3ip_idle_timeout", *s.Res.L3IpIdleTimeout) + } + if s.Res.Name != nil { s.D.Set("name", *s.Res.Name) } diff --git a/internal/service/network_load_balancer/network_load_balancer_listener_resource.go b/internal/service/network_load_balancer/network_load_balancer_listener_resource.go index 8a0502768fd..5cf44b19f68 100644 --- a/internal/service/network_load_balancer/network_load_balancer_listener_resource.go +++ b/internal/service/network_load_balancer/network_load_balancer_listener_resource.go @@ -69,6 +69,11 @@ func NetworkLoadBalancerListenerResource() *schema.Resource { Optional: true, Computed: true, }, + "l3ip_idle_timeout": { + Type: schema.TypeInt, + Optional: true, + Computed: true, + }, "tcp_idle_timeout": { Type: schema.TypeInt, Optional: true, @@ -145,6 +150,11 @@ func (s *NetworkLoadBalancerListenerResourceCrud) Create() error { request.IsPpv2Enabled = &tmp } + if l3IpIdleTimeout, ok := s.D.GetOkExists("l3ip_idle_timeout"); ok { + tmp := l3IpIdleTimeout.(int) + request.L3IpIdleTimeout = &tmp + } + if name, ok := s.D.GetOkExists("name"); ok { tmp := name.(string) request.Name = &tmp @@ -351,6 +361,11 @@ func (s *NetworkLoadBalancerListenerResourceCrud) Update() error { request.IsPpv2Enabled = &tmp } + if l3IpIdleTimeout, ok := s.D.GetOkExists("l3ip_idle_timeout"); ok { + tmp := l3IpIdleTimeout.(int) + request.L3IpIdleTimeout = &tmp + } + if listenerName, ok := s.D.GetOkExists("name"); ok { tmp := listenerName.(string) request.ListenerName = &tmp @@ -437,6 +452,10 @@ func (s *NetworkLoadBalancerListenerResourceCrud) SetData() error { s.D.Set("is_ppv2enabled", *s.Res.IsPpv2Enabled) } + if s.Res.L3IpIdleTimeout != nil { + s.D.Set("l3ip_idle_timeout", *s.Res.L3IpIdleTimeout) + } + if s.Res.Name != nil { s.D.Set("name", *s.Res.Name) } @@ -490,6 +509,10 @@ func NlbListenerSummaryToMap(obj oci_network_load_balancer.ListenerSummary) map[ result["is_ppv2enabled"] = bool(*obj.IsPpv2Enabled) } + if obj.L3IpIdleTimeout != nil { + result["l3ip_idle_timeout"] = int(*obj.L3IpIdleTimeout) + } + if obj.Name != nil { result["name"] = string(*obj.Name) } diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_asset_source.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_asset_source.go deleted file mode 100644 index 98d91488ce4..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_asset_source.go +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// AwsAssetSource AWS asset source. Used for discovery of EC2 instances and EBS volumes registered for the AWS account. -type AwsAssetSource struct { - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the resource. - Id *string `mandatory:"true" json:"id"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment for the resource. - CompartmentId *string `mandatory:"true" json:"compartmentId"` - - // A user-friendly name for the asset source. Does not have to be unique, and it's mutable. - // Avoid entering confidential information. - DisplayName *string `mandatory:"true" json:"displayName"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the environment. - EnvironmentId *string `mandatory:"true" json:"environmentId"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the inventory that will contain created assets. - InventoryId *string `mandatory:"true" json:"inventoryId"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment that is going to be used to create assets. - AssetsCompartmentId *string `mandatory:"true" json:"assetsCompartmentId"` - - // The detailed state of the asset source. - LifecycleDetails *string `mandatory:"true" json:"lifecycleDetails"` - - // The time when the asset source was created in the RFC3339 format. - TimeCreated *common.SDKTime `mandatory:"true" json:"timeCreated"` - - // The point in time that the asset source was last updated in the RFC3339 format. - TimeUpdated *common.SDKTime `mandatory:"true" json:"timeUpdated"` - - DiscoveryCredentials *AssetSourceCredentials `mandatory:"true" json:"discoveryCredentials"` - - // AWS region information, from where the resources are discovered. - AwsRegion *string `mandatory:"true" json:"awsRegion"` - - // The key of customer's aws account to be discovered/migrated. - AwsAccountKey *string `mandatory:"true" json:"awsAccountKey"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of an attached discovery schedule. - DiscoveryScheduleId *string `mandatory:"false" json:"discoveryScheduleId"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` - - // The system tags associated with this resource, if any. The system tags are set by Oracle cloud infrastructure services. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{orcl-cloud: {free-tier-retain: true}}` - SystemTags map[string]map[string]interface{} `mandatory:"false" json:"systemTags"` - - ReplicationCredentials *AssetSourceCredentials `mandatory:"false" json:"replicationCredentials"` - - // Flag indicating whether historical metrics are collected for assets, originating from this asset source. - AreHistoricalMetricsCollected *bool `mandatory:"false" json:"areHistoricalMetricsCollected"` - - // Flag indicating whether real-time metrics are collected for assets, originating from this asset source. - AreRealtimeMetricsCollected *bool `mandatory:"false" json:"areRealtimeMetricsCollected"` - - // Flag indicating whether cost data collection is enabled for assets, originating from this asset source. - IsCostInformationCollected *bool `mandatory:"false" json:"isCostInformationCollected"` - - // The current state of the asset source. - LifecycleState AssetSourceLifecycleStateEnum `mandatory:"true" json:"lifecycleState"` -} - -// GetId returns Id -func (m AwsAssetSource) GetId() *string { - return m.Id -} - -// GetCompartmentId returns CompartmentId -func (m AwsAssetSource) GetCompartmentId() *string { - return m.CompartmentId -} - -// GetDisplayName returns DisplayName -func (m AwsAssetSource) GetDisplayName() *string { - return m.DisplayName -} - -// GetEnvironmentId returns EnvironmentId -func (m AwsAssetSource) GetEnvironmentId() *string { - return m.EnvironmentId -} - -// GetInventoryId returns InventoryId -func (m AwsAssetSource) GetInventoryId() *string { - return m.InventoryId -} - -// GetAssetsCompartmentId returns AssetsCompartmentId -func (m AwsAssetSource) GetAssetsCompartmentId() *string { - return m.AssetsCompartmentId -} - -// GetDiscoveryScheduleId returns DiscoveryScheduleId -func (m AwsAssetSource) GetDiscoveryScheduleId() *string { - return m.DiscoveryScheduleId -} - -// GetLifecycleState returns LifecycleState -func (m AwsAssetSource) GetLifecycleState() AssetSourceLifecycleStateEnum { - return m.LifecycleState -} - -// GetLifecycleDetails returns LifecycleDetails -func (m AwsAssetSource) GetLifecycleDetails() *string { - return m.LifecycleDetails -} - -// GetTimeCreated returns TimeCreated -func (m AwsAssetSource) GetTimeCreated() *common.SDKTime { - return m.TimeCreated -} - -// GetTimeUpdated returns TimeUpdated -func (m AwsAssetSource) GetTimeUpdated() *common.SDKTime { - return m.TimeUpdated -} - -// GetFreeformTags returns FreeformTags -func (m AwsAssetSource) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m AwsAssetSource) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -// GetSystemTags returns SystemTags -func (m AwsAssetSource) GetSystemTags() map[string]map[string]interface{} { - return m.SystemTags -} - -func (m AwsAssetSource) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m AwsAssetSource) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if _, ok := GetMappingAssetSourceLifecycleStateEnum(string(m.LifecycleState)); !ok && m.LifecycleState != "" { - errMessage = append(errMessage, fmt.Sprintf("unsupported enum value for LifecycleState: %s. Supported values are: %s.", m.LifecycleState, strings.Join(GetAssetSourceLifecycleStateEnumStringValues(), ","))) - } - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m AwsAssetSource) MarshalJSON() (buff []byte, e error) { - type MarshalTypeAwsAssetSource AwsAssetSource - s := struct { - DiscriminatorParam string `json:"type"` - MarshalTypeAwsAssetSource - }{ - "AWS", - (MarshalTypeAwsAssetSource)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_asset_source_summary.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_asset_source_summary.go deleted file mode 100644 index 21c58c1f12c..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_asset_source_summary.go +++ /dev/null @@ -1,171 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// AwsAssetSourceSummary Summary of an AWS asset source provided in the list. -type AwsAssetSourceSummary struct { - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the resource. - Id *string `mandatory:"true" json:"id"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment for the resource. - CompartmentId *string `mandatory:"true" json:"compartmentId"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the environment. - EnvironmentId *string `mandatory:"true" json:"environmentId"` - - // A user-friendly name for the asset source. Does not have to be unique, and it's mutable. - // Avoid entering confidential information. - DisplayName *string `mandatory:"true" json:"displayName"` - - // The detailed state of the asset source. - LifecycleDetails *string `mandatory:"true" json:"lifecycleDetails"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the inventory that will contain created assets. - InventoryId *string `mandatory:"true" json:"inventoryId"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment that is going to be used to create assets. - AssetsCompartmentId *string `mandatory:"true" json:"assetsCompartmentId"` - - // AWS region information, from where the resources are discovered. - AwsRegion *string `mandatory:"true" json:"awsRegion"` - - // The key of customer's aws account to be discovered/migrated. - AwsAccountKey *string `mandatory:"true" json:"awsAccountKey"` - - // The time when the asset source was created in RFC3339 format. - TimeCreated *common.SDKTime `mandatory:"false" json:"timeCreated"` - - // The point in time that the asset source was last updated in RFC3339 format. - TimeUpdated *common.SDKTime `mandatory:"false" json:"timeUpdated"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` - - // The system tags associated with this resource, if any. The system tags are set by Oracle cloud infrastructure services. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{orcl-cloud: {free-tier-retain: true}}` - SystemTags map[string]map[string]interface{} `mandatory:"false" json:"systemTags"` - - // The current state of the asset source. - LifecycleState AssetSourceLifecycleStateEnum `mandatory:"true" json:"lifecycleState"` -} - -// GetId returns Id -func (m AwsAssetSourceSummary) GetId() *string { - return m.Id -} - -// GetCompartmentId returns CompartmentId -func (m AwsAssetSourceSummary) GetCompartmentId() *string { - return m.CompartmentId -} - -// GetEnvironmentId returns EnvironmentId -func (m AwsAssetSourceSummary) GetEnvironmentId() *string { - return m.EnvironmentId -} - -// GetDisplayName returns DisplayName -func (m AwsAssetSourceSummary) GetDisplayName() *string { - return m.DisplayName -} - -// GetLifecycleState returns LifecycleState -func (m AwsAssetSourceSummary) GetLifecycleState() AssetSourceLifecycleStateEnum { - return m.LifecycleState -} - -// GetLifecycleDetails returns LifecycleDetails -func (m AwsAssetSourceSummary) GetLifecycleDetails() *string { - return m.LifecycleDetails -} - -// GetInventoryId returns InventoryId -func (m AwsAssetSourceSummary) GetInventoryId() *string { - return m.InventoryId -} - -// GetAssetsCompartmentId returns AssetsCompartmentId -func (m AwsAssetSourceSummary) GetAssetsCompartmentId() *string { - return m.AssetsCompartmentId -} - -// GetTimeCreated returns TimeCreated -func (m AwsAssetSourceSummary) GetTimeCreated() *common.SDKTime { - return m.TimeCreated -} - -// GetTimeUpdated returns TimeUpdated -func (m AwsAssetSourceSummary) GetTimeUpdated() *common.SDKTime { - return m.TimeUpdated -} - -// GetFreeformTags returns FreeformTags -func (m AwsAssetSourceSummary) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m AwsAssetSourceSummary) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -// GetSystemTags returns SystemTags -func (m AwsAssetSourceSummary) GetSystemTags() map[string]map[string]interface{} { - return m.SystemTags -} - -func (m AwsAssetSourceSummary) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m AwsAssetSourceSummary) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if _, ok := GetMappingAssetSourceLifecycleStateEnum(string(m.LifecycleState)); !ok && m.LifecycleState != "" { - errMessage = append(errMessage, fmt.Sprintf("unsupported enum value for LifecycleState: %s. Supported values are: %s.", m.LifecycleState, strings.Join(GetAssetSourceLifecycleStateEnumStringValues(), ","))) - } - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m AwsAssetSourceSummary) MarshalJSON() (buff []byte, e error) { - type MarshalTypeAwsAssetSourceSummary AwsAssetSourceSummary - s := struct { - DiscriminatorParam string `json:"type"` - MarshalTypeAwsAssetSourceSummary - }{ - "AWS", - (MarshalTypeAwsAssetSourceSummary)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ebs_asset.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ebs_asset.go deleted file mode 100644 index 4efe59b9ff1..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ebs_asset.go +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// AwsEbsAsset AWS EBS type of asset. -type AwsEbsAsset struct { - - // Inventory ID to which an asset belongs to. - InventoryId *string `mandatory:"true" json:"inventoryId"` - - // Asset OCID that is immutable on creation. - Id *string `mandatory:"true" json:"id"` - - // The OCID of the compartment to which an asset belongs to. - CompartmentId *string `mandatory:"true" json:"compartmentId"` - - // The source key that the asset belongs to. - SourceKey *string `mandatory:"true" json:"sourceKey"` - - // The key of the asset from the external environment. - ExternalAssetKey *string `mandatory:"true" json:"externalAssetKey"` - - // The time when the asset was created. An RFC3339 formatted datetime string. - TimeCreated *common.SDKTime `mandatory:"true" json:"timeCreated"` - - // The time when the asset was updated. An RFC3339 formatted datetime string. - TimeUpdated *common.SDKTime `mandatory:"true" json:"timeUpdated"` - - AwsEbs *AwsEbsProperties `mandatory:"true" json:"awsEbs"` - - // Asset display name. - DisplayName *string `mandatory:"false" json:"displayName"` - - // List of asset source OCID. - AssetSourceIds []string `mandatory:"false" json:"assetSourceIds"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` - - // The system tags associated with this resource, if any. The system tags are set by Oracle cloud infrastructure services. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{orcl-cloud: {free-tier-retain: true}}` - SystemTags map[string]map[string]interface{} `mandatory:"false" json:"systemTags"` - - // The current state of the asset. - LifecycleState AssetLifecycleStateEnum `mandatory:"true" json:"lifecycleState"` -} - -// GetDisplayName returns DisplayName -func (m AwsEbsAsset) GetDisplayName() *string { - return m.DisplayName -} - -// GetInventoryId returns InventoryId -func (m AwsEbsAsset) GetInventoryId() *string { - return m.InventoryId -} - -// GetId returns Id -func (m AwsEbsAsset) GetId() *string { - return m.Id -} - -// GetCompartmentId returns CompartmentId -func (m AwsEbsAsset) GetCompartmentId() *string { - return m.CompartmentId -} - -// GetSourceKey returns SourceKey -func (m AwsEbsAsset) GetSourceKey() *string { - return m.SourceKey -} - -// GetExternalAssetKey returns ExternalAssetKey -func (m AwsEbsAsset) GetExternalAssetKey() *string { - return m.ExternalAssetKey -} - -// GetTimeCreated returns TimeCreated -func (m AwsEbsAsset) GetTimeCreated() *common.SDKTime { - return m.TimeCreated -} - -// GetTimeUpdated returns TimeUpdated -func (m AwsEbsAsset) GetTimeUpdated() *common.SDKTime { - return m.TimeUpdated -} - -// GetAssetSourceIds returns AssetSourceIds -func (m AwsEbsAsset) GetAssetSourceIds() []string { - return m.AssetSourceIds -} - -// GetLifecycleState returns LifecycleState -func (m AwsEbsAsset) GetLifecycleState() AssetLifecycleStateEnum { - return m.LifecycleState -} - -// GetFreeformTags returns FreeformTags -func (m AwsEbsAsset) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m AwsEbsAsset) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -// GetSystemTags returns SystemTags -func (m AwsEbsAsset) GetSystemTags() map[string]map[string]interface{} { - return m.SystemTags -} - -func (m AwsEbsAsset) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m AwsEbsAsset) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if _, ok := GetMappingAssetLifecycleStateEnum(string(m.LifecycleState)); !ok && m.LifecycleState != "" { - errMessage = append(errMessage, fmt.Sprintf("unsupported enum value for LifecycleState: %s. Supported values are: %s.", m.LifecycleState, strings.Join(GetAssetLifecycleStateEnumStringValues(), ","))) - } - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m AwsEbsAsset) MarshalJSON() (buff []byte, e error) { - type MarshalTypeAwsEbsAsset AwsEbsAsset - s := struct { - DiscriminatorParam string `json:"assetType"` - MarshalTypeAwsEbsAsset - }{ - "AWS_EBS", - (MarshalTypeAwsEbsAsset)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ebs_properties.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ebs_properties.go deleted file mode 100644 index 27dbc700948..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ebs_properties.go +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// AwsEbsProperties AWS EBS volume related properties. -type AwsEbsProperties struct { - - // Indicates whether the volume is encrypted. - IsEncrypted *bool `mandatory:"true" json:"isEncrypted"` - - // Indicates whether Amazon EBS Multi-Attach is enabled. - IsMultiAttachEnabled *bool `mandatory:"true" json:"isMultiAttachEnabled"` - - // The size of the volume, in GiBs. - SizeInGiBs *int `mandatory:"true" json:"sizeInGiBs"` - - // The ID of the volume. - VolumeKey *string `mandatory:"true" json:"volumeKey"` - - // The volume type. - VolumeType *string `mandatory:"true" json:"volumeType"` - - // Information about the volume attachments. - Attachments []VolumeAttachment `mandatory:"false" json:"attachments"` - - // The Availability Zone for the volume. - AvailabilityZone *string `mandatory:"false" json:"availabilityZone"` - - // The number of I/O operations per second. - Iops *int `mandatory:"false" json:"iops"` - - // The volume state. - Status *string `mandatory:"false" json:"status"` - - // Any tags assigned to the volume. - Tags []Tag `mandatory:"false" json:"tags"` - - // The throughput that the volume supports, in MiB/s. - Throughput *int `mandatory:"false" json:"throughput"` -} - -func (m AwsEbsProperties) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m AwsEbsProperties) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ec2_asset.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ec2_asset.go deleted file mode 100644 index 086caff6b9d..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ec2_asset.go +++ /dev/null @@ -1,174 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// AwsEc2Asset AWS EC2 type of asset. -type AwsEc2Asset struct { - - // Inventory ID to which an asset belongs to. - InventoryId *string `mandatory:"true" json:"inventoryId"` - - // Asset OCID that is immutable on creation. - Id *string `mandatory:"true" json:"id"` - - // The OCID of the compartment to which an asset belongs to. - CompartmentId *string `mandatory:"true" json:"compartmentId"` - - // The source key that the asset belongs to. - SourceKey *string `mandatory:"true" json:"sourceKey"` - - // The key of the asset from the external environment. - ExternalAssetKey *string `mandatory:"true" json:"externalAssetKey"` - - // The time when the asset was created. An RFC3339 formatted datetime string. - TimeCreated *common.SDKTime `mandatory:"true" json:"timeCreated"` - - // The time when the asset was updated. An RFC3339 formatted datetime string. - TimeUpdated *common.SDKTime `mandatory:"true" json:"timeUpdated"` - - Compute *ComputeProperties `mandatory:"true" json:"compute"` - - Vm *VmProperties `mandatory:"true" json:"vm"` - - AwsEc2 *AwsEc2Properties `mandatory:"true" json:"awsEc2"` - - // Asset display name. - DisplayName *string `mandatory:"false" json:"displayName"` - - // List of asset source OCID. - AssetSourceIds []string `mandatory:"false" json:"assetSourceIds"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` - - // The system tags associated with this resource, if any. The system tags are set by Oracle cloud infrastructure services. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{orcl-cloud: {free-tier-retain: true}}` - SystemTags map[string]map[string]interface{} `mandatory:"false" json:"systemTags"` - - AwsEc2Cost *MonthlyCostSummary `mandatory:"false" json:"awsEc2Cost"` - - AttachedEbsVolumesCost *MonthlyCostSummary `mandatory:"false" json:"attachedEbsVolumesCost"` - - // The current state of the asset. - LifecycleState AssetLifecycleStateEnum `mandatory:"true" json:"lifecycleState"` -} - -// GetDisplayName returns DisplayName -func (m AwsEc2Asset) GetDisplayName() *string { - return m.DisplayName -} - -// GetInventoryId returns InventoryId -func (m AwsEc2Asset) GetInventoryId() *string { - return m.InventoryId -} - -// GetId returns Id -func (m AwsEc2Asset) GetId() *string { - return m.Id -} - -// GetCompartmentId returns CompartmentId -func (m AwsEc2Asset) GetCompartmentId() *string { - return m.CompartmentId -} - -// GetSourceKey returns SourceKey -func (m AwsEc2Asset) GetSourceKey() *string { - return m.SourceKey -} - -// GetExternalAssetKey returns ExternalAssetKey -func (m AwsEc2Asset) GetExternalAssetKey() *string { - return m.ExternalAssetKey -} - -// GetTimeCreated returns TimeCreated -func (m AwsEc2Asset) GetTimeCreated() *common.SDKTime { - return m.TimeCreated -} - -// GetTimeUpdated returns TimeUpdated -func (m AwsEc2Asset) GetTimeUpdated() *common.SDKTime { - return m.TimeUpdated -} - -// GetAssetSourceIds returns AssetSourceIds -func (m AwsEc2Asset) GetAssetSourceIds() []string { - return m.AssetSourceIds -} - -// GetLifecycleState returns LifecycleState -func (m AwsEc2Asset) GetLifecycleState() AssetLifecycleStateEnum { - return m.LifecycleState -} - -// GetFreeformTags returns FreeformTags -func (m AwsEc2Asset) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m AwsEc2Asset) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -// GetSystemTags returns SystemTags -func (m AwsEc2Asset) GetSystemTags() map[string]map[string]interface{} { - return m.SystemTags -} - -func (m AwsEc2Asset) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m AwsEc2Asset) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if _, ok := GetMappingAssetLifecycleStateEnum(string(m.LifecycleState)); !ok && m.LifecycleState != "" { - errMessage = append(errMessage, fmt.Sprintf("unsupported enum value for LifecycleState: %s. Supported values are: %s.", m.LifecycleState, strings.Join(GetAssetLifecycleStateEnumStringValues(), ","))) - } - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m AwsEc2Asset) MarshalJSON() (buff []byte, e error) { - type MarshalTypeAwsEc2Asset AwsEc2Asset - s := struct { - DiscriminatorParam string `json:"assetType"` - MarshalTypeAwsEc2Asset - }{ - "AWS_EC2", - (MarshalTypeAwsEc2Asset)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ec2_properties.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ec2_properties.go deleted file mode 100644 index 58bd09aec0b..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/aws_ec2_properties.go +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// AwsEc2Properties AWS virtual machine related properties. -type AwsEc2Properties struct { - - // The architecture of the image. - Architecture *string `mandatory:"true" json:"architecture"` - - // The ID of the instance. - InstanceKey *string `mandatory:"true" json:"instanceKey"` - - // The instance type. - InstanceType *string `mandatory:"true" json:"instanceType"` - - // The device name of the root device volume. - RootDeviceName *string `mandatory:"true" json:"rootDeviceName"` - - State *InstanceState `mandatory:"true" json:"state"` - - // The boot mode of the instance. - BootMode *string `mandatory:"false" json:"bootMode"` - - // The ID of the Capacity Reservation. - CapacityReservationKey *string `mandatory:"false" json:"capacityReservationKey"` - - // Indicates if the elastic inference accelerators attached to an instance - AreElasticInferenceAcceleratorsPresent *bool `mandatory:"false" json:"areElasticInferenceAcceleratorsPresent"` - - // Indicates whether the instance is enabled for AWS Nitro Enclaves. - IsEnclaveOptions *bool `mandatory:"false" json:"isEnclaveOptions"` - - // Indicates whether the instance is enabled for hibernation. - IsHibernationOptions *bool `mandatory:"false" json:"isHibernationOptions"` - - // The ID of the AMI used to launch the instance. - ImageKey *string `mandatory:"false" json:"imageKey"` - - // Indicates whether this is a Spot Instance or a Scheduled Instance. - InstanceLifecycle *string `mandatory:"false" json:"instanceLifecycle"` - - // The public IPv4 address, or the Carrier IP address assigned to the instance. - IpAddress *string `mandatory:"false" json:"ipAddress"` - - // The IPv6 address assigned to the instance. - Ipv6Address *string `mandatory:"false" json:"ipv6Address"` - - // The kernel associated with this instance, if applicable. - KernelKey *string `mandatory:"false" json:"kernelKey"` - - // The time the instance was launched. - TimeLaunch *common.SDKTime `mandatory:"false" json:"timeLaunch"` - - // The license configurations for the instance. - Licenses []string `mandatory:"false" json:"licenses"` - - // Provides information on the recovery and maintenance options of your instance. - MaintenanceOptions *string `mandatory:"false" json:"maintenanceOptions"` - - // The monitoring for the instance. - Monitoring *string `mandatory:"false" json:"monitoring"` - - // The network interfaces for the instance. - NetworkInterfaces []InstanceNetworkInterface `mandatory:"false" json:"networkInterfaces"` - - Placement *Placement `mandatory:"false" json:"placement"` - - // (IPv4 only) The private DNS hostname name assigned to the instance. - PrivateDnsName *string `mandatory:"false" json:"privateDnsName"` - - // The private IPv4 address assigned to the instance. - PrivateIpAddress *string `mandatory:"false" json:"privateIpAddress"` - - // The root device type used by the AMI. The AMI can use an EBS volume or an instance store volume. - RootDeviceType *string `mandatory:"false" json:"rootDeviceType"` - - // The security groups for the instance. - SecurityGroups []GroupIdentifier `mandatory:"false" json:"securityGroups"` - - // Indicates whether source/destination checking is enabled. - IsSourceDestCheck *bool `mandatory:"false" json:"isSourceDestCheck"` - - // If the request is a Spot Instance request, this value will be true. - IsSpotInstance *bool `mandatory:"false" json:"isSpotInstance"` - - // Specifies whether enhanced networking with the Intel 82599 Virtual Function interface is enabled. - SriovNetSupport *string `mandatory:"false" json:"sriovNetSupport"` - - // EC2-VPC The ID of the subnet in which the instance is running. - SubnetKey *string `mandatory:"false" json:"subnetKey"` - - // Any tags assigned to the instance. - Tags []Tag `mandatory:"false" json:"tags"` - - // If the instance is configured for NitroTPM support, the value is v2.0. - TpmSupport *string `mandatory:"false" json:"tpmSupport"` - - // The virtualization type of the instance. - VirtualizationType *string `mandatory:"false" json:"virtualizationType"` - - // EC2-VPC The ID of the VPC in which the instance is running. - VpcKey *string `mandatory:"false" json:"vpcKey"` -} - -func (m AwsEc2Properties) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m AwsEc2Properties) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/create_aws_asset_source_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/create_aws_asset_source_details.go deleted file mode 100644 index 2a458729d5d..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/create_aws_asset_source_details.go +++ /dev/null @@ -1,150 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// CreateAwsAssetSourceDetails AWS asset source creation request. -type CreateAwsAssetSourceDetails struct { - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment for the resource. - CompartmentId *string `mandatory:"true" json:"compartmentId"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the environment. - EnvironmentId *string `mandatory:"true" json:"environmentId"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the inventory that will contain created assets. - InventoryId *string `mandatory:"true" json:"inventoryId"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment that is going to be used to create assets. - AssetsCompartmentId *string `mandatory:"true" json:"assetsCompartmentId"` - - DiscoveryCredentials *AssetSourceCredentials `mandatory:"true" json:"discoveryCredentials"` - - // AWS region information, from where the resources are discovered. - AwsRegion *string `mandatory:"true" json:"awsRegion"` - - // The key of customer's aws account to be discovered/migrated. - AwsAccountKey *string `mandatory:"true" json:"awsAccountKey"` - - // A user-friendly name for the asset source. Does not have to be unique, and it's mutable. - // Avoid entering confidential information. The name is generated by the service if it is not - // explicitly provided. - DisplayName *string `mandatory:"false" json:"displayName"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the discovery schedule that is going to be attached to the created asset. - DiscoveryScheduleId *string `mandatory:"false" json:"discoveryScheduleId"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` - - // The system tags associated with this resource, if any. The system tags are set by Oracle cloud infrastructure services. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{orcl-cloud: {free-tier-retain: true}}` - SystemTags map[string]map[string]interface{} `mandatory:"false" json:"systemTags"` - - ReplicationCredentials *AssetSourceCredentials `mandatory:"false" json:"replicationCredentials"` - - // Flag indicating whether historical metrics are collected for assets, originating from this asset source. - AreHistoricalMetricsCollected *bool `mandatory:"false" json:"areHistoricalMetricsCollected"` - - // Flag indicating whether real-time metrics are collected for assets, originating from this asset source. - AreRealtimeMetricsCollected *bool `mandatory:"false" json:"areRealtimeMetricsCollected"` - - // Flag indicating whether cost data collection is enabled for assets, originating from this asset source. - IsCostInformationCollected *bool `mandatory:"false" json:"isCostInformationCollected"` -} - -// GetDisplayName returns DisplayName -func (m CreateAwsAssetSourceDetails) GetDisplayName() *string { - return m.DisplayName -} - -// GetCompartmentId returns CompartmentId -func (m CreateAwsAssetSourceDetails) GetCompartmentId() *string { - return m.CompartmentId -} - -// GetEnvironmentId returns EnvironmentId -func (m CreateAwsAssetSourceDetails) GetEnvironmentId() *string { - return m.EnvironmentId -} - -// GetInventoryId returns InventoryId -func (m CreateAwsAssetSourceDetails) GetInventoryId() *string { - return m.InventoryId -} - -// GetAssetsCompartmentId returns AssetsCompartmentId -func (m CreateAwsAssetSourceDetails) GetAssetsCompartmentId() *string { - return m.AssetsCompartmentId -} - -// GetDiscoveryScheduleId returns DiscoveryScheduleId -func (m CreateAwsAssetSourceDetails) GetDiscoveryScheduleId() *string { - return m.DiscoveryScheduleId -} - -// GetFreeformTags returns FreeformTags -func (m CreateAwsAssetSourceDetails) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m CreateAwsAssetSourceDetails) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -// GetSystemTags returns SystemTags -func (m CreateAwsAssetSourceDetails) GetSystemTags() map[string]map[string]interface{} { - return m.SystemTags -} - -func (m CreateAwsAssetSourceDetails) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m CreateAwsAssetSourceDetails) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m CreateAwsAssetSourceDetails) MarshalJSON() (buff []byte, e error) { - type MarshalTypeCreateAwsAssetSourceDetails CreateAwsAssetSourceDetails - s := struct { - DiscriminatorParam string `json:"type"` - MarshalTypeCreateAwsAssetSourceDetails - }{ - "AWS", - (MarshalTypeCreateAwsAssetSourceDetails)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/create_aws_ebs_asset_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/create_aws_ebs_asset_details.go deleted file mode 100644 index e770cc81d3a..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/create_aws_ebs_asset_details.go +++ /dev/null @@ -1,121 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// CreateAwsEbsAssetDetails Create AWS EBS type of asset. -type CreateAwsEbsAssetDetails struct { - - // Inventory ID to which an asset belongs. - InventoryId *string `mandatory:"true" json:"inventoryId"` - - // The OCID of the compartment that the asset belongs to. - CompartmentId *string `mandatory:"true" json:"compartmentId"` - - // The source key to which the asset belongs. - SourceKey *string `mandatory:"true" json:"sourceKey"` - - // The key of the asset from the external environment. - ExternalAssetKey *string `mandatory:"true" json:"externalAssetKey"` - - AwsEbs *AwsEbsProperties `mandatory:"true" json:"awsEbs"` - - // Asset display name. - DisplayName *string `mandatory:"false" json:"displayName"` - - // List of asset source OCID. - AssetSourceIds []string `mandatory:"false" json:"assetSourceIds"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` -} - -// GetDisplayName returns DisplayName -func (m CreateAwsEbsAssetDetails) GetDisplayName() *string { - return m.DisplayName -} - -// GetInventoryId returns InventoryId -func (m CreateAwsEbsAssetDetails) GetInventoryId() *string { - return m.InventoryId -} - -// GetCompartmentId returns CompartmentId -func (m CreateAwsEbsAssetDetails) GetCompartmentId() *string { - return m.CompartmentId -} - -// GetSourceKey returns SourceKey -func (m CreateAwsEbsAssetDetails) GetSourceKey() *string { - return m.SourceKey -} - -// GetExternalAssetKey returns ExternalAssetKey -func (m CreateAwsEbsAssetDetails) GetExternalAssetKey() *string { - return m.ExternalAssetKey -} - -// GetAssetSourceIds returns AssetSourceIds -func (m CreateAwsEbsAssetDetails) GetAssetSourceIds() []string { - return m.AssetSourceIds -} - -// GetFreeformTags returns FreeformTags -func (m CreateAwsEbsAssetDetails) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m CreateAwsEbsAssetDetails) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -func (m CreateAwsEbsAssetDetails) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m CreateAwsEbsAssetDetails) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m CreateAwsEbsAssetDetails) MarshalJSON() (buff []byte, e error) { - type MarshalTypeCreateAwsEbsAssetDetails CreateAwsEbsAssetDetails - s := struct { - DiscriminatorParam string `json:"assetType"` - MarshalTypeCreateAwsEbsAssetDetails - }{ - "AWS_EBS", - (MarshalTypeCreateAwsEbsAssetDetails)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/create_aws_ec2_asset_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/create_aws_ec2_asset_details.go deleted file mode 100644 index 5f037132ca3..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/create_aws_ec2_asset_details.go +++ /dev/null @@ -1,129 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// CreateAwsEc2AssetDetails Create AWS EC2 VM type of asset. -type CreateAwsEc2AssetDetails struct { - - // Inventory ID to which an asset belongs. - InventoryId *string `mandatory:"true" json:"inventoryId"` - - // The OCID of the compartment that the asset belongs to. - CompartmentId *string `mandatory:"true" json:"compartmentId"` - - // The source key to which the asset belongs. - SourceKey *string `mandatory:"true" json:"sourceKey"` - - // The key of the asset from the external environment. - ExternalAssetKey *string `mandatory:"true" json:"externalAssetKey"` - - Compute *ComputeProperties `mandatory:"true" json:"compute"` - - Vm *VmProperties `mandatory:"true" json:"vm"` - - AwsEc2 *AwsEc2Properties `mandatory:"true" json:"awsEc2"` - - // Asset display name. - DisplayName *string `mandatory:"false" json:"displayName"` - - // List of asset source OCID. - AssetSourceIds []string `mandatory:"false" json:"assetSourceIds"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` - - AwsEc2Cost *MonthlyCostSummary `mandatory:"false" json:"awsEc2Cost"` - - AttachedEbsVolumesCost *MonthlyCostSummary `mandatory:"false" json:"attachedEbsVolumesCost"` -} - -// GetDisplayName returns DisplayName -func (m CreateAwsEc2AssetDetails) GetDisplayName() *string { - return m.DisplayName -} - -// GetInventoryId returns InventoryId -func (m CreateAwsEc2AssetDetails) GetInventoryId() *string { - return m.InventoryId -} - -// GetCompartmentId returns CompartmentId -func (m CreateAwsEc2AssetDetails) GetCompartmentId() *string { - return m.CompartmentId -} - -// GetSourceKey returns SourceKey -func (m CreateAwsEc2AssetDetails) GetSourceKey() *string { - return m.SourceKey -} - -// GetExternalAssetKey returns ExternalAssetKey -func (m CreateAwsEc2AssetDetails) GetExternalAssetKey() *string { - return m.ExternalAssetKey -} - -// GetAssetSourceIds returns AssetSourceIds -func (m CreateAwsEc2AssetDetails) GetAssetSourceIds() []string { - return m.AssetSourceIds -} - -// GetFreeformTags returns FreeformTags -func (m CreateAwsEc2AssetDetails) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m CreateAwsEc2AssetDetails) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -func (m CreateAwsEc2AssetDetails) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m CreateAwsEc2AssetDetails) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m CreateAwsEc2AssetDetails) MarshalJSON() (buff []byte, e error) { - type MarshalTypeCreateAwsEc2AssetDetails CreateAwsEc2AssetDetails - s := struct { - DiscriminatorParam string `json:"assetType"` - MarshalTypeCreateAwsEc2AssetDetails - }{ - "AWS_EC2", - (MarshalTypeCreateAwsEc2AssetDetails)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/group_identifier.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/group_identifier.go deleted file mode 100644 index 5f6cdc984d9..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/group_identifier.go +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// GroupIdentifier Describes a security group. -type GroupIdentifier struct { - - // The ID of the security group. - GroupKey *string `mandatory:"false" json:"groupKey"` - - // The name of the security group. - GroupName *string `mandatory:"false" json:"groupName"` -} - -func (m GroupIdentifier) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m GroupIdentifier) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_network_interface.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_network_interface.go deleted file mode 100644 index d081eae117d..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_network_interface.go +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// InstanceNetworkInterface Describes a network interface. -type InstanceNetworkInterface struct { - Association *InstanceNetworkInterfaceAssociation `mandatory:"false" json:"association"` - - Attachment *InstanceNetworkInterfaceAttachment `mandatory:"false" json:"attachment"` - - // The description. - Description *string `mandatory:"false" json:"description"` - - // The security groups. - SecurityGroups []GroupIdentifier `mandatory:"false" json:"securityGroups"` - - // The type of network interface. - InterfaceType *string `mandatory:"false" json:"interfaceType"` - - // The IPv4 delegated prefixes that are assigned to the network interface. - Ipv4Prefixes []string `mandatory:"false" json:"ipv4Prefixes"` - - // The IPv6 addresses associated with the network interface. - Ipv6Addresses []string `mandatory:"false" json:"ipv6Addresses"` - - // The IPv6 delegated prefixes that are assigned to the network interface. - Ipv6Prefixes []string `mandatory:"false" json:"ipv6Prefixes"` - - // The MAC address. - MacAddress *string `mandatory:"false" json:"macAddress"` - - // The ID of the network interface. - NetworkInterfaceKey *string `mandatory:"false" json:"networkInterfaceKey"` - - // The ID of the AWS account that created the network interface. - OwnerKey *string `mandatory:"false" json:"ownerKey"` - - // The private IPv4 addresses associated with the network interface. - PrivateIpAddresses []InstancePrivateIpAddress `mandatory:"false" json:"privateIpAddresses"` - - // Indicates whether source/destination checking is enabled. - IsSourceDestCheck *bool `mandatory:"false" json:"isSourceDestCheck"` - - // The status of the network interface. - Status *string `mandatory:"false" json:"status"` - - // The ID of the subnet. - SubnetKey *string `mandatory:"false" json:"subnetKey"` -} - -func (m InstanceNetworkInterface) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m InstanceNetworkInterface) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_network_interface_association.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_network_interface_association.go deleted file mode 100644 index 5914e83db82..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_network_interface_association.go +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// InstanceNetworkInterfaceAssociation Describes association information for an Elastic IP address (IPv4). -type InstanceNetworkInterfaceAssociation struct { - - // The carrier IP address associated with the network interface. - CarrierIp *string `mandatory:"false" json:"carrierIp"` - - // The customer-owned IP address associated with the network interface. - CustomerOwnedIp *string `mandatory:"false" json:"customerOwnedIp"` - - // The ID of the owner of the Elastic IP address. - IpOwnerKey *string `mandatory:"false" json:"ipOwnerKey"` - - // The public DNS name. - PublicDnsName *string `mandatory:"false" json:"publicDnsName"` - - // The public IP address or Elastic IP address bound to the network interface. - PublicIp *string `mandatory:"false" json:"publicIp"` -} - -func (m InstanceNetworkInterfaceAssociation) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m InstanceNetworkInterfaceAssociation) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_network_interface_attachment.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_network_interface_attachment.go deleted file mode 100644 index c96dd9e2233..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_network_interface_attachment.go +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// InstanceNetworkInterfaceAttachment Describes a network interface attachment. -type InstanceNetworkInterfaceAttachment struct { - - // The ID of the network interface attachment. - AttachmentKey *string `mandatory:"false" json:"attachmentKey"` - - // The timestamp when the attachment initiated. - TimeAttach *common.SDKTime `mandatory:"false" json:"timeAttach"` - - // Indicates whether the network interface is deleted when the instance is terminated. - IsDeleteOnTermination *bool `mandatory:"false" json:"isDeleteOnTermination"` - - // The index of the device on the instance for the network interface attachment. - DeviceIndex *int `mandatory:"false" json:"deviceIndex"` - - // The index of the network card. - NetworkCardIndex *int `mandatory:"false" json:"networkCardIndex"` - - // The attachment state. - Status *string `mandatory:"false" json:"status"` -} - -func (m InstanceNetworkInterfaceAttachment) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m InstanceNetworkInterfaceAttachment) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_private_ip_address.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_private_ip_address.go deleted file mode 100644 index d7bca8576ce..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_private_ip_address.go +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// InstancePrivateIpAddress Describes a private IPv4 address. -type InstancePrivateIpAddress struct { - Association *InstanceNetworkInterfaceAssociation `mandatory:"false" json:"association"` - - // Indicates whether this IPv4 address is the primary private IP address of the network interface. - IsPrimary *bool `mandatory:"false" json:"isPrimary"` - - // The private IPv4 DNS name. - PrivateDnsName *string `mandatory:"false" json:"privateDnsName"` - - // The private IPv4 address of the network interface. - PrivateIpAddress *string `mandatory:"false" json:"privateIpAddress"` -} - -func (m InstancePrivateIpAddress) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m InstancePrivateIpAddress) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_state.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_state.go deleted file mode 100644 index 3686f7f462e..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/instance_state.go +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// InstanceState Describes the current state of an instance. -type InstanceState struct { - - // The state of the instance as a 16-bit unsigned integer. - Code *int `mandatory:"false" json:"code"` - - // The current state of the instance. - Name *string `mandatory:"false" json:"name"` -} - -func (m InstanceState) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m InstanceState) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/list_supported_cloud_regions_request_response.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/list_supported_cloud_regions_request_response.go deleted file mode 100644 index 7ba5887aaa9..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/list_supported_cloud_regions_request_response.go +++ /dev/null @@ -1,241 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "net/http" - "strings" -) - -// ListSupportedCloudRegionsRequest wrapper for the ListSupportedCloudRegions operation -// -// # See also -// -// Click https://docs.cloud.oracle.com/en-us/iaas/tools/go-sdk-examples/latest/cloudbridge/ListSupportedCloudRegions.go.html to see an example of how to use ListSupportedCloudRegionsRequest. -type ListSupportedCloudRegionsRequest struct { - - // The asset source type. - AssetSourceType ListSupportedCloudRegionsAssetSourceTypeEnum `mandatory:"false" contributesTo:"query" name:"assetSourceType" omitEmpty:"true"` - - // A filter to return only supported cloud regions which name contains given nameContains as sub-string. - NameContains *string `mandatory:"false" contributesTo:"query" name:"nameContains"` - - // The field to sort by. Only one sort order may be provided. By default, name is in ascending order. - SortBy ListSupportedCloudRegionsSortByEnum `mandatory:"false" contributesTo:"query" name:"sortBy" omitEmpty:"true"` - - // The sort order to use, either 'ASC' or 'DESC'. - SortOrder ListSupportedCloudRegionsSortOrderEnum `mandatory:"false" contributesTo:"query" name:"sortOrder" omitEmpty:"true"` - - // The maximum number of items to return. - Limit *int `mandatory:"false" contributesTo:"query" name:"limit"` - - // A token representing the position at which to start retrieving results. This must come from the `opc-next-page` header field of a previous response. - Page *string `mandatory:"false" contributesTo:"query" name:"page"` - - // The client request ID for tracing. - OpcRequestId *string `mandatory:"false" contributesTo:"header" name:"opc-request-id"` - - // Metadata about the request. This information will not be transmitted to the service, but - // represents information that the SDK will consume to drive retry behavior. - RequestMetadata common.RequestMetadata -} - -func (request ListSupportedCloudRegionsRequest) String() string { - return common.PointerString(request) -} - -// HTTPRequest implements the OCIRequest interface -func (request ListSupportedCloudRegionsRequest) HTTPRequest(method, path string, binaryRequestBody *common.OCIReadSeekCloser, extraHeaders map[string]string) (http.Request, error) { - - _, err := request.ValidateEnumValue() - if err != nil { - return http.Request{}, err - } - return common.MakeDefaultHTTPRequestWithTaggedStructAndExtraHeaders(method, path, request, extraHeaders) -} - -// BinaryRequestBody implements the OCIRequest interface -func (request ListSupportedCloudRegionsRequest) BinaryRequestBody() (*common.OCIReadSeekCloser, bool) { - - return nil, false - -} - -// RetryPolicy implements the OCIRetryableRequest interface. This retrieves the specified retry policy. -func (request ListSupportedCloudRegionsRequest) RetryPolicy() *common.RetryPolicy { - return request.RequestMetadata.RetryPolicy -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (request ListSupportedCloudRegionsRequest) ValidateEnumValue() (bool, error) { - errMessage := []string{} - if _, ok := GetMappingListSupportedCloudRegionsAssetSourceTypeEnum(string(request.AssetSourceType)); !ok && request.AssetSourceType != "" { - errMessage = append(errMessage, fmt.Sprintf("unsupported enum value for AssetSourceType: %s. Supported values are: %s.", request.AssetSourceType, strings.Join(GetListSupportedCloudRegionsAssetSourceTypeEnumStringValues(), ","))) - } - if _, ok := GetMappingListSupportedCloudRegionsSortByEnum(string(request.SortBy)); !ok && request.SortBy != "" { - errMessage = append(errMessage, fmt.Sprintf("unsupported enum value for SortBy: %s. Supported values are: %s.", request.SortBy, strings.Join(GetListSupportedCloudRegionsSortByEnumStringValues(), ","))) - } - if _, ok := GetMappingListSupportedCloudRegionsSortOrderEnum(string(request.SortOrder)); !ok && request.SortOrder != "" { - errMessage = append(errMessage, fmt.Sprintf("unsupported enum value for SortOrder: %s. Supported values are: %s.", request.SortOrder, strings.Join(GetListSupportedCloudRegionsSortOrderEnumStringValues(), ","))) - } - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// ListSupportedCloudRegionsResponse wrapper for the ListSupportedCloudRegions operation -type ListSupportedCloudRegionsResponse struct { - - // The underlying http response - RawResponse *http.Response - - // A list of SupportedCloudRegionCollection instances - SupportedCloudRegionCollection `presentIn:"body"` - - // Unique Oracle-assigned identifier for the request. If you need to contact - // Oracle about a particular request, please provide the request ID. - OpcRequestId *string `presentIn:"header" name:"opc-request-id"` - - // For pagination of a list of items. When paging through a list, if this header appears in the response, - // then a partial list might have been returned. Include this value as the `page` parameter for the - // subsequent GET request to get the next batch of items. - OpcNextPage *string `presentIn:"header" name:"opc-next-page"` -} - -func (response ListSupportedCloudRegionsResponse) String() string { - return common.PointerString(response) -} - -// HTTPResponse implements the OCIResponse interface -func (response ListSupportedCloudRegionsResponse) HTTPResponse() *http.Response { - return response.RawResponse -} - -// ListSupportedCloudRegionsAssetSourceTypeEnum Enum with underlying type: string -type ListSupportedCloudRegionsAssetSourceTypeEnum string - -// Set of constants representing the allowable values for ListSupportedCloudRegionsAssetSourceTypeEnum -const ( - ListSupportedCloudRegionsAssetSourceTypeVmware ListSupportedCloudRegionsAssetSourceTypeEnum = "VMWARE" - ListSupportedCloudRegionsAssetSourceTypeAws ListSupportedCloudRegionsAssetSourceTypeEnum = "AWS" -) - -var mappingListSupportedCloudRegionsAssetSourceTypeEnum = map[string]ListSupportedCloudRegionsAssetSourceTypeEnum{ - "VMWARE": ListSupportedCloudRegionsAssetSourceTypeVmware, - "AWS": ListSupportedCloudRegionsAssetSourceTypeAws, -} - -var mappingListSupportedCloudRegionsAssetSourceTypeEnumLowerCase = map[string]ListSupportedCloudRegionsAssetSourceTypeEnum{ - "vmware": ListSupportedCloudRegionsAssetSourceTypeVmware, - "aws": ListSupportedCloudRegionsAssetSourceTypeAws, -} - -// GetListSupportedCloudRegionsAssetSourceTypeEnumValues Enumerates the set of values for ListSupportedCloudRegionsAssetSourceTypeEnum -func GetListSupportedCloudRegionsAssetSourceTypeEnumValues() []ListSupportedCloudRegionsAssetSourceTypeEnum { - values := make([]ListSupportedCloudRegionsAssetSourceTypeEnum, 0) - for _, v := range mappingListSupportedCloudRegionsAssetSourceTypeEnum { - values = append(values, v) - } - return values -} - -// GetListSupportedCloudRegionsAssetSourceTypeEnumStringValues Enumerates the set of values in String for ListSupportedCloudRegionsAssetSourceTypeEnum -func GetListSupportedCloudRegionsAssetSourceTypeEnumStringValues() []string { - return []string{ - "VMWARE", - "AWS", - } -} - -// GetMappingListSupportedCloudRegionsAssetSourceTypeEnum performs case Insensitive comparison on enum value and return the desired enum -func GetMappingListSupportedCloudRegionsAssetSourceTypeEnum(val string) (ListSupportedCloudRegionsAssetSourceTypeEnum, bool) { - enum, ok := mappingListSupportedCloudRegionsAssetSourceTypeEnumLowerCase[strings.ToLower(val)] - return enum, ok -} - -// ListSupportedCloudRegionsSortByEnum Enum with underlying type: string -type ListSupportedCloudRegionsSortByEnum string - -// Set of constants representing the allowable values for ListSupportedCloudRegionsSortByEnum -const ( - ListSupportedCloudRegionsSortByName ListSupportedCloudRegionsSortByEnum = "name" -) - -var mappingListSupportedCloudRegionsSortByEnum = map[string]ListSupportedCloudRegionsSortByEnum{ - "name": ListSupportedCloudRegionsSortByName, -} - -var mappingListSupportedCloudRegionsSortByEnumLowerCase = map[string]ListSupportedCloudRegionsSortByEnum{ - "name": ListSupportedCloudRegionsSortByName, -} - -// GetListSupportedCloudRegionsSortByEnumValues Enumerates the set of values for ListSupportedCloudRegionsSortByEnum -func GetListSupportedCloudRegionsSortByEnumValues() []ListSupportedCloudRegionsSortByEnum { - values := make([]ListSupportedCloudRegionsSortByEnum, 0) - for _, v := range mappingListSupportedCloudRegionsSortByEnum { - values = append(values, v) - } - return values -} - -// GetListSupportedCloudRegionsSortByEnumStringValues Enumerates the set of values in String for ListSupportedCloudRegionsSortByEnum -func GetListSupportedCloudRegionsSortByEnumStringValues() []string { - return []string{ - "name", - } -} - -// GetMappingListSupportedCloudRegionsSortByEnum performs case Insensitive comparison on enum value and return the desired enum -func GetMappingListSupportedCloudRegionsSortByEnum(val string) (ListSupportedCloudRegionsSortByEnum, bool) { - enum, ok := mappingListSupportedCloudRegionsSortByEnumLowerCase[strings.ToLower(val)] - return enum, ok -} - -// ListSupportedCloudRegionsSortOrderEnum Enum with underlying type: string -type ListSupportedCloudRegionsSortOrderEnum string - -// Set of constants representing the allowable values for ListSupportedCloudRegionsSortOrderEnum -const ( - ListSupportedCloudRegionsSortOrderAsc ListSupportedCloudRegionsSortOrderEnum = "ASC" - ListSupportedCloudRegionsSortOrderDesc ListSupportedCloudRegionsSortOrderEnum = "DESC" -) - -var mappingListSupportedCloudRegionsSortOrderEnum = map[string]ListSupportedCloudRegionsSortOrderEnum{ - "ASC": ListSupportedCloudRegionsSortOrderAsc, - "DESC": ListSupportedCloudRegionsSortOrderDesc, -} - -var mappingListSupportedCloudRegionsSortOrderEnumLowerCase = map[string]ListSupportedCloudRegionsSortOrderEnum{ - "asc": ListSupportedCloudRegionsSortOrderAsc, - "desc": ListSupportedCloudRegionsSortOrderDesc, -} - -// GetListSupportedCloudRegionsSortOrderEnumValues Enumerates the set of values for ListSupportedCloudRegionsSortOrderEnum -func GetListSupportedCloudRegionsSortOrderEnumValues() []ListSupportedCloudRegionsSortOrderEnum { - values := make([]ListSupportedCloudRegionsSortOrderEnum, 0) - for _, v := range mappingListSupportedCloudRegionsSortOrderEnum { - values = append(values, v) - } - return values -} - -// GetListSupportedCloudRegionsSortOrderEnumStringValues Enumerates the set of values in String for ListSupportedCloudRegionsSortOrderEnum -func GetListSupportedCloudRegionsSortOrderEnumStringValues() []string { - return []string{ - "ASC", - "DESC", - } -} - -// GetMappingListSupportedCloudRegionsSortOrderEnum performs case Insensitive comparison on enum value and return the desired enum -func GetMappingListSupportedCloudRegionsSortOrderEnum(val string) (ListSupportedCloudRegionsSortOrderEnum, bool) { - enum, ok := mappingListSupportedCloudRegionsSortOrderEnumLowerCase[strings.ToLower(val)] - return enum, ok -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/monthly_cost_summary.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/monthly_cost_summary.go deleted file mode 100644 index 0865acd6c2a..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/monthly_cost_summary.go +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// MonthlyCostSummary Cost information for monthly maintenance. -type MonthlyCostSummary struct { - - // Monthly costs for maintenance of this asset. - Amount *float64 `mandatory:"true" json:"amount"` - - // Currency code as defined by ISO-4217. - CurrencyCode *string `mandatory:"true" json:"currencyCode"` -} - -func (m MonthlyCostSummary) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m MonthlyCostSummary) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/placement.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/placement.go deleted file mode 100644 index a0eeeef07b2..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/placement.go +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// Placement Describes the placement of an instance. -type Placement struct { - - // The affinity setting for the instance on the Dedicated Host. - Affinity *string `mandatory:"false" json:"affinity"` - - // The Availability Zone of the instance. - AvailabilityZone *string `mandatory:"false" json:"availabilityZone"` - - // The name of the placement group the instance is in. - GroupName *string `mandatory:"false" json:"groupName"` - - // The ID of the Dedicated Host on which the instance resides. - HostKey *string `mandatory:"false" json:"hostKey"` - - // The ARN of the host resource group in which to launch the instances. - HostResourceGroupArn *string `mandatory:"false" json:"hostResourceGroupArn"` - - // The number of the partition that the instance is in. - PartitionNumber *int `mandatory:"false" json:"partitionNumber"` - - // Reserved for future use. - SpreadDomain *string `mandatory:"false" json:"spreadDomain"` - - // The tenancy of the instance (if the instance is running in a VPC). - Tenancy *string `mandatory:"false" json:"tenancy"` -} - -func (m Placement) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m Placement) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/supported_cloud_region_collection.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/supported_cloud_region_collection.go deleted file mode 100644 index 5ad3ca78a99..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/supported_cloud_region_collection.go +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// SupportedCloudRegionCollection Collection of supported cloud regions. -type SupportedCloudRegionCollection struct { - - // List of supported cloud regions. - Items []SupportedCloudRegionSummary `mandatory:"true" json:"items"` -} - -func (m SupportedCloudRegionCollection) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m SupportedCloudRegionCollection) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/supported_cloud_region_lifecycle_state.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/supported_cloud_region_lifecycle_state.go deleted file mode 100644 index 95577bbb378..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/supported_cloud_region_lifecycle_state.go +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "strings" -) - -// SupportedCloudRegionLifecycleStateEnum Enum with underlying type: string -type SupportedCloudRegionLifecycleStateEnum string - -// Set of constants representing the allowable values for SupportedCloudRegionLifecycleStateEnum -const ( - SupportedCloudRegionLifecycleStateActive SupportedCloudRegionLifecycleStateEnum = "ACTIVE" - SupportedCloudRegionLifecycleStateInactive SupportedCloudRegionLifecycleStateEnum = "INACTIVE" -) - -var mappingSupportedCloudRegionLifecycleStateEnum = map[string]SupportedCloudRegionLifecycleStateEnum{ - "ACTIVE": SupportedCloudRegionLifecycleStateActive, - "INACTIVE": SupportedCloudRegionLifecycleStateInactive, -} - -var mappingSupportedCloudRegionLifecycleStateEnumLowerCase = map[string]SupportedCloudRegionLifecycleStateEnum{ - "active": SupportedCloudRegionLifecycleStateActive, - "inactive": SupportedCloudRegionLifecycleStateInactive, -} - -// GetSupportedCloudRegionLifecycleStateEnumValues Enumerates the set of values for SupportedCloudRegionLifecycleStateEnum -func GetSupportedCloudRegionLifecycleStateEnumValues() []SupportedCloudRegionLifecycleStateEnum { - values := make([]SupportedCloudRegionLifecycleStateEnum, 0) - for _, v := range mappingSupportedCloudRegionLifecycleStateEnum { - values = append(values, v) - } - return values -} - -// GetSupportedCloudRegionLifecycleStateEnumStringValues Enumerates the set of values in String for SupportedCloudRegionLifecycleStateEnum -func GetSupportedCloudRegionLifecycleStateEnumStringValues() []string { - return []string{ - "ACTIVE", - "INACTIVE", - } -} - -// GetMappingSupportedCloudRegionLifecycleStateEnum performs case Insensitive comparison on enum value and return the desired enum -func GetMappingSupportedCloudRegionLifecycleStateEnum(val string) (SupportedCloudRegionLifecycleStateEnum, bool) { - enum, ok := mappingSupportedCloudRegionLifecycleStateEnumLowerCase[strings.ToLower(val)] - return enum, ok -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/supported_cloud_region_summary.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/supported_cloud_region_summary.go deleted file mode 100644 index 1bcfb726af7..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/supported_cloud_region_summary.go +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// SupportedCloudRegionSummary Summary of the supported cloud region. -type SupportedCloudRegionSummary struct { - - // The asset source type associated with the supported cloud region. - AssetSourceType AssetSourceTypeEnum `mandatory:"true" json:"assetSourceType"` - - // The supported cloud region name. - Name *string `mandatory:"true" json:"name"` - - // The current state of the supported cloud region. - LifecycleState SupportedCloudRegionLifecycleStateEnum `mandatory:"true" json:"lifecycleState"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` -} - -func (m SupportedCloudRegionSummary) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m SupportedCloudRegionSummary) ValidateEnumValue() (bool, error) { - errMessage := []string{} - if _, ok := GetMappingAssetSourceTypeEnum(string(m.AssetSourceType)); !ok && m.AssetSourceType != "" { - errMessage = append(errMessage, fmt.Sprintf("unsupported enum value for AssetSourceType: %s. Supported values are: %s.", m.AssetSourceType, strings.Join(GetAssetSourceTypeEnumStringValues(), ","))) - } - if _, ok := GetMappingSupportedCloudRegionLifecycleStateEnum(string(m.LifecycleState)); !ok && m.LifecycleState != "" { - errMessage = append(errMessage, fmt.Sprintf("unsupported enum value for LifecycleState: %s. Supported values are: %s.", m.LifecycleState, strings.Join(GetSupportedCloudRegionLifecycleStateEnumStringValues(), ","))) - } - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/tag.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/tag.go deleted file mode 100644 index 334284f8ada..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/tag.go +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// Tag Describes a tag. -type Tag struct { - - // The key of the tag. - Key *string `mandatory:"false" json:"key"` - - // The value of the tag. - Value *string `mandatory:"false" json:"value"` -} - -func (m Tag) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m Tag) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/update_aws_asset_source_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/update_aws_asset_source_details.go deleted file mode 100644 index 3e483f60a94..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/update_aws_asset_source_details.go +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// UpdateAwsAssetSourceDetails AWS asset source update request. -type UpdateAwsAssetSourceDetails struct { - - // A user-friendly name for the asset source. Does not have to be unique, and it's mutable. - // Avoid entering confidential information. - DisplayName *string `mandatory:"false" json:"displayName"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the compartment that is going to be used to create assets. - AssetsCompartmentId *string `mandatory:"false" json:"assetsCompartmentId"` - - // The OCID (https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm) of the discovery schedule that is going to be assigned to an asset source. - DiscoveryScheduleId *string `mandatory:"false" json:"discoveryScheduleId"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` - - // The system tags associated with this resource, if any. The system tags are set by Oracle cloud infrastructure services. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{orcl-cloud: {free-tier-retain: true}}` - SystemTags map[string]map[string]interface{} `mandatory:"false" json:"systemTags"` - - DiscoveryCredentials *AssetSourceCredentials `mandatory:"false" json:"discoveryCredentials"` - - ReplicationCredentials *AssetSourceCredentials `mandatory:"false" json:"replicationCredentials"` - - // Flag indicating whether historical metrics are collected for assets, originating from this asset source. - AreHistoricalMetricsCollected *bool `mandatory:"false" json:"areHistoricalMetricsCollected"` - - // Flag indicating whether real-time metrics are collected for assets, originating from this asset source. - AreRealtimeMetricsCollected *bool `mandatory:"false" json:"areRealtimeMetricsCollected"` - - // Flag indicating whether cost data collection is enabled for assets, originating from this asset source. - IsCostInformationCollected *bool `mandatory:"false" json:"isCostInformationCollected"` -} - -// GetDisplayName returns DisplayName -func (m UpdateAwsAssetSourceDetails) GetDisplayName() *string { - return m.DisplayName -} - -// GetAssetsCompartmentId returns AssetsCompartmentId -func (m UpdateAwsAssetSourceDetails) GetAssetsCompartmentId() *string { - return m.AssetsCompartmentId -} - -// GetDiscoveryScheduleId returns DiscoveryScheduleId -func (m UpdateAwsAssetSourceDetails) GetDiscoveryScheduleId() *string { - return m.DiscoveryScheduleId -} - -// GetFreeformTags returns FreeformTags -func (m UpdateAwsAssetSourceDetails) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m UpdateAwsAssetSourceDetails) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -// GetSystemTags returns SystemTags -func (m UpdateAwsAssetSourceDetails) GetSystemTags() map[string]map[string]interface{} { - return m.SystemTags -} - -func (m UpdateAwsAssetSourceDetails) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m UpdateAwsAssetSourceDetails) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m UpdateAwsAssetSourceDetails) MarshalJSON() (buff []byte, e error) { - type MarshalTypeUpdateAwsAssetSourceDetails UpdateAwsAssetSourceDetails - s := struct { - DiscriminatorParam string `json:"type"` - MarshalTypeUpdateAwsAssetSourceDetails - }{ - "AWS", - (MarshalTypeUpdateAwsAssetSourceDetails)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/update_aws_ebs_asset_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/update_aws_ebs_asset_details.go deleted file mode 100644 index e00f831c633..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/update_aws_ebs_asset_details.go +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// UpdateAwsEbsAssetDetails The information of AWS EBS asset to be updated. -type UpdateAwsEbsAssetDetails struct { - - // Asset display name. - DisplayName *string `mandatory:"false" json:"displayName"` - - // List of asset source OCID. - AssetSourceIds []string `mandatory:"false" json:"assetSourceIds"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` - - AwsEbs *AwsEbsProperties `mandatory:"false" json:"awsEbs"` -} - -// GetDisplayName returns DisplayName -func (m UpdateAwsEbsAssetDetails) GetDisplayName() *string { - return m.DisplayName -} - -// GetAssetSourceIds returns AssetSourceIds -func (m UpdateAwsEbsAssetDetails) GetAssetSourceIds() []string { - return m.AssetSourceIds -} - -// GetFreeformTags returns FreeformTags -func (m UpdateAwsEbsAssetDetails) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m UpdateAwsEbsAssetDetails) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -func (m UpdateAwsEbsAssetDetails) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m UpdateAwsEbsAssetDetails) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m UpdateAwsEbsAssetDetails) MarshalJSON() (buff []byte, e error) { - type MarshalTypeUpdateAwsEbsAssetDetails UpdateAwsEbsAssetDetails - s := struct { - DiscriminatorParam string `json:"assetType"` - MarshalTypeUpdateAwsEbsAssetDetails - }{ - "AWS_EBS", - (MarshalTypeUpdateAwsEbsAssetDetails)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/update_aws_ec2_asset_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/update_aws_ec2_asset_details.go deleted file mode 100644 index 749f1dae786..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/update_aws_ec2_asset_details.go +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "encoding/json" - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// UpdateAwsEc2AssetDetails The information of AWS VM asset to be updated. -type UpdateAwsEc2AssetDetails struct { - - // Asset display name. - DisplayName *string `mandatory:"false" json:"displayName"` - - // List of asset source OCID. - AssetSourceIds []string `mandatory:"false" json:"assetSourceIds"` - - // The freeform tags associated with this resource, if any. Each tag is a simple key-value pair with no - // predefined name, type, or namespace/scope. For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Department": "Finance"}` - FreeformTags map[string]string `mandatory:"false" json:"freeformTags"` - - // The defined tags associated with this resource, if any. Each key is predefined and scoped to namespaces. - // For more information, see Resource Tags (https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). - // Example: `{"Operations": {"CostCenter": "42"}}` - DefinedTags map[string]map[string]interface{} `mandatory:"false" json:"definedTags"` - - Compute *ComputeProperties `mandatory:"false" json:"compute"` - - Vm *VmProperties `mandatory:"false" json:"vm"` - - AwsEc2 *AwsEc2Properties `mandatory:"false" json:"awsEc2"` - - AwsEc2Cost *MonthlyCostSummary `mandatory:"false" json:"awsEc2Cost"` - - AttachedEbsVolumesCost *MonthlyCostSummary `mandatory:"false" json:"attachedEbsVolumesCost"` -} - -// GetDisplayName returns DisplayName -func (m UpdateAwsEc2AssetDetails) GetDisplayName() *string { - return m.DisplayName -} - -// GetAssetSourceIds returns AssetSourceIds -func (m UpdateAwsEc2AssetDetails) GetAssetSourceIds() []string { - return m.AssetSourceIds -} - -// GetFreeformTags returns FreeformTags -func (m UpdateAwsEc2AssetDetails) GetFreeformTags() map[string]string { - return m.FreeformTags -} - -// GetDefinedTags returns DefinedTags -func (m UpdateAwsEc2AssetDetails) GetDefinedTags() map[string]map[string]interface{} { - return m.DefinedTags -} - -func (m UpdateAwsEc2AssetDetails) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m UpdateAwsEc2AssetDetails) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} - -// MarshalJSON marshals to json representation -func (m UpdateAwsEc2AssetDetails) MarshalJSON() (buff []byte, e error) { - type MarshalTypeUpdateAwsEc2AssetDetails UpdateAwsEc2AssetDetails - s := struct { - DiscriminatorParam string `json:"assetType"` - MarshalTypeUpdateAwsEc2AssetDetails - }{ - "AWS_EC2", - (MarshalTypeUpdateAwsEc2AssetDetails)(m), - } - - return json.Marshal(&s) -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/volume_attachment.go b/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/volume_attachment.go deleted file mode 100644 index 54ffadb292a..00000000000 --- a/vendor/github.com/oracle/oci-go-sdk/v65/cloudbridge/volume_attachment.go +++ /dev/null @@ -1,51 +0,0 @@ -// Copyright (c) 2016, 2018, 2024, Oracle and/or its affiliates. All rights reserved. -// This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -// Code generated. DO NOT EDIT. - -// Oracle Cloud Bridge API -// -// API for Oracle Cloud Bridge service. -// - -package cloudbridge - -import ( - "fmt" - "github.com/oracle/oci-go-sdk/v65/common" - "strings" -) - -// VolumeAttachment Describes volume attachment details. -type VolumeAttachment struct { - - // Indicates whether the EBS volume is deleted on instance termination. - IsDeleteOnTermination *bool `mandatory:"false" json:"isDeleteOnTermination"` - - // The device name. - Device *string `mandatory:"false" json:"device"` - - // The ID of the instance. - InstanceKey *string `mandatory:"false" json:"instanceKey"` - - // The attachment state of the volume. - Status *string `mandatory:"false" json:"status"` - - // The ID of the volume. - VolumeKey *string `mandatory:"false" json:"volumeKey"` -} - -func (m VolumeAttachment) String() string { - return common.PointerString(m) -} - -// ValidateEnumValue returns an error when providing an unsupported enum value -// This function is being called during constructing API request process -// Not recommended for calling this function directly -func (m VolumeAttachment) ValidateEnumValue() (bool, error) { - errMessage := []string{} - - if len(errMessage) > 0 { - return true, fmt.Errorf(strings.Join(errMessage, "\n")) - } - return false, nil -} diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/containerengine/install_addon_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/containerengine/install_addon_details.go index cd9a7669086..4fe7ad4787c 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/containerengine/install_addon_details.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/containerengine/install_addon_details.go @@ -28,6 +28,9 @@ type InstallAddonDetails struct { // Addon configuration details. Configurations []AddonConfiguration `mandatory:"false" json:"configurations"` + + // Whether or not to override an existing addon installation. Defaults to false. If set to true, any existing addon installation would be overridden as per new installation details. + IsOverrideExisting *bool `mandatory:"false" json:"isOverrideExisting"` } func (m InstallAddonDetails) String() string { diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/create_listener_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/create_listener_details.go index 6f1d93b5ff5..bea5393999f 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/create_listener_details.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/create_listener_details.go @@ -30,9 +30,8 @@ type CreateListenerDetails struct { // Example: `80` Port *int `mandatory:"true" json:"port"` - // The protocol on which the listener accepts connection requests. - // To get a list of valid protocols, use the ListProtocols - // operation. + // The protocol on which the listener accepts connection requests. The supported protocols are HTTP, HTTP2, TCP, and GRPC. + // You can also use the ListProtocols operation to get a list of valid protocols. // Example: `HTTP` Protocol *string `mandatory:"true" json:"protocol"` diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/listener.go b/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/listener.go index ae1c79b543a..1e6cddab893 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/listener.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/listener.go @@ -33,9 +33,8 @@ type Listener struct { // Example: `80` Port *int `mandatory:"true" json:"port"` - // The protocol on which the listener accepts connection requests. - // To get a list of valid protocols, use the ListProtocols - // operation. + // The protocol on which the listener accepts connection requests. The supported protocols are HTTP, HTTP2, TCP, and GRPC. + // You can also use the ListProtocols operation to get a list of valid protocols. // Example: `HTTP` Protocol *string `mandatory:"true" json:"protocol"` diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/listener_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/listener_details.go index 914f4a4f592..9814c72eb9f 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/listener_details.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/listener_details.go @@ -27,9 +27,8 @@ type ListenerDetails struct { // Example: `80` Port *int `mandatory:"true" json:"port"` - // The protocol on which the listener accepts connection requests. - // To get a list of valid protocols, use the ListProtocols - // operation. + // The protocol on which the listener accepts connection requests. The supported protocols are HTTP, HTTP2, TCP, and GRPC. + // You can also use the ListProtocols operation to get a list of valid protocols. // Example: `HTTP` Protocol *string `mandatory:"true" json:"protocol"` diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/update_listener_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/update_listener_details.go index 5299af72381..87d824005a5 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/update_listener_details.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/loadbalancer/update_listener_details.go @@ -27,9 +27,8 @@ type UpdateListenerDetails struct { // Example: `80` Port *int `mandatory:"true" json:"port"` - // The protocol on which the listener accepts connection requests. - // To get a list of valid protocols, use the ListProtocols - // operation. + // The protocol on which the listener accepts connection requests. The supported protocols are HTTP, HTTP2, TCP, and GRPC. + // You can also use the ListProtocols operation to get a list of valid protocols. // Example: `HTTP` Protocol *string `mandatory:"true" json:"protocol"` diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set.go index f0616ef9a5c..bdc8a7ae676 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set.go @@ -27,7 +27,6 @@ type BackendSet struct { // Example: `example_backend_set` Name *string `mandatory:"true" json:"name"` - // The health check policy configuration. HealthChecker *HealthChecker `mandatory:"true" json:"healthChecker"` // The network load balancer policy for the backend set. diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set_details.go index 666a7490b92..dac452a9824 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set_details.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set_details.go @@ -20,8 +20,6 @@ import ( // Managing Backend Sets (https://docs.cloud.oracle.com/Content/Balance/Tasks/managingbackendsets.htm). // **Caution:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. type BackendSetDetails struct { - - // The health check policy configuration. HealthChecker *HealthChecker `mandatory:"true" json:"healthChecker"` // The network load balancer policy for the backend set. diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set_summary.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set_summary.go index e807c241f5a..cb1886532af 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set_summary.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/backend_set_summary.go @@ -15,7 +15,10 @@ import ( "strings" ) -// BackendSetSummary The representation of BackendSetSummary +// BackendSetSummary The configuration of a network load balancer backend set. +// For more information about backend set configuration, see +// Managing Backend Sets (https://docs.cloud.oracle.com/Content/Balance/Tasks/managingbackendsets.htm). +// **Caution:** Oracle recommends that you avoid using any confidential information when you supply string values using the API. type BackendSetSummary struct { // A user-friendly name for the backend set that must be unique and cannot be changed. @@ -31,7 +34,6 @@ type BackendSetSummary struct { // An array of backends. Backends []Backend `mandatory:"true" json:"backends"` - // The health check policy configuration. HealthChecker *HealthChecker `mandatory:"true" json:"healthChecker"` // If this parameter is enabled, the network load balancer preserves the source IP of the packet forwarded to the backend servers. diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/create_listener_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/create_listener_details.go index f7a5faa926c..b73698b96c4 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/create_listener_details.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/create_listener_details.go @@ -52,6 +52,10 @@ type CreateListenerDetails struct { // The duration for UDP idle timeout in seconds. // Example: `120` UdpIdleTimeout *int `mandatory:"false" json:"udpIdleTimeout"` + + // The duration for L3IP idle timeout in seconds. + // Example: `200` + L3IpIdleTimeout *int `mandatory:"false" json:"l3IpIdleTimeout"` } func (m CreateListenerDetails) String() string { diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener.go index b2da9e1185b..655a86a6ec8 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener.go @@ -52,6 +52,10 @@ type Listener struct { // The duration for UDP idle timeout in seconds. // Example: `120` UdpIdleTimeout *int `mandatory:"false" json:"udpIdleTimeout"` + + // The duration for L3IP idle timeout in seconds. + // Example: `200` + L3IpIdleTimeout *int `mandatory:"false" json:"l3IpIdleTimeout"` } func (m Listener) String() string { diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_details.go index 194c1399f6a..3437ab66579 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_details.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_details.go @@ -52,6 +52,10 @@ type ListenerDetails struct { // The duration for UDP idle timeout in seconds. // Example: `120` UdpIdleTimeout *int `mandatory:"false" json:"udpIdleTimeout"` + + // The duration for L3IP idle timeout in seconds. + // Example: `200` + L3IpIdleTimeout *int `mandatory:"false" json:"l3IpIdleTimeout"` } func (m ListenerDetails) String() string { diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_protocols.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_protocols.go index 14afdbfea60..f77bb18e515 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_protocols.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_protocols.go @@ -22,6 +22,7 @@ const ( ListenerProtocolsTcp ListenerProtocolsEnum = "TCP" ListenerProtocolsUdp ListenerProtocolsEnum = "UDP" ListenerProtocolsTcpAndUdp ListenerProtocolsEnum = "TCP_AND_UDP" + ListenerProtocolsL3Ip ListenerProtocolsEnum = "L3IP" ) var mappingListenerProtocolsEnum = map[string]ListenerProtocolsEnum{ @@ -29,6 +30,7 @@ var mappingListenerProtocolsEnum = map[string]ListenerProtocolsEnum{ "TCP": ListenerProtocolsTcp, "UDP": ListenerProtocolsUdp, "TCP_AND_UDP": ListenerProtocolsTcpAndUdp, + "L3IP": ListenerProtocolsL3Ip, } var mappingListenerProtocolsEnumLowerCase = map[string]ListenerProtocolsEnum{ @@ -36,6 +38,7 @@ var mappingListenerProtocolsEnumLowerCase = map[string]ListenerProtocolsEnum{ "tcp": ListenerProtocolsTcp, "udp": ListenerProtocolsUdp, "tcp_and_udp": ListenerProtocolsTcpAndUdp, + "l3ip": ListenerProtocolsL3Ip, } // GetListenerProtocolsEnumValues Enumerates the set of values for ListenerProtocolsEnum @@ -54,6 +57,7 @@ func GetListenerProtocolsEnumStringValues() []string { "TCP", "UDP", "TCP_AND_UDP", + "L3IP", } } diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_summary.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_summary.go index a2f8f8e26d6..f50b9d26a9c 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_summary.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/listener_summary.go @@ -52,6 +52,10 @@ type ListenerSummary struct { // The duration for UDP idle timeout in seconds. // Example: `120` UdpIdleTimeout *int `mandatory:"false" json:"udpIdleTimeout"` + + // The duration for L3IP idle timeout in seconds. + // Example: `200` + L3IpIdleTimeout *int `mandatory:"false" json:"l3IpIdleTimeout"` } func (m ListenerSummary) String() string { diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/network_load_balancers_protocol_summary.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/network_load_balancers_protocol_summary.go index 7d16a10bcc3..92dc5380a61 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/network_load_balancers_protocol_summary.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/network_load_balancers_protocol_summary.go @@ -22,6 +22,7 @@ const ( NetworkLoadBalancersProtocolSummaryTcp NetworkLoadBalancersProtocolSummaryEnum = "TCP" NetworkLoadBalancersProtocolSummaryUdp NetworkLoadBalancersProtocolSummaryEnum = "UDP" NetworkLoadBalancersProtocolSummaryTcpAndUdp NetworkLoadBalancersProtocolSummaryEnum = "TCP_AND_UDP" + NetworkLoadBalancersProtocolSummaryL3Ip NetworkLoadBalancersProtocolSummaryEnum = "L3IP" ) var mappingNetworkLoadBalancersProtocolSummaryEnum = map[string]NetworkLoadBalancersProtocolSummaryEnum{ @@ -29,6 +30,7 @@ var mappingNetworkLoadBalancersProtocolSummaryEnum = map[string]NetworkLoadBalan "TCP": NetworkLoadBalancersProtocolSummaryTcp, "UDP": NetworkLoadBalancersProtocolSummaryUdp, "TCP_AND_UDP": NetworkLoadBalancersProtocolSummaryTcpAndUdp, + "L3IP": NetworkLoadBalancersProtocolSummaryL3Ip, } var mappingNetworkLoadBalancersProtocolSummaryEnumLowerCase = map[string]NetworkLoadBalancersProtocolSummaryEnum{ @@ -36,6 +38,7 @@ var mappingNetworkLoadBalancersProtocolSummaryEnumLowerCase = map[string]Network "tcp": NetworkLoadBalancersProtocolSummaryTcp, "udp": NetworkLoadBalancersProtocolSummaryUdp, "tcp_and_udp": NetworkLoadBalancersProtocolSummaryTcpAndUdp, + "l3ip": NetworkLoadBalancersProtocolSummaryL3Ip, } // GetNetworkLoadBalancersProtocolSummaryEnumValues Enumerates the set of values for NetworkLoadBalancersProtocolSummaryEnum @@ -54,6 +57,7 @@ func GetNetworkLoadBalancersProtocolSummaryEnumStringValues() []string { "TCP", "UDP", "TCP_AND_UDP", + "L3IP", } } diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/update_listener_details.go b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/update_listener_details.go index e0f1ff5a3b3..fdc59ed7dbc 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/update_listener_details.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/networkloadbalancer/update_listener_details.go @@ -48,6 +48,10 @@ type UpdateListenerDetails struct { // The duration for UDP idle timeout in seconds. // Example: `120` UdpIdleTimeout *int `mandatory:"false" json:"udpIdleTimeout"` + + // The duration for L3IP idle timeout in seconds. + // Example: `200` + L3IpIdleTimeout *int `mandatory:"false" json:"l3IpIdleTimeout"` } func (m UpdateListenerDetails) String() string { diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_accessrequests_client.go b/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_accessrequests_client.go index 424a4c32ae8..f3c5bf275cb 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_accessrequests_client.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_accessrequests_client.go @@ -147,7 +147,7 @@ func (client AccessRequestsClient) approveAccessRequest(ctx context.Context, req defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ApproveAccessRequest" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "ApproveAccessRequest", apiReferenceLink) return response, err } @@ -205,7 +205,7 @@ func (client AccessRequestsClient) getAccessRequest(ctx context.Context, request defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/GetAccessRequest" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "GetAccessRequest", apiReferenceLink) return response, err } @@ -263,7 +263,7 @@ func (client AccessRequestsClient) getAuditLogReport(ctx context.Context, reques defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AuditLogReport/GetAuditLogReport" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "GetAuditLogReport", apiReferenceLink) return response, err } @@ -326,7 +326,7 @@ func (client AccessRequestsClient) interactionRequest(ctx context.Context, reque defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/InteractionRequest" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "InteractionRequest", apiReferenceLink) return response, err } @@ -384,7 +384,7 @@ func (client AccessRequestsClient) listAccessRequestHistories(ctx context.Contex defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ListAccessRequestHistories" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "ListAccessRequestHistories", apiReferenceLink) return response, err } @@ -442,7 +442,7 @@ func (client AccessRequestsClient) listAccessRequests(ctx context.Context, reque defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ListAccessRequests" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "ListAccessRequests", apiReferenceLink) return response, err } @@ -500,7 +500,7 @@ func (client AccessRequestsClient) listInteractions(ctx context.Context, request defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ListInteractions" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "ListInteractions", apiReferenceLink) return response, err } @@ -563,7 +563,7 @@ func (client AccessRequestsClient) rejectAccessRequest(ctx context.Context, requ defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/RejectAccessRequest" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "RejectAccessRequest", apiReferenceLink) return response, err } @@ -626,7 +626,7 @@ func (client AccessRequestsClient) reviewAccessRequest(ctx context.Context, requ defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/ReviewAccessRequest" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "ReviewAccessRequest", apiReferenceLink) return response, err } @@ -689,7 +689,7 @@ func (client AccessRequestsClient) revokeAccessRequest(ctx context.Context, requ defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/AccessRequest/RevokeAccessRequest" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "AccessRequests", "RevokeAccessRequest", apiReferenceLink) return response, err } diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatoractions_client.go b/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatoractions_client.go index 6687364007b..b413ca57aa7 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatoractions_client.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatoractions_client.go @@ -142,7 +142,7 @@ func (client OperatorActionsClient) getOperatorAction(ctx context.Context, reque defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorAction/GetOperatorAction" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorActions", "GetOperatorAction", apiReferenceLink) return response, err } @@ -200,7 +200,7 @@ func (client OperatorActionsClient) listOperatorActions(ctx context.Context, req defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorAction/ListOperatorActions" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorActions", "ListOperatorActions", apiReferenceLink) return response, err } diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatorcontrol_client.go b/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatorcontrol_client.go index 2b51302e031..89ad306561b 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatorcontrol_client.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatorcontrol_client.go @@ -147,7 +147,7 @@ func (client OperatorControlClient) changeOperatorControlCompartment(ctx context defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/ChangeOperatorControlCompartment" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControl", "ChangeOperatorControlCompartment", apiReferenceLink) return response, err } @@ -210,7 +210,7 @@ func (client OperatorControlClient) createOperatorControl(ctx context.Context, r defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/CreateOperatorControl" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControl", "CreateOperatorControl", apiReferenceLink) return response, err } @@ -272,7 +272,7 @@ func (client OperatorControlClient) deleteOperatorControl(ctx context.Context, r defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/DeleteOperatorControl" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControl", "DeleteOperatorControl", apiReferenceLink) return response, err } @@ -330,7 +330,7 @@ func (client OperatorControlClient) getOperatorControl(ctx context.Context, requ defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/GetOperatorControl" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControl", "GetOperatorControl", apiReferenceLink) return response, err } @@ -388,7 +388,7 @@ func (client OperatorControlClient) listOperatorControls(ctx context.Context, re defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/ListOperatorControls" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControl", "ListOperatorControls", apiReferenceLink) return response, err } @@ -446,7 +446,7 @@ func (client OperatorControlClient) updateOperatorControl(ctx context.Context, r defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControl/UpdateOperatorControl" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControl", "UpdateOperatorControl", apiReferenceLink) return response, err } diff --git a/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatorcontrolassignment_client.go b/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatorcontrolassignment_client.go index 135ae8313a1..66514381913 100644 --- a/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatorcontrolassignment_client.go +++ b/vendor/github.com/oracle/oci-go-sdk/v65/operatoraccesscontrol/operatoraccesscontrol_operatorcontrolassignment_client.go @@ -147,7 +147,7 @@ func (client OperatorControlAssignmentClient) changeOperatorControlAssignmentCom defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ChangeOperatorControlAssignmentCompartment" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControlAssignment", "ChangeOperatorControlAssignmentCompartment", apiReferenceLink) return response, err } @@ -210,7 +210,7 @@ func (client OperatorControlAssignmentClient) createOperatorControlAssignment(ct defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/CreateOperatorControlAssignment" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControlAssignment", "CreateOperatorControlAssignment", apiReferenceLink) return response, err } @@ -268,7 +268,7 @@ func (client OperatorControlAssignmentClient) deleteOperatorControlAssignment(ct defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/DeleteOperatorControlAssignment" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControlAssignment", "DeleteOperatorControlAssignment", apiReferenceLink) return response, err } @@ -326,7 +326,7 @@ func (client OperatorControlAssignmentClient) getAssignmentValidationStatus(ctx defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/GetAssignmentValidationStatus" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControlAssignment", "GetAssignmentValidationStatus", apiReferenceLink) return response, err } @@ -384,7 +384,7 @@ func (client OperatorControlAssignmentClient) getOperatorControlAssignment(ctx c defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/GetOperatorControlAssignment" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControlAssignment", "GetOperatorControlAssignment", apiReferenceLink) return response, err } @@ -442,7 +442,7 @@ func (client OperatorControlAssignmentClient) listOperatorControlAssignments(ctx defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ListOperatorControlAssignments" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControlAssignment", "ListOperatorControlAssignments", apiReferenceLink) return response, err } @@ -500,7 +500,7 @@ func (client OperatorControlAssignmentClient) updateOperatorControlAssignment(ct defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/UpdateOperatorControlAssignment" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControlAssignment", "UpdateOperatorControlAssignment", apiReferenceLink) return response, err } @@ -563,7 +563,7 @@ func (client OperatorControlAssignmentClient) validateOperatorAssignment(ctx con defer common.CloseBodyIfValid(httpResponse) response.RawResponse = httpResponse if err != nil { - apiReferenceLink := "https://docs.oracle.com/iaas/api/#/en/operatoraccesscontrol/20200630/OperatorControlAssignment/ValidateOperatorAssignment" + apiReferenceLink := "" err = common.PostProcessServiceError(err, "OperatorControlAssignment", "ValidateOperatorAssignment", apiReferenceLink) return response, err } diff --git a/website/docs/d/containerengine_node_pools.html.markdown b/website/docs/d/containerengine_node_pools.html.markdown index bdcd6498113..5d7a132147f 100644 --- a/website/docs/d/containerengine_node_pools.html.markdown +++ b/website/docs/d/containerengine_node_pools.html.markdown @@ -101,7 +101,7 @@ The following attributes are exported: * `node_source_details` - Source running on the nodes in the node pool. * `boot_volume_size_in_gbs` - The size of the boot volume in GBs. Minimum value is 50 GB. See [here](https://docs.cloud.oracle.com/en-us/iaas/Content/Block/Concepts/bootvolumes.htm) for max custom boot volume sizing and OS-specific requirements. * `image_id` - The OCID of the image used to boot the node. - * `source_type` - The source type for the node. Use `IMAGE` when specifying an OCID of an image. + * `source_type` - The source type for the node. Use `IMAGE` when specifying an OCID of an image. * `quantity_per_subnet` - The number of nodes in each subnet. * `ssh_public_key` - The SSH public key on each node in the node pool on launch. * `state` - The state of the nodepool. diff --git a/website/docs/d/identity_domains_auth_token.html.markdown b/website/docs/d/identity_domains_auth_token.html.markdown index e4b13d4bf2e..98daf9585ec 100644 --- a/website/docs/d/identity_domains_auth_token.html.markdown +++ b/website/docs/d/identity_domains_auth_token.html.markdown @@ -403,6 +403,17 @@ The following attributes are exported: * returned: default * type: string * uniqueness: none +* `token` - token + + **Added In:** 2010242156 + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsSensitive: hash_sc * `urnietfparamsscimschemasoracleidcsextensionself_change_user` - Controls whether a user can update themselves or not via User related APIs * `allow_self_change` - If true, allows requesting user to update themselves. If false, requesting user can't update themself (default). diff --git a/website/docs/d/identity_domains_auth_tokens.html.markdown b/website/docs/d/identity_domains_auth_tokens.html.markdown index cae3c410928..579a252585d 100644 --- a/website/docs/d/identity_domains_auth_tokens.html.markdown +++ b/website/docs/d/identity_domains_auth_tokens.html.markdown @@ -413,6 +413,17 @@ The following attributes are exported: * returned: default * type: string * uniqueness: none +* `token` - token + + **Added In:** 2010242156 + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsSensitive: hash_sc * `urnietfparamsscimschemasoracleidcsextensionself_change_user` - Controls whether a user can update themselves or not via User related APIs * `allow_self_change` - If true, allows requesting user to update themselves. If false, requesting user can't update themself (default). diff --git a/website/docs/d/identity_domains_customer_secret_key.html.markdown b/website/docs/d/identity_domains_customer_secret_key.html.markdown index 84c01dc9563..181a90e0df2 100644 --- a/website/docs/d/identity_domains_customer_secret_key.html.markdown +++ b/website/docs/d/identity_domains_customer_secret_key.html.markdown @@ -360,6 +360,14 @@ The following attributes are exported: * returned: default * type: string * uniqueness: none +* `secret_key` - The secret key. + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default * `status` - The user's credential status. **Added In:** 2109090424 diff --git a/website/docs/d/identity_domains_customer_secret_keys.html.markdown b/website/docs/d/identity_domains_customer_secret_keys.html.markdown index cf5b1e4ba15..9b0b1bd3c2d 100644 --- a/website/docs/d/identity_domains_customer_secret_keys.html.markdown +++ b/website/docs/d/identity_domains_customer_secret_keys.html.markdown @@ -370,6 +370,14 @@ The following attributes are exported: * returned: default * type: string * uniqueness: none +* `secret_key` - The secret key. + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default * `status` - The user's credential status. **Added In:** 2109090424 diff --git a/website/docs/d/identity_domains_oauth2client_credential.html.markdown b/website/docs/d/identity_domains_oauth2client_credential.html.markdown index 320404e6d82..6cb8d020c42 100644 --- a/website/docs/d/identity_domains_oauth2client_credential.html.markdown +++ b/website/docs/d/identity_domains_oauth2client_credential.html.markdown @@ -395,6 +395,16 @@ The following attributes are exported: * multiValued: false * required: true * returned: default +* `secret` - Secret + + **SCIM++ Properties:** + * caseExact: false + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsScimCompliant: false + * idcsSensitive: hash_sc * `status` - The user's credential status. **Added In:** 2109090424 diff --git a/website/docs/d/identity_domains_oauth2client_credentials.html.markdown b/website/docs/d/identity_domains_oauth2client_credentials.html.markdown index fa8865a36a3..f6f646357fd 100644 --- a/website/docs/d/identity_domains_oauth2client_credentials.html.markdown +++ b/website/docs/d/identity_domains_oauth2client_credentials.html.markdown @@ -405,6 +405,16 @@ The following attributes are exported: * multiValued: false * required: true * returned: default +* `secret` - Secret + + **SCIM++ Properties:** + * caseExact: false + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsScimCompliant: false + * idcsSensitive: hash_sc * `status` - The user's credential status. **Added In:** 2109090424 diff --git a/website/docs/d/identity_domains_smtp_credential.html.markdown b/website/docs/d/identity_domains_smtp_credential.html.markdown index d58a4c9109e..274f874bdd6 100644 --- a/website/docs/d/identity_domains_smtp_credential.html.markdown +++ b/website/docs/d/identity_domains_smtp_credential.html.markdown @@ -333,6 +333,15 @@ The following attributes are exported: * returned: default * type: string * uniqueness: global +* `password` - Password + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsSensitive: hash_sc * `schemas` - REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard \"enterprise\" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior. **SCIM++ Properties:** diff --git a/website/docs/d/identity_domains_smtp_credentials.html.markdown b/website/docs/d/identity_domains_smtp_credentials.html.markdown index 38ffbd23bc4..06ddb14901c 100644 --- a/website/docs/d/identity_domains_smtp_credentials.html.markdown +++ b/website/docs/d/identity_domains_smtp_credentials.html.markdown @@ -343,6 +343,15 @@ The following attributes are exported: * returned: default * type: string * uniqueness: global +* `password` - Password + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsSensitive: hash_sc * `schemas` - REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard \"enterprise\" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior. **SCIM++ Properties:** diff --git a/website/docs/d/network_load_balancer_backend_set.html.markdown b/website/docs/d/network_load_balancer_backend_set.html.markdown index 83f005c45b1..f26cc7401d4 100644 --- a/website/docs/d/network_load_balancer_backend_set.html.markdown +++ b/website/docs/d/network_load_balancer_backend_set.html.markdown @@ -36,16 +36,16 @@ The following arguments are supported: The following attributes are exported: -* `backends` - Array of backends. - * `ip_address` - The IP address of the backend server. Example: `10.0.0.3` - * `is_backup` - Whether the network load balancer should treat this server as a backup unit. If `true`, then the network load balancer forwards no ingress traffic to this backend server unless all other backend servers not marked as "isBackup" fail the health check policy. Example: `false` - * `is_drain` - Whether the network load balancer should drain this server. Servers marked "isDrain" receive no incoming traffic. Example: `false` - * `is_offline` - Whether the network load balancer should treat this server as offline. Offline servers receive no incoming traffic. Example: `false` - * `name` - A read-only field showing the IP address/IP OCID and port that uniquely identify this backend server in the backend set. Example: `10.0.0.3:8080`, or `ocid1.privateip..oc1.<unique_ID>:443` or `10.0.0.3:0` - * `port` - The communication port for the backend server. Example: `8080` - * `target_id` - The IP OCID/Instance OCID associated with the backend server. Example: `ocid1.privateip..oc1.<unique_ID>` - * `weight` - The network load balancing policy weight assigned to the server. Backend servers with a higher weight receive a larger proportion of incoming traffic. For example, a server weighted '3' receives three times the number of new connections as a server weighted '1'. For more information about load balancing policies, see [How Network Load Balancing Policies Work](https://docs.cloud.oracle.com/iaas/Content/Balance/Reference/lbpolicies.htm). Example: `3` -* `health_checker` - The health check policy configuration. For more information, see [Editing Health Check Policies](https://docs.cloud.oracle.com/iaas/Content/Balance/Tasks/editinghealthcheck.htm). +* `backends` - An array of backends. + * `ip_address` - The IP address of the backend server. Example: `10.0.0.3` + * `is_backup` - Whether the network load balancer should treat this server as a backup unit. If `true`, then the network load balancer forwards no ingress traffic to this backend server unless all other backend servers not marked as "isBackup" fail the health check policy. Example: `false` + * `is_drain` - Whether the network load balancer should drain this server. Servers marked "isDrain" receive no incoming traffic. Example: `false` + * `is_offline` - Whether the network load balancer should treat this server as offline. Offline servers receive no incoming traffic. Example: `false` + * `name` - A read-only field showing the IP address/IP OCID and port that uniquely identify this backend server in the backend set. Example: `10.0.0.3:8080`, or `ocid1.privateip..oc1.<unique_ID>:443` or `10.0.0.3:0` + * `port` - The communication port for the backend server. Example: `8080` + * `target_id` - The IP OCID/Instance OCID associated with the backend server. Example: `ocid1.privateip..oc1.<unique_ID>` + * `weight` - The network load balancing policy weight assigned to the server. Backend servers with a higher weight receive a larger proportion of incoming traffic. For example, a server weighted '3' receives three times the number of new connections as a server weighted '1'. For more information about load balancing policies, see [How Network Load Balancing Policies Work](https://docs.cloud.oracle.com/iaas/Content/Balance/Reference/lbpolicies.htm). Example: `3` +* `health_checker` - The health check policy configuration. For more information, see [Editing Health Check Policies](https://docs.cloud.oracle.com/iaas/Content/Balance/Tasks/editinghealthcheck.htm). * `dns` - DNS healthcheck configurations. * `domain_name` - The absolute fully-qualified domain name to perform periodic DNS queries. If not provided, an extra dot will be added at the end of a domain name during the query. * `query_class` - The class the dns health check query to use; either IN or CH. Example: `IN` diff --git a/website/docs/d/network_load_balancer_backend_sets.html.markdown b/website/docs/d/network_load_balancer_backend_sets.html.markdown index e7a26ec9733..71f9c725b2b 100644 --- a/website/docs/d/network_load_balancer_backend_sets.html.markdown +++ b/website/docs/d/network_load_balancer_backend_sets.html.markdown @@ -38,15 +38,15 @@ The following attributes are exported: The following attributes are exported: -* `backends` - Array of backends. - * `ip_address` - The IP address of the backend server. Example: `10.0.0.3` - * `is_backup` - Whether the network load balancer should treat this server as a backup unit. If `true`, then the network load balancer forwards no ingress traffic to this backend server unless all other backend servers not marked as "isBackup" fail the health check policy. Example: `false` - * `is_drain` - Whether the network load balancer should drain this server. Servers marked "isDrain" receive no incoming traffic. Example: `false` - * `is_offline` - Whether the network load balancer should treat this server as offline. Offline servers receive no incoming traffic. Example: `false` - * `name` - A read-only field showing the IP address/IP OCID and port that uniquely identify this backend server in the backend set. Example: `10.0.0.3:8080`, or `ocid1.privateip..oc1.<unique_ID>:443` or `10.0.0.3:0` - * `port` - The communication port for the backend server. Example: `8080` - * `target_id` - The IP OCID/Instance OCID associated with the backend server. Example: `ocid1.privateip..oc1.<unique_ID>` - * `weight` - The network load balancing policy weight assigned to the server. Backend servers with a higher weight receive a larger proportion of incoming traffic. For example, a server weighted '3' receives three times the number of new connections as a server weighted '1'. For more information about load balancing policies, see [How Network Load Balancing Policies Work](https://docs.cloud.oracle.com/iaas/Content/Balance/Reference/lbpolicies.htm). Example: `3` +* `backends` - An array of backends. + * `ip_address` - The IP address of the backend server. Example: `10.0.0.3` + * `is_backup` - Whether the network load balancer should treat this server as a backup unit. If `true`, then the network load balancer forwards no ingress traffic to this backend server unless all other backend servers not marked as "isBackup" fail the health check policy. Example: `false` + * `is_drain` - Whether the network load balancer should drain this server. Servers marked "isDrain" receive no incoming traffic. Example: `false` + * `is_offline` - Whether the network load balancer should treat this server as offline. Offline servers receive no incoming traffic. Example: `false` + * `name` - A read-only field showing the IP address/IP OCID and port that uniquely identify this backend server in the backend set. Example: `10.0.0.3:8080`, or `ocid1.privateip..oc1.<unique_ID>:443` or `10.0.0.3:0` + * `port` - The communication port for the backend server. Example: `8080` + * `target_id` - The IP OCID/Instance OCID associated with the backend server. Example: `ocid1.privateip..oc1.<unique_ID>` + * `weight` - The network load balancing policy weight assigned to the server. Backend servers with a higher weight receive a larger proportion of incoming traffic. For example, a server weighted '3' receives three times the number of new connections as a server weighted '1'. For more information about load balancing policies, see [How Network Load Balancing Policies Work](https://docs.cloud.oracle.com/iaas/Content/Balance/Reference/lbpolicies.htm). Example: `3` * `health_checker` - The health check policy configuration. For more information, see [Editing Health Check Policies](https://docs.cloud.oracle.com/iaas/Content/Balance/Tasks/editinghealthcheck.htm). * `dns` - DNS healthcheck configurations. * `domain_name` - The absolute fully-qualified domain name to perform periodic DNS queries. If not provided, an extra dot will be added at the end of a domain name during the query. diff --git a/website/docs/d/network_load_balancer_listener.html.markdown b/website/docs/d/network_load_balancer_listener.html.markdown index 77e876b9cbc..d530cc29ea3 100644 --- a/website/docs/d/network_load_balancer_listener.html.markdown +++ b/website/docs/d/network_load_balancer_listener.html.markdown @@ -37,6 +37,7 @@ The following attributes are exported: * `default_backend_set_name` - The name of the associated backend set. Example: `example_backend_set` * `ip_version` - IP version associated with the listener. * `is_ppv2enabled` - Property to enable/disable PPv2 feature for this listener. +* `l3ip_idle_timeout` - The duration for L3IP idle timeout in seconds. Example: `200` * `name` - A friendly name for the listener. It must be unique and it cannot be changed. Example: `example_listener` * `port` - The communication port for the listener. Example: `80` * `protocol` - The protocol on which the listener accepts connection requests. For public network load balancers, ANY protocol refers to TCP/UDP with the wildcard port. For private network load balancers, ANY protocol refers to TCP/UDP/ICMP (note that ICMP requires isPreserveSourceDestination to be set to true). "ListNetworkLoadBalancersProtocols" API is deprecated and it will not return the updated values. Use the allowed values for the protocol instead. Example: `TCP` diff --git a/website/docs/d/network_load_balancer_listeners.html.markdown b/website/docs/d/network_load_balancer_listeners.html.markdown index 32f7fb2f1d0..fe8f06daa38 100644 --- a/website/docs/d/network_load_balancer_listeners.html.markdown +++ b/website/docs/d/network_load_balancer_listeners.html.markdown @@ -41,6 +41,7 @@ The following attributes are exported: * `default_backend_set_name` - The name of the associated backend set. Example: `example_backend_set` * `ip_version` - IP version associated with the listener. * `is_ppv2enabled` - Property to enable/disable PPv2 feature for this listener. +* `l3ip_idle_timeout` - The duration for L3IP idle timeout in seconds. Example: `200` * `name` - A friendly name for the listener. It must be unique and it cannot be changed. Example: `example_listener` * `port` - The communication port for the listener. Example: `80` * `protocol` - The protocol on which the listener accepts connection requests. For public network load balancers, ANY protocol refers to TCP/UDP with the wildcard port. For private network load balancers, ANY protocol refers to TCP/UDP/ICMP (note that ICMP requires isPreserveSourceDestination to be set to true). "ListNetworkLoadBalancersProtocols" API is deprecated and it will not return the updated values. Use the allowed values for the protocol instead. Example: `TCP` diff --git a/website/docs/d/network_load_balancer_network_load_balancer.html.markdown b/website/docs/d/network_load_balancer_network_load_balancer.html.markdown index 8fdc608e934..8fd6d82cdc6 100644 --- a/website/docs/d/network_load_balancer_network_load_balancer.html.markdown +++ b/website/docs/d/network_load_balancer_network_load_balancer.html.markdown @@ -139,6 +139,8 @@ The following attributes are exported: * `listeners` - Listeners associated with the network load balancer. * `default_backend_set_name` - The name of the associated backend set. Example: `example_backend_set` * `ip_version` - IP version associated with the listener. + * `is_ppv2enabled` - Property to enable/disable PPv2 feature for this listener. + * `l3ip_idle_timeout` - The duration for L3IP idle timeout in seconds. Example: `200` * `name` - A friendly name for the listener. It must be unique and it cannot be changed. Example: `example_listener` * `port` - The communication port for the listener. Example: `80` * `protocol` - The protocol on which the listener accepts connection requests. For public network load balancers, ANY protocol refers to TCP/UDP with the wildcard port. For private network load balancers, ANY protocol refers to TCP/UDP/ICMP (note that ICMP requires isPreserveSourceDestination to be set to true). "ListNetworkLoadBalancersProtocols" API is deprecated and it will not return the updated values. Use the allowed values for the protocol instead. Example: `TCP` diff --git a/website/docs/d/network_load_balancer_network_load_balancers.html.markdown b/website/docs/d/network_load_balancer_network_load_balancers.html.markdown index 7e512fdf04d..b0e947565d2 100644 --- a/website/docs/d/network_load_balancer_network_load_balancers.html.markdown +++ b/website/docs/d/network_load_balancer_network_load_balancers.html.markdown @@ -118,6 +118,8 @@ The following attributes are exported: * `listeners` - Listeners associated with the network load balancer. * `default_backend_set_name` - The name of the associated backend set. Example: `example_backend_set` * `ip_version` - IP version associated with the listener. + * `is_ppv2enabled` - Property to enable/disable PPv2 feature for this listener. + * `l3ip_idle_timeout` - The duration for L3IP idle timeout in seconds. Example: `200` * `name` - A friendly name for the listener. It must be unique and it cannot be changed. Example: `example_listener` * `port` - The communication port for the listener. Example: `80` * `protocol` - The protocol on which the listener accepts connection requests. For public network load balancers, ANY protocol refers to TCP/UDP with the wildcard port. For private network load balancers, ANY protocol refers to TCP/UDP/ICMP (note that ICMP requires isPreserveSourceDestination to be set to true). "ListNetworkLoadBalancersProtocols" API is deprecated and it will not return the updated values. Use the allowed values for the protocol instead. Example: `TCP` diff --git a/website/docs/d/resource_scheduler_schedules.html.markdown b/website/docs/d/resource_scheduler_schedules.html.markdown index 49acc006507..5962a82a25c 100644 --- a/website/docs/d/resource_scheduler_schedules.html.markdown +++ b/website/docs/d/resource_scheduler_schedules.html.markdown @@ -20,8 +20,8 @@ data "oci_resource_scheduler_schedules" "test_schedules" { #Optional compartment_id = var.compartment_id - display_name = var.schedule_display_name schedule_id = oci_resource_scheduler_schedule.test_schedule.id + display_name = var.schedule_display_name state = var.schedule_state } ``` @@ -30,9 +30,9 @@ data "oci_resource_scheduler_schedules" "test_schedules" { The following arguments are supported: -* `compartment_id` - (Optional) This is the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment in which to list resources. +* `compartment_id` - (Optional) This is the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment in which to list resources. You need to at least provide either `compartment_id` or `schedule_id` or both. +* `schedule_id` - (Optional) This is the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the schedule. You need to at least provide either `compartment_id` or `schedule_id` or both. * `display_name` - (Optional) This is a filter to return only resources that match the given display name exactly. -* `schedule_id` - (Optional) This is the [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the schedule. * `state` - (Optional) This is a filter to return only resources that match the given lifecycle state. The state value is case-insensitive. diff --git a/website/docs/r/containerengine_addon.html.markdown b/website/docs/r/containerengine_addon.html.markdown index fe6bde014ae..8b3229f0348 100644 --- a/website/docs/r/containerengine_addon.html.markdown +++ b/website/docs/r/containerengine_addon.html.markdown @@ -19,7 +19,7 @@ resource "oci_containerengine_addon" "test_addon" { #Required addon_name = oci_containerengine_addon.test_addon.name cluster_id = oci_containerengine_cluster.test_cluster.id - remove_addon_resources_on_delete = true + remove_addon_resources_on_delete = true #Optional configurations { @@ -28,6 +28,7 @@ resource "oci_containerengine_addon" "test_addon" { key = var.addon_configurations_key value = var.addon_configurations_value } + override_existing = false version = var.addon_version } ``` @@ -39,9 +40,10 @@ The following arguments are supported: * `addon_name` - (Required) The name of the addon. * `cluster_id` - (Required) The OCID of the cluster. * `remove_addon_resources_on_delete` - (Required) Whether to remove addon resource in deletion. -* `configurations` - (Optional) (Updatable) Addon configuration details. - * `key` - (Optional) (Updatable) configuration key name - * `value` - (Optional) (Updatable) configuration value name +* `configurations` - (Optional) (Updatable) Addon configuration details + * `key` - (Optional) (Updatable) configuration key name + * `value` - (Optional) (Updatable) configuration value name +* `override_existing` - (Optional) Whether or not to override an existing addon installation. Defaults to false. If set to true, any existing addon installation would be overridden as per new installation details. * `version` - (Optional) (Updatable) The version of addon to be installed. diff --git a/website/docs/r/core_instance_pool.html.markdown b/website/docs/r/core_instance_pool.html.markdown index 83f69ff80eb..91b834d1374 100644 --- a/website/docs/r/core_instance_pool.html.markdown +++ b/website/docs/r/core_instance_pool.html.markdown @@ -86,7 +86,7 @@ The following arguments are supported: * `instance_configuration_id` - (Required) (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the instance configuration associated with the instance pool. * `instance_display_name_formatter` - (Optional) (Updatable) A user-friendly formatter for the instance pool's instances. Instance displaynames follow the format. The formatter does not retroactively change instance's displaynames, only instance displaynames in the future follow the format * `instance_hostname_formatter` - (Optional) (Updatable) A user-friendly formatter for the instance pool's instances. Instance hostnames follow the format. The formatter does not retroactively change instance's hostnames, only instance hostnames in the future follow the format -* `load_balancers` - (Optional) The load balancers to attach to the instance pool. +* `load_balancers` - (Optional) The load balancers to attach to the instance pool. (Note: From 6.14.0 load_balancers field in oci_core_instance_pool is changed from TypeList to TypeSet - to support load balancer insert operation. Also, LB cant by accessed by index) * `backend_set_name` - (Required) The name of the backend set on the load balancer to add instances to. * `load_balancer_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the load balancer to attach to the instance pool. * `port` - (Required) The port value to use when creating the backend set. @@ -135,7 +135,7 @@ The following attributes are exported: * `instance_configuration_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the instance configuration associated with the instance pool. * `instance_display_name_formatter` - A user-friendly formatter for the instance pool's instances. Instance displaynames follow the format. The formatter does not retroactively change instance's displaynames, only instance displaynames in the future follow the format * `instance_hostname_formatter` - A user-friendly formatter for the instance pool's instances. Instance hostnames follow the format. The formatter does not retroactively change instance's hostnames, only instance hostnames in the future follow the format -* `load_balancers` - The load balancers attached to the instance pool. +* `load_balancers` - The load balancers attached to the instance pool. (Note: From 6.14.0 load_balancers field in oci_core_instance_pool is changed from TypeList to TypeSet - to support load balancer insert operation. Also, LB cant by accessed by index) * `backend_set_name` - The name of the backend set on the load balancer. * `id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the load balancer attachment. * `instance_pool_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the instance pool of the load balancer attachment. diff --git a/website/docs/r/identity_domains_auth_token.html.markdown b/website/docs/r/identity_domains_auth_token.html.markdown index 760f921e473..3b60d99d644 100644 --- a/website/docs/r/identity_domains_auth_token.html.markdown +++ b/website/docs/r/identity_domains_auth_token.html.markdown @@ -417,6 +417,17 @@ The following arguments are supported: * returned: default * type: string * uniqueness: none +* `token` - (Optional) (Updatable) token + + **Added In:** 2010242156 + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsSensitive: hash_sc * `urnietfparamsscimschemasoracleidcsextensionself_change_user` - (Optional) Controls whether a user can update themselves or not via User related APIs * `allow_self_change` - (Optional) If true, allows requesting user to update themselves. If false, requesting user can't update themself (default). @@ -864,6 +875,17 @@ The following attributes are exported: * returned: default * type: string * uniqueness: none +* `token` - token + + **Added In:** 2010242156 + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsSensitive: hash_sc * `urnietfparamsscimschemasoracleidcsextensionself_change_user` - Controls whether a user can update themselves or not via User related APIs * `allow_self_change` - If true, allows requesting user to update themselves. If false, requesting user can't update themself (default). diff --git a/website/docs/r/identity_domains_customer_secret_key.html.markdown b/website/docs/r/identity_domains_customer_secret_key.html.markdown index 8b12b0fc8c7..517eb89bbc6 100644 --- a/website/docs/r/identity_domains_customer_secret_key.html.markdown +++ b/website/docs/r/identity_domains_customer_secret_key.html.markdown @@ -375,6 +375,14 @@ The following arguments are supported: * returned: default * type: string * uniqueness: none +* `secret_key` - (Optional) (Updatable) The secret key. + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default * `status` - (Optional) The user's credential status. **Added In:** 2109090424 @@ -836,6 +844,14 @@ The following attributes are exported: * returned: default * type: string * uniqueness: none +* `secret_key` - The secret key. + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default * `status` - The user's credential status. **Added In:** 2109090424 diff --git a/website/docs/r/identity_domains_oauth2client_credential.html.markdown b/website/docs/r/identity_domains_oauth2client_credential.html.markdown index bb4e7419500..b164200ec83 100644 --- a/website/docs/r/identity_domains_oauth2client_credential.html.markdown +++ b/website/docs/r/identity_domains_oauth2client_credential.html.markdown @@ -416,6 +416,16 @@ The following arguments are supported: * multiValued: false * required: true * returned: default +* `secret` - (Optional) (Updatable) Secret + + **SCIM++ Properties:** + * caseExact: false + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsScimCompliant: false + * idcsSensitive: hash_sc * `status` - (Optional) The user's credential status. **Added In:** 2109090424 @@ -912,6 +922,16 @@ The following attributes are exported: * multiValued: false * required: true * returned: default +* `secret` - Secret + + **SCIM++ Properties:** + * caseExact: false + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsScimCompliant: false + * idcsSensitive: hash_sc * `status` - The user's credential status. **Added In:** 2109090424 diff --git a/website/docs/r/identity_domains_smtp_credential.html.markdown b/website/docs/r/identity_domains_smtp_credential.html.markdown index b6e5194fe73..d13e54f1a23 100644 --- a/website/docs/r/identity_domains_smtp_credential.html.markdown +++ b/website/docs/r/identity_domains_smtp_credential.html.markdown @@ -346,6 +346,15 @@ The following arguments are supported: * returned: default * type: string * uniqueness: global +* `password` - (Optional) (Updatable) Password + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsSensitive: hash_sc * `resource_type_schema_version` - (Optional) An endpoint-specific schema version number to use in the Request. Allowed version values are Earliest Version or Latest Version as specified in each REST API endpoint description, or any sequential number inbetween. All schema attributes/body parameters are a part of version 1. After version 1, any attributes added or deprecated will be tagged with the version that they were added to or deprecated in. If no version is provided, the latest schema version is returned. * `schemas` - (Required) REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard \"enterprise\" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior. @@ -800,6 +809,15 @@ The following attributes are exported: * returned: default * type: string * uniqueness: global +* `password` - Password + + **SCIM++ Properties:** + * caseExact: true + * type: string + * mutability: readOnly + * required: false + * returned: default + * idcsSensitive: hash_sc * `schemas` - REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard \"enterprise\" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior. **SCIM++ Properties:** diff --git a/website/docs/r/load_balancer_listener.html.markdown b/website/docs/r/load_balancer_listener.html.markdown index 51aa3e81f24..f6090f4ec27 100644 --- a/website/docs/r/load_balancer_listener.html.markdown +++ b/website/docs/r/load_balancer_listener.html.markdown @@ -73,7 +73,7 @@ The following arguments are supported: Example: `example_path_route_set` * `port` - (Required) (Updatable) The communication port for the listener. Example: `80` -* `protocol` - (Required) (Updatable) The protocol on which the listener accepts connection requests. To get a list of valid protocols, use the [ListProtocols](https://docs.cloud.oracle.com/iaas/api/#/en/loadbalancer/20170115/LoadBalancerProtocol/ListProtocols) operation. Example: `HTTP` +* `protocol` - (Required) (Updatable) The protocol on which the listener accepts connection requests. The supported protocols are HTTP, HTTP2, TCP, and GRPC. You can also use the [ListProtocols](https://docs.cloud.oracle.com/iaas/api/#/en/loadbalancer/20170115/LoadBalancerProtocol/ListProtocols) operation to get a list of valid protocols. Example: `HTTP` * `routing_policy_name` - (Optional) (Updatable) The name of the routing policy applied to this listener's traffic. Example: `example_routing_policy` * `rule_set_names` - (Optional) (Updatable) The names of the [rule sets](https://docs.cloud.oracle.com/iaas/api/#/en/loadbalancer/20170115/RuleSet/) to apply to the listener. Example: ["example_rule_set"] * `ssl_configuration` - (Optional) (Updatable) The load balancer's SSL handling configuration details. diff --git a/website/docs/r/network_load_balancer_backend_set.html.markdown b/website/docs/r/network_load_balancer_backend_set.html.markdown index fa9d3a266f3..6d0c498579c 100644 --- a/website/docs/r/network_load_balancer_backend_set.html.markdown +++ b/website/docs/r/network_load_balancer_backend_set.html.markdown @@ -112,26 +112,7 @@ The following attributes are exported: * `name` - A read-only field showing the IP address/IP OCID and port that uniquely identify this backend server in the backend set. Example: `10.0.0.3:8080`, or `ocid1.privateip..oc1.<unique_ID>:443` or `10.0.0.3:0` * `port` - The communication port for the backend server. Example: `8080` * `target_id` - The IP OCID/Instance OCID associated with the backend server. Example: `ocid1.privateip..oc1.<unique_ID>` - * `weight` - The network load balancing policy weight assigned to the server. Backend servers with a higher weight receive a larger proportion of incoming traffic. For example, a server weighted '3' receives three times the number of new connections as a server weighted '1'. For more information about load balancing policies, see [How Network Load Balancing Policies Work](https://docs.cloud.oracle.com/iaas/Content/NetworkLoadBalancer/introducton.htm#Policies). Example: `3` -* `health_checker` - The health check policy configuration. For more information, see [Editing Health Check Policies](https://docs.cloud.oracle.com/iaas/Content/NetworkLoadBalancer/HealthCheckPolicies/health-check-policy-management.htm). - * `interval_in_millis` - The interval between health checks, in milliseconds. The default value is 10000 (10 seconds). Example: `10000` - * `port` - The backend server port against which to run the health check. If the port is not specified, then the network load balancer uses the port information from the `Backend` object. The port must be specified if the backend port is 0. Example: `8080` - * `protocol` - The protocol the health check must use; either HTTP or HTTPS, or UDP or TCP. Example: `HTTP` - * `request_data` - Base64 encoded pattern to be sent as UDP or TCP health check probe. - * `response_body_regex` - A regular expression for parsing the response body from the backend server. Example: `^((?!false).|\s)*$` - * `response_data` - Base64 encoded pattern to be validated as UDP or TCP health check probe response. - * `retries` - The number of retries to attempt before a backend server is considered "unhealthy". This number also applies when recovering a server to the "healthy" state. The default value is 3. Example: `3` - * `return_code` - The status code a healthy backend server should return. If you configure the health check policy to use the HTTP protocol, then you can use common HTTP status codes such as "200". Example: `200` - * `timeout_in_millis` - The maximum time, in milliseconds, to wait for a reply to a health check. A health check is successful only if a reply returns within this timeout period. The default value is 3000 (3 seconds). Example: `3000` - * `url_path` - The path against which to run the health check. Example: `/healthcheck` - * `ip_address` - The IP address of the backend server. Example: `10.0.0.3` - * `is_backup` - Whether the network load balancer should treat this server as a backup unit. If `true`, then the network load balancer forwards no ingress traffic to this backend server unless all other backend servers not marked as "isBackup" fail the health check policy. Example: `false` - * `is_drain` - Whether the network load balancer should drain this server. Servers marked "isDrain" receive no incoming traffic. Example: `false` - * `is_offline` - Whether the network load balancer should treat this server as offline. Offline servers receive no incoming traffic. Example: `false` - * `name` - A read-only field showing the IP address/IP OCID and port that uniquely identify this backend server in the backend set. Example: `10.0.0.3:8080`, or `ocid1.privateip..oc1.<unique_ID>:443` or `10.0.0.3:0` - * `port` - The communication port for the backend server. Example: `8080` - * `target_id` - The IP OCID/Instance OCID associated with the backend server. Example: `ocid1.privateip..oc1.<unique_ID>` - * `weight` - The network load balancing policy weight assigned to the server. Backend servers with a higher weight receive a larger proportion of incoming traffic. For example, a server weighted '3' receives three times the number of new connections as a server weighted '1'. For more information about load balancing policies, see [How Network Load Balancing Policies Work](https://docs.cloud.oracle.com/iaas/Content/Balance/Reference/lbpolicies.htm). Example: `3` + * `weight` - The network load balancing policy weight assigned to the server. Backend servers with a higher weight receive a larger proportion of incoming traffic. For example, a server weighted '3' receives three times the number of new connections as a server weighted '1'. For more information about load balancing policies, see [How Network Load Balancing Policies Work](https://docs.cloud.oracle.com/iaas/Content/NetworkLoadBalancer/introducton.htm#Policies). Example: `3` * `health_checker` - The health check policy configuration. For more information, see [Editing Health Check Policies](https://docs.cloud.oracle.com/iaas/Content/Balance/Tasks/editinghealthcheck.htm). * `dns` - DNS healthcheck configurations. * `domain_name` - The absolute fully-qualified domain name to perform periodic DNS queries. If not provided, an extra dot will be added at the end of a domain name during the query. diff --git a/website/docs/r/network_load_balancer_listener.html.markdown b/website/docs/r/network_load_balancer_listener.html.markdown index ec1909e4a7b..2a80a7c1317 100644 --- a/website/docs/r/network_load_balancer_listener.html.markdown +++ b/website/docs/r/network_load_balancer_listener.html.markdown @@ -26,6 +26,7 @@ resource "oci_network_load_balancer_listener" "test_listener" { #Optional ip_version = var.listener_ip_version is_ppv2enabled = var.listener_is_ppv2enabled + l3ip_idle_timeout = var.listener_l3ip_idle_timeout tcp_idle_timeout = var.listener_tcp_idle_timeout udp_idle_timeout = var.listener_udp_idle_timeout } @@ -38,6 +39,7 @@ The following arguments are supported: * `default_backend_set_name` - (Required) (Updatable) The name of the associated backend set. Example: `example_backend_set` * `ip_version` - (Optional) (Updatable) IP version associated with the listener. * `is_ppv2enabled` - (Optional) (Updatable) Property to enable/disable PPv2 feature for this listener. +* `l3ip_idle_timeout` - (Optional) (Updatable) The duration for L3IP idle timeout in seconds. Example: `200` * `name` - (Required) A friendly name for the listener. It must be unique and it cannot be changed. Example: `example_listener` * `network_load_balancer_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the network load balancer to update. * `port` - (Required) (Updatable) The communication port for the listener. Example: `80` @@ -56,6 +58,7 @@ The following attributes are exported: * `default_backend_set_name` - The name of the associated backend set. Example: `example_backend_set` * `ip_version` - IP version associated with the listener. * `is_ppv2enabled` - Property to enable/disable PPv2 feature for this listener. +* `l3ip_idle_timeout` - The duration for L3IP idle timeout in seconds. Example: `200` * `name` - A friendly name for the listener. It must be unique and it cannot be changed. Example: `example_listener` * `port` - The communication port for the listener. Example: `80` * `protocol` - The protocol on which the listener accepts connection requests. For public network load balancers, ANY protocol refers to TCP/UDP with the wildcard port. For private network load balancers, ANY protocol refers to TCP/UDP/ICMP (note that ICMP requires isPreserveSourceDestination to be set to true). "ListNetworkLoadBalancersProtocols" API is deprecated and it will not return the updated values. Use the allowed values for the protocol instead. Example: `TCP` diff --git a/website/docs/r/network_load_balancer_network_load_balancer.html.markdown b/website/docs/r/network_load_balancer_network_load_balancer.html.markdown index d382884c6f4..a6566d64723 100644 --- a/website/docs/r/network_load_balancer_network_load_balancer.html.markdown +++ b/website/docs/r/network_load_balancer_network_load_balancer.html.markdown @@ -131,6 +131,7 @@ resource "oci_network_load_balancer_network_load_balancer" "test_network_load_ba #Optional ip_version = var.network_load_balancer_listeners_ip_version is_ppv2enabled = var.network_load_balancer_listeners_is_ppv2enabled + l3ip_idle_timeout = var.network_load_balancer_listeners_l3ip_idle_timeout tcp_idle_timeout = var.network_load_balancer_listeners_tcp_idle_timeout udp_idle_timeout = var.network_load_balancer_listeners_udp_idle_timeout } @@ -207,6 +208,8 @@ The following arguments are supported: * `listeners` - (Optional) Listeners associated with the network load balancer. * `default_backend_set_name` - (Required) The name of the associated backend set. Example: `example_backend_set` * `ip_version` - (Optional) IP version associated with the listener. + * `is_ppv2enabled` - (Optional) Property to enable/disable PPv2 feature for this listener. + * `l3ip_idle_timeout` - (Optional) The duration for L3IP idle timeout in seconds. Example: `200` * `name` - (Required) A friendly name for the listener. It must be unique and it cannot be changed. Example: `example_listener` * `port` - (Required) The communication port for the listener. Example: `80` * `protocol` - (Required) The protocol on which the listener accepts connection requests. For public network load balancers, ANY protocol refers to TCP/UDP with the wildcard port. For private network load balancers, ANY protocol refers to TCP/UDP/ICMP (note that ICMP requires isPreserveSourceDestination to be set to true). "ListNetworkLoadBalancersProtocols" API is deprecated and it will not return the updated values. Use the allowed values for the protocol instead. Example: `TCP` @@ -321,6 +324,8 @@ The following attributes are exported: * `listeners` - Listeners associated with the network load balancer. * `default_backend_set_name` - The name of the associated backend set. Example: `example_backend_set` * `ip_version` - IP version associated with the listener. + * `is_ppv2enabled` - Property to enable/disable PPv2 feature for this listener. + * `l3ip_idle_timeout` - The duration for L3IP idle timeout in seconds. Example: `200` * `name` - A friendly name for the listener. It must be unique and it cannot be changed. Example: `example_listener` * `port` - The communication port for the listener. Example: `80` * `protocol` - The protocol on which the listener accepts connection requests. For public network load balancers, ANY protocol refers to TCP/UDP with the wildcard port. For private network load balancers, ANY protocol refers to TCP/UDP/ICMP (note that ICMP requires isPreserveSourceDestination to be set to true). "ListNetworkLoadBalancersProtocols" API is deprecated and it will not return the updated values. Use the allowed values for the protocol instead. Example: `TCP` diff --git a/website/docs/r/resource_scheduler_schedule.html.markdown b/website/docs/r/resource_scheduler_schedule.html.markdown index 88c89cc8f8c..c7299c0000d 100644 --- a/website/docs/r/resource_scheduler_schedule.html.markdown +++ b/website/docs/r/resource_scheduler_schedule.html.markdown @@ -17,41 +17,43 @@ Creates a Schedule ```hcl resource "oci_resource_scheduler_schedule" "test_schedule" { - #Required - action = var.schedule_action - compartment_id = var.compartment_id - recurrence_details = var.schedule_recurrence_details - recurrence_type = var.schedule_recurrence_type - - #Optional - defined_tags = {"Operations.CostCenter"= "42"} - description = var.schedule_description - display_name = var.schedule_display_name - freeform_tags = {"Department"= "Finance"} - resource_filters { - #Required - attribute = var.schedule_resource_filters_attribute - - #Optional - condition = var.schedule_resource_filters_condition - should_include_child_compartments = var.schedule_resource_filters_should_include_child_compartments - value { - - #Optional - namespace = var.schedule_resource_filters_value_namespace - tag_key = var.schedule_resource_filters_value_tag_key - value = var.schedule_resource_filters_value_value - } - } - resources { - #Required - id = var.schedule_resources_id - - #Optional - metadata = var.schedule_resources_metadata - } - time_ends = var.schedule_time_ends - time_starts = var.schedule_time_starts + #Required + action = var.schedule_action + compartment_id = var.compartment_id + recurrence_details = var.schedule_recurrence_details + recurrence_type = var.schedule_recurrence_type + + resource_filters { + # Required + attribute = "DEFINED_TAGS" + value { + namespace="SampleNamespace" + tag_key="SampleTagKey" + value="SampleValue" + } + } + resource_filters { + # Required + attribute = "LIFECYCLE_STATE" + value { + value="SampleLifecycleState" + } + } + resource_filters { + # Required + attribute = "COMPARTMENT_ID" + value { + value=var.compartment_id + } + } + + #Optional + defined_tags = map(oci_identity_tag_namespace.tag-namespace1.name.oci_identity_tag.tag1.name, var.schedule_defined_tags_value) + description = var.schedule_description + display_name = var.schedule_display_name + freeform_tags = var.schedule_freeform_tags + time_ends = var.schedule_time_ends + time_starts = var.schedule_time_starts } ``` @@ -61,25 +63,36 @@ The following arguments are supported: * `action` - (Required) (Updatable) This is the action that will be executed by the schedule. * `compartment_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment in which the schedule is created -* `defined_tags` - (Optional) (Updatable) These are defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` -* `description` - (Optional) (Updatable) This is the description of the schedule. -* `display_name` - (Optional) (Updatable) This is a user-friendly name for the schedule. It does not have to be unique, and it's changeable. -* `freeform_tags` - (Optional) (Updatable) These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` -* `recurrence_details` - (Required) (Updatable) This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field. -* `recurrence_type` - (Required) (Updatable) Type of recurrence of a schedule +* `recurrence_type` - (Required) (Updatable) Type of recurrence of a schedule. Could be set to `ICAL`, `CRON` +* `recurrence_details` - (Required) (Updatable) This is the frequency of recurrence of a schedule. The frequency field can either conform to RFC-5545 formatting or UNIX cron formatting for recurrences, based on the value specified by the recurrenceType field. Example: `FREQ=WEEKLY;BYDAY=MO,TU,WE,TH;BYHOUR=10;INTERVAL=1` + * `resource_filters` - (Optional) (Updatable) This is a list of resources filters. The schedule will be applied to resources matching all of them. - * `attribute` - (Required) (Updatable) This is the resource attribute on which the threshold is defined. - * `condition` - (Applicable when attribute=TIME_CREATED) (Updatable) This is the condition for the filter in comparison to its creation time. - * `should_include_child_compartments` - (Applicable when attribute=COMPARTMENT_ID) (Updatable) This sets whether to include child compartments. - * `value` - (Optional) (Updatable) This is a collection of resource lifecycle state values. - * `namespace` - (Applicable when attribute=DEFINED_TAGS) (Updatable) This is the namespace of the defined tag. - * `tag_key` - (Applicable when attribute=DEFINED_TAGS) (Updatable) This is the key of the defined tag. - * `value` - (Applicable when attribute=DEFINED_TAGS) (Updatable) This is the value of the defined tag. + * `attribute` - (Required) (Updatable) This is the resource attribute on which the threshold is defined. We support 5 different types of attributes: `DEFINED_TAGS`, `COMPARTMENT_ID`, `TIME_CREATED`, `LIFECYCLE_STATE` and `RESOURCE_TYPE`. + * `value` - (Optional) (Updatable) This is a collection of resource filter values, different types of filter has different value format, see below: + * When `attribute="DEFINED_TAGS"`: + * `namespace` - (Updatable) This is the namespace of the defined tag. + * `tag_key` - (Updatable) This is the key of the defined tag. + * `value` - (Updatable) This is the value of the defined tag. + * When `attribute="TIME_CREATED"`: + * `condition` - (Applicable when attribute=TIME_CREATED) (Updatable) This is the condition for the filter in comparison to its creation time. Could be set to `EQUAL`, `BEFORE` and `AFTER`. + * `value` - (Updatable) This is the date and time of resources used for filtering, in the format defined by [RFC 3339](https://tools.ietf.org/html/rfc3339) Example: `2016-08-25T21:10:29.600Z` + * When `attribute="COMPARTMENT_ID"`: + * `should_include_child_compartments` - (Updatable) This boolean sets whether to include child compartments. + * `value` - (Updatable) This is the compartment id used for filtering. + * When `attribute="RESOURCE_TYPE"`: + * `value` - (Updatable) This is the resource type used for filtering. + * when `attribute="LIFECYCLE_STATE"`: + * `value` - (Updatable) This is the lifecycle state value used for filtering. + * `resources` - (Optional) (Updatable) This is the list of resources to which the scheduled operation is applied. * `id` - (Required) (Updatable) This is the resource OCID. * `metadata` - (Optional) (Updatable) This is additional information that helps to identity the resource for the schedule. - { "id": "" "metadata": { "namespaceName": "sampleNamespace", "bucketName": "sampleBucket" } } + { "id": "" "metadata": { "namespaceName": "sampleNamespace", "bucketName": "sampleBucket" } } +* `defined_tags` - (Optional) (Updatable) These are defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Operations.CostCenter": "42"}` +* `description` - (Optional) (Updatable) This is the description of the schedule. +* `display_name` - (Optional) (Updatable) This is a user-friendly name for the schedule. It does not have to be unique, and it's changeable. +* `freeform_tags` - (Optional) (Updatable) These are free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/resourcetags.htm). Example: `{"Department": "Finance"}` * `time_ends` - (Optional) (Updatable) This is the date and time the schedule ends, in the format defined by [RFC 3339](https://tools.ietf.org/html/rfc3339) Example: `2016-08-25T21:10:29.600Z` * `time_starts` - (Optional) (Updatable) This is the date and time the schedule starts, in the format defined by [RFC 3339](https://tools.ietf.org/html/rfc3339) Example: `2016-08-25T21:10:29.600Z` * `state` - (Optional) (Updatable) The target state for the Schedule. Could be set to `ACTIVE` or `INACTIVE`. @@ -105,10 +118,10 @@ The following attributes are exported: * `attribute` - This is the resource attribute on which the threshold is defined. * `condition` - This is the condition for the filter in comparison to its creation time. * `should_include_child_compartments` - This sets whether to include child compartments. - * `value` - This is a collection of resource lifecycle state values. + * `value` - This is a collection of resource filter values. * `namespace` - This is the namespace of the defined tag. * `tag_key` - This is the key of the defined tag. - * `value` - This is the value of the defined tag. + * `value` - This is the value of the designated resource filter type value. * `resources` - This is the list of resources to which the scheduled operation is applied. * `id` - This is the resource OCID. * `metadata` - This is additional information that helps to identity the resource for the schedule.