Added - Support for Project Flash

Author: Alexander Garcell Roque

.gitignore

@@ -28,4 +28,5 @@ vendor/github.com/oracle/oci-go-sdk/target
 internal/record
 .terraform.lock.hcl
 dist/
-internal/integrationtest/output
+internal/integrationtest/output
+/vendor/

examples/generative_ai/endpoint.tf

@@ -1,4 +1,5 @@
 resource "oci_generative_ai_endpoint" "test_endpoint" {
+ depends_on = [oci_generative_ai_dedicated_ai_cluster.test_hosting_cluster,oci_generative_ai_model.llama3_test_model]
  #Required
  compartment_id = var.compartment_ocid
  dedicated_ai_cluster_id = data.oci_generative_ai_dedicated_ai_cluster.test_hosting_cluster.id
@@ -24,17 +25,17 @@ data "oci_generative_ai_endpoints" "test_endpoints" {
 locals {
  filtered_serving_models = [
 for item in data.oci_generative_ai_models.serving_models.model_collection[0].items : item
- if (
-(item.version == "14.2")
-&& length(item.capabilities) == 1
- && (item.display_name == "cohere.command-light")
- )
-]
+  if (
+ (item.version == "1.0")
+ && length(item.capabilities) == 1
+ && (item.display_name == "cohere.command-a-03-2025")
+  )
+ ]
 
  servering_model_id = local.filtered_serving_models[0].id
 }
 
 data "oci_generative_ai_models" "serving_models" {
  compartment_id = var.compartment_ocid
- display_name = "cohere.command-light"
+ display_name = "cohere.command-a-03-2025"
 }

examples/generative_ai/imported_model/imported_model.tf

@@ -0,0 +1,26 @@
+resource "oci_generative_ai_imported_model" "test_imported_model" {
+ #Required
+ compartment_id = var.compartment_ocid
+ data_source {
+ #Optional
+ access_token = var.hf_access_token
+ model_id = var.imported_model_model_id
+ source_type = var.imported_model_data_source_source_type
+ }
+
+ #Optional
+ capabilities = var.imported_model_capabilities
+ description = var.imported_model_description
+ display_name = var.imported_model_display_name
+ freeform_tags = var.imported_model_freeform_tags
+ vendor = var.imported_model_vendor
+ version = var.imported_model_version
+}
+
+data "oci_generative_ai_imported_models" "test_imported_models" {
+ #Required
+ compartment_id = var.compartment_ocid
+
+ #Optional
+ capability = var.imported_model_capability
+}

examples/generative_ai/imported_model/provider.tf

@@ -0,0 +1,7 @@
+provider "oci" {
+ auth = "SecurityToken"
+ config_file_profile = var.config_file_profile
+ region = var.region
+}
+
+

examples/generative_ai/imported_model/variables.tf

@@ -0,0 +1,47 @@
+variable "compartment_ocid" {}
+
+variable "region" {}
+
+variable config_file_profile {}
+
+variable "imported_model_capabilities" {
+ default = ["TEXT_TO_TEXT"]
+}
+
+variable "imported_model_capability" {
+ default = ["TEXT_TO_TEXT"]
+}
+
+variable "hf_access_token" {
+ type = string
+}
+
+variable "imported_model_data_source_source_type" {
+ default = "HUGGING_FACE_MODEL"
+}
+
+variable "imported_model_description" {
+ default = "description"
+}
+
+variable "imported_model_display_name" {
+ default = "displayName"
+}
+
+variable "imported_model_freeform_tags" {
+ default = { "Department" = "Finance" }
+}
+
+variable "imported_model_model_id" {
+ default = "google/gemma-3-12b-it"
+}
+
+variable "imported_model_vendor" {
+ default = "vendor"
+}
+
+variable "imported_model_version" {
+ default = "4.0"
+}
+
+

examples/generative_ai/model.tf

@@ -1,4 +1,5 @@
 resource "oci_generative_ai_model" "llama3_test_model" {
+ depends_on = [oci_generative_ai_dedicated_ai_cluster.test_dedicated_ai_cluster_large_generic ]
  #Required
  compartment_id = var.compartment_ocid
  base_model_id = local.llama_base_model_id

examples/generative_ai/provider.tf

@@ -15,6 +15,6 @@ provider "oci" {
  auth = "SecurityToken"
  config_file_profile = var.config_file_profile
  region = var.region
-}
+ }
 
 

examples/generative_ai/variables.tf

@@ -10,7 +10,7 @@ variable "hosting_cluster_description" {
 }
 
 variable "hosting_cluster_shape" {
- default = "SMALL_COHERE"
+ default = "LARGE_COHERE_V3"
 }
 
 variable "hosting_cluster_unit_count" {
@@ -66,7 +66,7 @@ variable "test_model_vendor" {
 }
 
 variable "test_model_version" {
- default = "1.1"
+ default = "1.3"
 }
 
 variable "test_freeform_tags" {

internal/integrationtest/generative_ai_dedicated_ai_cluster_test.go

@@ -51,19 +51,33 @@ var (
 "dedicated_ai_cluster_id": acctest.Representation{RepType: acctest.Required, Create: `${oci_generative_ai_dedicated_ai_cluster.test_dedicated_ai_cluster.id}`},
 "model_id": acctest.Representation{RepType: acctest.Required, Create: `${local.servering_model_id}`},
 "content_moderation_config": acctest.RepresentationGroup{RepType: acctest.Optional, Group: GenerativeAiEndpointContentModerationConfigRepresentation},
-// "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")}`},
+//"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")}`},
 "description": acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
 "display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
 "freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
 }
 GenerativeAiEndpointContentModerationConfigRepresentation = map[string]interface{}{
-"is_enabled": acctest.Representation{RepType: acctest.Optional, Create: `false`, Update: `true`},
+"is_enabled": acctest.Representation{RepType: acctest.Required, Create: `false`, Update: `true`},
+"mode": acctest.Representation{RepType: acctest.Optional, Create: `INFORM`, Update: `BLOCK`},
+"model_id": acctest.Representation{RepType: acctest.Optional, Create: `${local.servering_model_id}`},
 }
 
-GenerativeAiEndpointResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_generative_ai_dedicated_ai_cluster", "test_dedicated_ai_cluster", acctest.Required, acctest.Create, GenerativeAiHostingDedicatedAiClusterRepresentation) +
+GenerativeAiEndpointResourceDependencies = acctest.GenerateResourceFromRepresentationMap("oci_generative_ai_dedicated_ai_cluster", "test_dedicated_ai_cluster", acctest.Required, acctest.Create, DedicatedAiClusterRepresentation) +
 servingModelDependencies
 // DefinedTagsDependencies + - no test in home region
 
+DedicatedAiClusterRepresentation = map[string]interface{}{
+"compartment_id": acctest.Representation{RepType: acctest.Required, Create: `${var.compartment_id}`},
+"type": acctest.Representation{RepType: acctest.Required, Create: `HOSTING`},
+"unit_count": acctest.Representation{RepType: acctest.Required, Create: `1`, Update: `2`},
+"unit_shape": acctest.Representation{RepType: acctest.Required, Create: `LARGE_COHERE_V3`},
+"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")}`},
+"description": acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
+"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
+"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: generativeaiDatasetIgnoreDefinedTagsChangesRep},
+}
+
 servingModelDependencies = `
 locals {
 
@@ -84,6 +98,17 @@ var (
  display_name = "cohere.command-a-03-2025"
 }
 `
+
+GenerativeAiEndpointModelRepresentation = map[string]interface{}{
+"base_model_id": acctest.Representation{RepType: acctest.Required, Create: `${local.servering_model_id}`},
+"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")}`},
+"description": acctest.Representation{RepType: acctest.Optional, Create: `description`, Update: `description2`},
+"display_name": acctest.Representation{RepType: acctest.Optional, Create: `displayName`, Update: `displayName2`},
+"freeform_tags": acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"Department": "Finance"}, Update: map[string]string{"Department": "Accounting"}},
+"vendor": acctest.Representation{RepType: acctest.Optional, Create: `vendor`},
+"version": acctest.Representation{RepType: acctest.Optional, Create: generativeAiVersion, Update: generativeAiVersion2},
+}
 )
 
 // issue-routing-tag: generative_ai/default
@@ -137,6 +162,8 @@ func TestGenerativeAiEndpointResource_basic(t *testing.T) {
 resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 resource.TestCheckResourceAttr(resourceName, "content_moderation_config.#", "1"),
 resource.TestCheckResourceAttr(resourceName, "content_moderation_config.0.is_enabled", "false"),
+resource.TestCheckResourceAttr(resourceName, "content_moderation_config.0.mode", "INFORM"),
+resource.TestCheckResourceAttrSet(resourceName, "content_moderation_config.0.model_id"),
 resource.TestCheckResourceAttrSet(resourceName, "dedicated_ai_cluster_id"),
 resource.TestCheckResourceAttr(resourceName, "description", "description"),
 resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
@@ -169,6 +196,8 @@ func TestGenerativeAiEndpointResource_basic(t *testing.T) {
 resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentIdU),
 resource.TestCheckResourceAttr(resourceName, "content_moderation_config.#", "1"),
 resource.TestCheckResourceAttr(resourceName, "content_moderation_config.0.is_enabled", "false"),
+resource.TestCheckResourceAttr(resourceName, "content_moderation_config.0.mode", "INFORM"),
+resource.TestCheckResourceAttrSet(resourceName, "content_moderation_config.0.model_id"),
 resource.TestCheckResourceAttrSet(resourceName, "dedicated_ai_cluster_id"),
 resource.TestCheckResourceAttr(resourceName, "description", "description"),
 resource.TestCheckResourceAttr(resourceName, "display_name", "displayName"),
@@ -196,6 +225,8 @@ func TestGenerativeAiEndpointResource_basic(t *testing.T) {
 resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentId),
 resource.TestCheckResourceAttr(resourceName, "content_moderation_config.#", "1"),
 resource.TestCheckResourceAttr(resourceName, "content_moderation_config.0.is_enabled", "true"),
+resource.TestCheckResourceAttr(resourceName, "content_moderation_config.0.mode", "BLOCK"),
+resource.TestCheckResourceAttrSet(resourceName, "content_moderation_config.0.model_id"),
 resource.TestCheckResourceAttrSet(resourceName, "dedicated_ai_cluster_id"),
 resource.TestCheckResourceAttr(resourceName, "description", "description2"),
 resource.TestCheckResourceAttr(resourceName, "display_name", "displayName2"),
@@ -237,9 +268,10 @@ func TestGenerativeAiEndpointResource_basic(t *testing.T) {
 compartmentIdVariableStr + GenerativeAiEndpointResourceConfig,
 Check: acctest.ComposeAggregateTestCheckFuncWrapper(
 resource.TestCheckResourceAttrSet(singularDatasourceName, "endpoint_id"),
-resource.TestCheckResourceAttr(singularDatasourceName, "compartment_id", compartmentId),
+
 resource.TestCheckResourceAttr(singularDatasourceName, "content_moderation_config.#", "1"),
 resource.TestCheckResourceAttr(singularDatasourceName, "content_moderation_config.0.is_enabled", "true"),
+resource.TestCheckResourceAttr(singularDatasourceName, "content_moderation_config.0.mode", "BLOCK"),
 resource.TestCheckResourceAttr(singularDatasourceName, "description", "description2"),
 resource.TestCheckResourceAttr(singularDatasourceName, "display_name", "displayName2"),
 resource.TestCheckResourceAttr(singularDatasourceName, "freeform_tags.%", "1"),
@@ -251,11 +283,14 @@ func TestGenerativeAiEndpointResource_basic(t *testing.T) {
 },
 // verify resource import
 {
-Config: config + GenerativeAiEndpointRequiredOnlyResource,
-ImportState: true,
-ImportStateVerify: true,
-ImportStateVerifyIgnore: []string{},
-ResourceName: resourceName,
+Config: config + GenerativeAiEndpointRequiredOnlyResource,
+ImportState: true,
+ImportStateVerify: true,
+ImportStateVerifyIgnore: []string{
+"compartment_id",
+"previous_state",
+},
+ResourceName: resourceName,
 },
 })
 }
@@ -364,7 +399,7 @@ func getGenerativeAiEndpointIds(compartment string) ([]string, error) {
 }
 
 func GenerativeAiEndpointSweepWaitCondition(response common.OCIOperationResponse) bool {
-// Only stop if the resource is ACTIVE beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
+// Only stop if the resource is active beyond 3 mins. As there could be an issue for the sweeper to delete the resource and manual intervention required.
 if endpointResponse, ok := response.Response.(oci_generative_ai.GetEndpointResponse); ok {
 return endpointResponse.LifecycleState != oci_generative_ai.EndpointLifecycleStateDeleted
 }