Skip to content

Commit

Permalink
Merge pull request #2246 from oracle/release_gh
Browse files Browse the repository at this point in the history
Releasing version 6.19.0
  • Loading branch information
srinioci authored Nov 21, 2024
2 parents aacfd85 + 9328f31 commit 30d6d23
Show file tree
Hide file tree
Showing 193 changed files with 1,521 additions and 190 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 6.19.0 (November 21, 2024)

### Added
- README.md of service examples with magic button
- Release for v6.18.0
- Support for Add secretIds for sensitive connection attributes
- Support for Oracle Cloud AI Service Generative AI Agent Service

## 6.18.0 (November 13, 2024)

### Added
Expand Down
1 change: 1 addition & 0 deletions examples/database/db_systems/db_vm/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ resource "oci_database_db_system" "db_system_bkup" {
db_home {
db_version = "12.1.0.2"
database_software_image_id = var.test_database_software_image_ocid
is_unified_auditing_enabled = false
database {
admin_password = "BEstrO0ng_#11"
backup_tde_password = "BEstrO0ng_#11"
Expand Down
9 changes: 9 additions & 0 deletions examples/psql/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ resource "oci_psql_db_system" "test_db_system" {
db_version = "14"
display_name = "tf-test-dbSystem"
network_details {
is_reader_endpoint_enabled = true
subnet_id = oci_core_subnet.test_subnet.id
}
shape = "PostgreSQL.VM.Standard.E4.Flex.2.32GB"
Expand All @@ -73,12 +74,14 @@ resource "oci_psql_db_system" "test_db_system" {
system_type = "OCI_OPTIMIZED_STORAGE"
}

# Creating flex dbsystem
resource "oci_psql_db_system" "test_flexdb_system" {
#Required
db_version = "14"
display_name = "tf-flex-test-dbSystem"
network_details {
subnet_id = oci_core_subnet.test_subnet.id
is_reader_endpoint_enabled = true
}
shape = "PostgreSQL.VM.Standard.E4.Flex"
storage_details {
Expand Down Expand Up @@ -144,3 +147,9 @@ data "oci_psql_configurations" "test_configurations" {
compartment_id = var.compartment_ocid

}

# Details about specific dbsystem connection
data "oci_psql_db_system_connection_detail" "test_db_system_connection_detail" {
#Required
db_system_id = oci_psql_db_system.test_db_system.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/aiLanguage.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/capacity_management.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/cluster_placement_groups.zip
Binary file not shown.
Binary file modified examples/zips/compute.zip
Binary file not shown.
Binary file modified examples/zips/computecloudatcustomer.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/delegation_management.zip
Binary file not shown.
Binary file modified examples/zips/demand_signal.zip
Binary file not shown.
Binary file modified examples/zips/desktops.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/fleet_apps_management.zip
Binary file not shown.
Binary file modified examples/zips/fleetsoftwareupdate.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/generative_ai.zip
Binary file not shown.
Binary file modified examples/zips/generative_ai_agent.zip
Binary file not shown.
Binary file modified examples/zips/globally_distributed_database.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/jms_java_downloads.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/os_management_hub.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/psql.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/redis.zip
Binary file not shown.
Binary file modified examples/zips/resourcemanager.zip
Binary file not shown.
Binary file modified examples/zips/resourcescheduler.zip
Binary file not shown.
Binary file modified examples/zips/security_attribute.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.
Binary file modified examples/zips/zpr.zip
Binary file not shown.
4 changes: 2 additions & 2 deletions internal/globalvar/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"log"
)

const Version = "6.18.0"
const Version = "6.19.0"

const ReleaseDate = "2024-11-13"
const ReleaseDate = "2024-11-20"

func PrintVersion() {
log.Printf("[INFO] terraform-provider-oci %s\n", Version)
Expand Down
113 changes: 2 additions & 111 deletions internal/integrationtest/bds_odh_instance_resource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,12 @@ func TestResourceBdsOdhInstance(t *testing.T) {
},
),
},

// delete before next Create
{
Config: config + compartmentIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr,
},

// verify Create, cluster will be force stopped after create
{
Config: config + compartmentIdVariableStr + kmsKeyIdVariableStr + subnetIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr + bootstrapScriptUrlUVariableStr +
Expand Down Expand Up @@ -324,123 +326,12 @@ func TestResourceBdsOdhInstance(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
),
},
// delete before next Create
{
Config: config + compartmentIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr,
},
// Create cluster with HADOOP_EXTENDED
{
Config: config + compartmentIdVariableStr + kmsKeyIdVariableStr + subnetIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr + bootstrapScriptUrlUVariableStr +
acctest.GenerateResourceFromRepresentationMap("oci_bds_bds_instance", "test_bds_instance", acctest.Optional, acctest.Create,
acctest.RepresentationCopyWithNewProperties(bdsInstanceOdhRepresentation, map[string]interface{}{
"cluster_profile": acctest.Representation{RepType: acctest.Optional, Create: `HADOOP_EXTENDED`},
"display_name": acctest.Representation{RepType: acctest.Required, Create: `hadext1`, Update: `hadext1`},
})),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr(resourceName, "cluster_admin_password", "T3JhY2xlVGVhbVVTQSExMjM="),
resource.TestCheckResourceAttrSet(resourceName, "cluster_public_key"),
resource.TestCheckResourceAttr(resourceName, "cluster_version", "ODH1"),
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
resource.TestCheckResourceAttr(resourceName, "is_high_availability", "true"),
resource.TestCheckResourceAttr(resourceName, "is_secure", "true"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.node_type"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.shape"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.subnet_id"),
resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),

func(s *terraform.State) (err error) {
resId, err = acctest.FromInstanceState(s, resourceName, "id")
return err
},
),
},
// Add Kafka to cluster
{
Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + kmsKeyIdVariableStr + subnetIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr + bootstrapScriptUrlUVariableStr + kmsKeyIdUVariableStr +
acctest.GenerateResourceFromRepresentationMap("oci_bds_bds_instance", "test_bds_instance", acctest.Optional, acctest.Update,
acctest.RepresentationCopyWithNewProperties(bdsInstanceOdhRepresentation, map[string]interface{}{
"is_kafka_configured": acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `true`},
"cluster_profile": acctest.Representation{RepType: acctest.Optional, Create: `HADOOP_EXTENDED`, Update: `HADOOP_EXTENDED`},
"display_name": acctest.Representation{RepType: acctest.Required, Create: `hadext1`, Update: `hadext1`},
"kafka_broker_node": acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceKafkaBrokerNodeFlexShapeRepresentation},
})),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr(resourceName, "cluster_admin_password", "T3JhY2xlVGVhbVVTQSExMjM="),
resource.TestCheckResourceAttrSet(resourceName, "cluster_public_key"),
resource.TestCheckResourceAttr(resourceName, "cluster_version", "ODH1"),
resource.TestCheckResourceAttr(resourceName, "is_high_availability", "true"),
resource.TestCheckResourceAttr(resourceName, "is_secure", "true"),
resource.TestCheckResourceAttr(resourceName, "is_kafka_configured", "true"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.node_type"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.shape"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.subnet_id"),
resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
),
},
// Remove Kafka to cluster
{
Config: config + compartmentIdVariableStr + compartmentIdUVariableStr + kmsKeyIdVariableStr + subnetIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr + bootstrapScriptUrlUVariableStr + kmsKeyIdUVariableStr +
acctest.GenerateResourceFromRepresentationMap("oci_bds_bds_instance", "test_bds_instance", acctest.Optional, acctest.Update,
acctest.RepresentationCopyWithNewProperties(bdsInstanceOdhRepresentation, map[string]interface{}{
"is_kafka_configured": acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `false`},
"cluster_profile": acctest.Representation{RepType: acctest.Optional, Create: `HADOOP_EXTENDED`, Update: `HADOOP_EXTENDED`},
"display_name": acctest.Representation{RepType: acctest.Required, Create: `hadext1`, Update: `hadext1`},
})),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr(resourceName, "cluster_admin_password", "T3JhY2xlVGVhbVVTQSExMjM="),
resource.TestCheckResourceAttrSet(resourceName, "cluster_public_key"),
resource.TestCheckResourceAttr(resourceName, "cluster_version", "ODH1"),
resource.TestCheckResourceAttr(resourceName, "is_high_availability", "true"),
resource.TestCheckResourceAttr(resourceName, "is_secure", "true"),
resource.TestCheckResourceAttr(resourceName, "is_kafka_configured", "false"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.node_type"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.shape"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.subnet_id"),
resource.TestCheckResourceAttr(resourceName, "state", "ACTIVE"),
),
},
// delete before next Create
{
Config: config + compartmentIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr,
},
// verify Create with required fields Kafka cluster
{
Config: config + compartmentIdVariableStr + kmsKeyIdVariableStr + subnetIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr +
acctest.GenerateResourceFromRepresentationMap("oci_bds_bds_instance", "test_bds_instance", acctest.Required, acctest.Create,
acctest.RepresentationCopyWithNewProperties(bdsInstanceOdhRepresentation, map[string]interface{}{
"is_kafka_configured": acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `false`},
"cluster_profile": acctest.Representation{RepType: acctest.Optional, Create: `KAFKA`, Update: `HADOOP_EXTENDED`},
"display_name": acctest.Representation{RepType: acctest.Required, Create: `kafkacluster`, Update: `kafkacluster`},
"kafka_broker_node": acctest.RepresentationGroup{RepType: acctest.Required, Group: bdsInstanceKafkaBrokerNodeFlexShapeRepresentation},
})),
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr(resourceName, "cluster_admin_password", "T3JhY2xlVGVhbVVTQSExMjM="),
resource.TestCheckResourceAttrSet(resourceName, "cluster_public_key"),
resource.TestCheckResourceAttr(resourceName, "cluster_version", "ODH1"),
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
resource.TestCheckResourceAttr(resourceName, "is_high_availability", "true"),
resource.TestCheckResourceAttr(resourceName, "is_secure", "true"),
resource.TestCheckResourceAttr(resourceName, "is_kafka_configured", "false"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.node_type"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.shape"),
resource.TestCheckResourceAttrSet(resourceName, "nodes.0.subnet_id"),

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
},
),
},

// delete before next Create
{
Config: config + compartmentIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr,
},
// verify Create with optionals
{
Config: config + compartmentIdVariableStr + kmsKeyIdVariableStr + subnetIdVariableStr + BdsInstanceOdhResourceDependencies + bootstrapScriptUrlVariableStr +
Expand Down
Loading

0 comments on commit 30d6d23

Please sign in to comment.