Skip to content

Commit

Permalink
Releasing version v5.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jotruon authored Aug 1, 2023
2 parents ba43519 + 7e85cdc commit 0ead5b9
Show file tree
Hide file tree
Showing 276 changed files with 11,120 additions and 91 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 5.7.0 (August 01, 2023)

### Added
- Support for TLS & ORDS BYO Certificates (Phase 2) | ADB-C@C
- Support for OPSI News Reports
- Support for Budgets - Single Use Budgets

## 5.6.0 (July 26, 2023)

### Added
Expand Down
139 changes: 139 additions & 0 deletions examples/container_engine/credential_rotation/main.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
// Licensed under the Mozilla Public License v2.0

variable "tenancy_ocid" {}
variable "user_ocid" {}
variable "fingerprint" {}
variable "private_key_path" {}
variable "region" {
default = "us-ashburn-1"
}
variable "compartment_ocid" {}

variable "cluster_start_credential_rotation_management_auto_completion_delay_duration" {
default = "P5D"
}

provider "oci" {
tenancy_ocid = var.tenancy_ocid
user_ocid = var.user_ocid
fingerprint = var.fingerprint
private_key_path = var.private_key_path
region = var.region
}

data "oci_identity_availability_domain" "ad1" {
compartment_id = var.tenancy_ocid
ad_number = 1
}

data "oci_identity_availability_domain" "ad2" {
compartment_id = var.tenancy_ocid
ad_number = 2
}

data "oci_containerengine_cluster_option" "test_cluster_option" {
cluster_option_id = "all"
}

resource "oci_core_vcn" "test_vcn" {
cidr_block = "10.0.0.0/16"
compartment_id = var.compartment_ocid
display_name = "tfVcnForClusters"
}

resource "oci_core_internet_gateway" "test_ig" {
compartment_id = var.compartment_ocid
display_name = "tfClusterInternetGateway"
vcn_id = oci_core_vcn.test_vcn.id
}

resource "oci_core_route_table" "test_route_table" {
compartment_id = var.compartment_ocid
vcn_id = oci_core_vcn.test_vcn.id
display_name = "tfClustersRouteTable"

route_rules {
destination = "0.0.0.0/0"
destination_type = "CIDR_BLOCK"
network_entity_id = oci_core_internet_gateway.test_ig.id
}
}

resource "oci_core_subnet" "clusterSubnet_1" {
#Required
availability_domain = data.oci_identity_availability_domain.ad1.name
cidr_block = "10.0.20.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 = "tfSubNet1ForClusters"
route_table_id = oci_core_route_table.test_route_table.id
}

resource "oci_core_subnet" "clusterSubnet_2" {
#Required
availability_domain = data.oci_identity_availability_domain.ad2.name
cidr_block = "10.0.21.0/24"
compartment_id = var.compartment_ocid
vcn_id = oci_core_vcn.test_vcn.id
display_name = "tfSubNet1ForClusters"

# Provider code tries to maintain compatibility with old versions.
security_list_ids = [oci_core_vcn.test_vcn.default_security_list_id]
route_table_id = oci_core_route_table.test_route_table.id
}

resource "oci_containerengine_cluster" "test_cluster" {
#Required
compartment_id = var.compartment_ocid
kubernetes_version = reverse(data.oci_containerengine_cluster_option.test_cluster_option.kubernetes_versions)[0]
name = "tfTestCluster"
vcn_id = oci_core_vcn.test_vcn.id

#Optional
options {
service_lb_subnet_ids = [oci_core_subnet.clusterSubnet_1.id, oci_core_subnet.clusterSubnet_2.id]

#Optional
add_ons {
#Optional
is_kubernetes_dashboard_enabled = "true"
is_tiller_enabled = "true"
}

admission_controller_options {
#Optional
is_pod_security_policy_enabled = false
}

kubernetes_network_config {
#Optional
pods_cidr = "10.1.0.0/16"
services_cidr = "10.2.0.0/16"
}
}
}

// start credential rotation on a cluster
resource "oci_containerengine_cluster_start_credential_rotation_management" "test_cluster_start_credential_rotation_management" {
#Required
auto_completion_delay_duration = var.cluster_start_credential_rotation_management_auto_completion_delay_duration
cluster_id = oci_containerengine_cluster.test_cluster.id
}

// get credential rotation status
data "oci_containerengine_cluster_credential_rotation_status" "test_cluster_credential_rotation_status" {
#Required
cluster_id = oci_containerengine_cluster.test_cluster.id
}

// complete credential rotation on a cluster
resource "oci_containerengine_cluster_complete_credential_rotation_management" "test_cluster_complete_credential_rotation_management" {
#Required
cluster_id = oci_containerengine_cluster.test_cluster.id
depends_on = [oci_containerengine_cluster_start_credential_rotation_management.test_cluster_start_credential_rotation_management]
}

2 changes: 1 addition & 1 deletion examples/container_engine/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ resource "oci_containerengine_node_pool" "test_flex_shape_node_pool" {

node_source_details {
#Required
image_id = local.oracle_linux_images.0
image_id = local.image_id
source_type = "IMAGE"
}

Expand Down
2 changes: 1 addition & 1 deletion examples/database/exadata_cc/adbd/adb.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "oci_database_autonomous_database" "test_autonomous_database" {
#Required
admin_password = random_string.autonomous_database_admin_password.result
compartment_id = var.compartment_ocid
compute_count = "2"
ocpu_count = "2"
data_storage_size_in_tbs = "1"
db_name = "atpdb1"

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
resource "oci_database_autonomous_vm_cluster_ords_certificate_management" "test_avm_ords_mgmt_res"{
autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
certificate_generation_type = "BYOC"
certificate_id = var.avm_certificate_id
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
resource "oci_database_autonomous_vm_cluster_ssl_certificate_management" "test_avm_db_mgmt_res"{
autonomous_vm_cluster_id = oci_database_autonomous_vm_cluster.test_autonomous_vm_cluster.id
certificate_generation_type = "SYSTEM"
}

4 changes: 4 additions & 0 deletions examples/database/exadata_cc/adbd/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,8 @@ variable "compartment_ocid" {
}

variable "ssh_public_key" {
}

variable "avm_certificate_id"{

}
103 changes: 103 additions & 0 deletions examples/opsi/news_report/news_report.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
// Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
// Licensed under the Mozilla Public License v2.0


variable "tenancy_ocid" {}
variable "user_ocid" {}
variable "fingerprint" {}
variable "private_key_path" {}
variable "region" {}
variable "topic_id" {}
variable "compartment_ocid" {}

provider "oci" {
tenancy_ocid = var.tenancy_ocid
user_ocid = var.user_ocid
fingerprint = var.fingerprint
private_key_path = var.private_key_path
region = var.region
}

resource "oci_identity_tag_namespace" "tag-namespace1" {
compartment_id = var.tenancy_ocid
description = "example tag namespace"
name = "examples-tag-namespace-all"
is_retired = false
}

resource "oci_identity_tag" "tag1" {
description = "example tag"
name = "example-tag"
tag_namespace_id = oci_identity_tag_namespace.tag-namespace1.id
is_cost_tracking = false
is_retired = false
}

variable "news_frequency" {
default = "WEEKLY"
}

variable "news_locale" {
default = "EN"
}

variable "news_report_name" {
default = "Example_Report"
}

variable "news_report_description" {
default = "Example Report Description"
}

variable "cp_resources" {
default = [ "HOST","DATABASE","EXADATA" ]
}


variable "news_report_defined_tags_value" {
default = "value"
}

variable "news_report_freeform_tags" {
default = { "bar-key" = "value" }
}

variable "resource_status" {
default = "ENABLED"
}

// To Create a News Report
resource "oci_opsi_news_report" "test_news_report" {
compartment_id = var.compartment_ocid
locale = var.news_locale
name = var.news_report_name
description = var.news_report_description
news_frequency = var.news_frequency
content_types {
capacity_planning_resources = var.cp_resources
}
ons_topic_id = var.topic_id
freeform_tags = var.news_report_freeform_tags
status = var.resource_status
}

variable "news_report_state" {
default = ["ACTIVE"]
}

variable "news_report_status" {
default = ["ENABLED"]
}

// List news reports
data "oci_opsi_news_reports" "test_news_reports" {
compartment_id = var.compartment_ocid
state = var.news_report_state
status = var.news_report_status
}

// Get a news report
data "oci_opsi_news_report" "test_news_report" {
news_report_id = oci_opsi_news_report.test_news_report.id
}

Binary file modified examples/zips/adm.zip
Binary file not shown.
Binary file modified examples/zips/aiAnomalyDetection.zip
Binary file not shown.
Binary file modified examples/zips/aiDocument.zip
Binary file not shown.
Binary file modified examples/zips/aiVision.zip
Binary file not shown.
Binary file modified examples/zips/always_free.zip
Binary file not shown.
Binary file modified examples/zips/analytics.zip
Binary file not shown.
Binary file modified examples/zips/announcements_service.zip
Binary file not shown.
Binary file modified examples/zips/api_gateway.zip
Binary file not shown.
Binary file modified examples/zips/apm.zip
Binary file not shown.
Binary file modified examples/zips/appmgmt_control.zip
Binary file not shown.
Binary file modified examples/zips/artifacts.zip
Binary file not shown.
Binary file modified examples/zips/audit.zip
Binary file not shown.
Binary file modified examples/zips/autoscaling.zip
Binary file not shown.
Binary file modified examples/zips/bastion.zip
Binary file not shown.
Binary file modified examples/zips/big_data_service.zip
Binary file not shown.
Binary file modified examples/zips/blockchain.zip
Binary file not shown.
Binary file modified examples/zips/budget.zip
Binary file not shown.
Binary file modified examples/zips/certificatesManagement.zip
Binary file not shown.
Binary file modified examples/zips/cloudBridge.zip
Binary file not shown.
Binary file modified examples/zips/cloudMigrations.zip
Binary file not shown.
Binary file modified examples/zips/cloudguard.zip
Binary file not shown.
Binary file modified examples/zips/compute.zip
Binary file not shown.
Binary file modified examples/zips/computeinstanceagent.zip
Binary file not shown.
Binary file modified examples/zips/concepts.zip
Binary file not shown.
Binary file modified examples/zips/container_engine.zip
Binary file not shown.
Binary file modified examples/zips/container_instances.zip
Binary file not shown.
Binary file modified examples/zips/database.zip
Binary file not shown.
Binary file modified examples/zips/databaseTools.zip
Binary file not shown.
Binary file modified examples/zips/databasemanagement.zip
Binary file not shown.
Binary file modified examples/zips/databasemigration.zip
Binary file not shown.
Binary file modified examples/zips/datacatalog.zip
Binary file not shown.
Binary file modified examples/zips/dataflow.zip
Binary file not shown.
Binary file modified examples/zips/dataintegration.zip
Binary file not shown.
Binary file modified examples/zips/datalabeling.zip
Binary file not shown.
Binary file modified examples/zips/datasafe.zip
Binary file not shown.
Binary file modified examples/zips/datascience.zip
Binary file not shown.
Binary file modified examples/zips/devops.zip
Binary file not shown.
Binary file modified examples/zips/disaster_recovery.zip
Binary file not shown.
Binary file modified examples/zips/dns.zip
Binary file not shown.
Binary file modified examples/zips/em_warehouse.zip
Binary file not shown.
Binary file modified examples/zips/email.zip
Binary file not shown.
Binary file modified examples/zips/events.zip
Binary file not shown.
Binary file modified examples/zips/fast_connect.zip
Binary file not shown.
Binary file modified examples/zips/functions.zip
Binary file not shown.
Binary file modified examples/zips/fusionapps.zip
Binary file not shown.
Binary file modified examples/zips/goldengate.zip
Binary file not shown.
Binary file modified examples/zips/health_checks.zip
Binary file not shown.
Binary file modified examples/zips/id6.zip
Binary file not shown.
Binary file modified examples/zips/identity.zip
Binary file not shown.
Binary file modified examples/zips/identity_data_plane.zip
Binary file not shown.
Binary file modified examples/zips/identity_domains.zip
Binary file not shown.
Binary file modified examples/zips/integration.zip
Binary file not shown.
Binary file modified examples/zips/jms.zip
Binary file not shown.
Binary file modified examples/zips/kms.zip
Binary file not shown.
Binary file modified examples/zips/license_manager.zip
Binary file not shown.
Binary file modified examples/zips/limits.zip
Binary file not shown.
Binary file modified examples/zips/load_balancer.zip
Binary file not shown.
Binary file modified examples/zips/log_analytics.zip
Binary file not shown.
Binary file modified examples/zips/logging.zip
Binary file not shown.
Binary file modified examples/zips/management_agent.zip
Binary file not shown.
Binary file modified examples/zips/management_dashboard.zip
Binary file not shown.
Binary file modified examples/zips/marketplace.zip
Binary file not shown.
Binary file modified examples/zips/media_services.zip
Binary file not shown.
Binary file modified examples/zips/metering_computation.zip
Binary file not shown.
Binary file modified examples/zips/monitoring.zip
Binary file not shown.
Binary file modified examples/zips/mysql.zip
Binary file not shown.
Binary file modified examples/zips/network_firewall.zip
Binary file not shown.
Binary file modified examples/zips/network_load_balancer.zip
Binary file not shown.
Binary file modified examples/zips/networking.zip
Binary file not shown.
Binary file modified examples/zips/nosql.zip
Binary file not shown.
Binary file modified examples/zips/notifications.zip
Binary file not shown.
Binary file modified examples/zips/object_storage.zip
Binary file not shown.
Binary file modified examples/zips/ocvp.zip
Binary file not shown.
Binary file modified examples/zips/onesubscription.zip
Binary file not shown.
Binary file modified examples/zips/opa.zip
Binary file not shown.
Binary file modified examples/zips/opensearch.zip
Binary file not shown.
Binary file modified examples/zips/operator_access_control.zip
Binary file not shown.
Binary file modified examples/zips/opsi.zip
Binary file not shown.
Binary file modified examples/zips/optimizer.zip
Binary file not shown.
Binary file modified examples/zips/oracle_cloud_vmware_solution.zip
Binary file not shown.
Binary file modified examples/zips/oracle_content_experience.zip
Binary file not shown.
Binary file modified examples/zips/oracle_digital_assistant.zip
Binary file not shown.
Binary file modified examples/zips/osmanagement.zip
Binary file not shown.
Binary file modified examples/zips/osp_gateway.zip
Binary file not shown.
Binary file modified examples/zips/osub_billing_schedule.zip
Binary file not shown.
Binary file modified examples/zips/osub_organization_subscription.zip
Binary file not shown.
Binary file modified examples/zips/osub_subscription.zip
Binary file not shown.
Binary file modified examples/zips/osub_usage.zip
Binary file not shown.
Binary file modified examples/zips/pic.zip
Binary file not shown.
Binary file modified examples/zips/queue.zip
Binary file not shown.
Binary file modified examples/zips/recovery.zip
Binary file not shown.
Binary file modified examples/zips/resourcemanager.zip
Binary file not shown.
Binary file modified examples/zips/serviceManagerProxy.zip
Binary file not shown.
Binary file modified examples/zips/service_catalog.zip
Binary file not shown.
Binary file modified examples/zips/service_connector_hub.zip
Binary file not shown.
Binary file modified examples/zips/service_mesh.zip
Binary file not shown.
Binary file modified examples/zips/stack_monitoring.zip
Binary file not shown.
Binary file modified examples/zips/storage.zip
Binary file not shown.
Binary file modified examples/zips/streaming.zip
Binary file not shown.
Binary file modified examples/zips/usage_proxy.zip
Binary file not shown.
Binary file modified examples/zips/vault_secret.zip
Binary file not shown.
Binary file modified examples/zips/vbs_inst.zip
Binary file not shown.
Binary file modified examples/zips/visual_builder.zip
Binary file not shown.
Binary file modified examples/zips/vn_monitoring.zip
Binary file not shown.
Binary file modified examples/zips/vulnerability_scanning_service.zip
Binary file not shown.
Binary file modified examples/zips/web_app_acceleration.zip
Binary file not shown.
Binary file modified examples/zips/web_app_firewall.zip
Binary file not shown.
Binary file modified examples/zips/web_application_acceleration_and_security.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ require (
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/oklog/run v1.0.0 // indirect
github.com/oracle/oci-go-sdk/v65 v65.45.0
github.com/oracle/oci-go-sdk/v65 v65.46.0
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/sony/gobreaker v0.5.0 // indirect
github.com/ulikunitz/xz v0.5.8 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/oracle/oci-go-sdk/v65 v65.45.0 h1:EpCst/iZma9s8eYS0QJ9qsTmGxX5GPehYGN1jwGIteU=
github.com/oracle/oci-go-sdk/v65 v65.45.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
github.com/oracle/oci-go-sdk/v65 v65.46.0 h1:4Tk81VNjCsnuAtVtICM+cLlcZw6AOiMtIvuVEwk78Lc=
github.com/oracle/oci-go-sdk/v65 v65.46.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Expand Down
4 changes: 2 additions & 2 deletions internal/globalvar/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"log"
)

const Version = "5.6.0"
const ReleaseDate = "2023-07-26"
const Version = "5.7.0"
const ReleaseDate = "2023-08-02"

func PrintVersion() {
log.Printf("[INFO] terraform-provider-oci %s\n", Version)
Expand Down
Loading

0 comments on commit 0ead5b9

Please sign in to comment.