Added - Support for Visual Builder Runtime

Author: varmax2511

examples/visual_builder/main.tf

@@ -0,0 +1,87 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "region" {
+}
+
+variable "compartment_id" {
+}
+
+variable "idcs_open_id" {
+}
+
+variable "vb_instance_consumption_model" {
+  default = "UCM"
+}
+
+variable "custom_endpoint_certificate_secret_id" {
+}
+
+variable "custom_endpoint_host_name" {
+  default = "hostname.com"
+}
+
+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_visual_builder_vb_instance" "test_vb_instance" {
+  #Required
+  compartment_id            = var.compartment_id
+  display_name              = "displayName"
+  is_visual_builder_enabled = "true"
+  idcs_open_id              = var.idcs_open_id
+  node_count                = "1"
+
+  #Optional
+  consumption_model = var.vb_instance_consumption_model
+  custom_endpoint {
+    hostname = var.custom_endpoint_host_name
+    certificate_secret_id = var.custom_endpoint_certificate_secret_id
+  }
+  freeform_tags = {
+    "bar-key" = "value"
+  }
+
+  state                  = "ACTIVE"
+}
+
+data "oci_visual_builder_vb_instances" "test_vb_instances" {
+  #Required
+  compartment_id = var.compartment_id
+
+  #Optional
+  display_name = "displayName"
+  state        = "Active"
+  filter {
+    name = "id"
+    values = [oci_visual_builder_vb_instance.test_vb_instance.id]
+  }
+}
+
+data "oci_visual_builder_vb_instance" "test_vb_instance" {
+  #Required
+  vb_instance_id = oci_visual_builder_vb_instance.test_vb_instance.id
+}
+
+data "oci_visual_builder_vb_instance_applications" "test_vb_instance_applications" {
+  #Required
+  vb_instance_id  = oci_visual_builder_vb_instance.test_vb_instance.id
+  idcs_open_id    = var.idcs_open_id
+}

internal/client/visual_builder_clients.go

@@ -0,0 +1,34 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package client
+
+import (
+	oci_visual_builder "github.com/oracle/oci-go-sdk/v55/visualbuilder"
+
+	oci_common "github.com/oracle/oci-go-sdk/v55/common"
+)
+
+func init() {
+	RegisterOracleClient("oci_visual_builder.VbInstanceClient", &OracleClient{InitClientFn: initVisualbuilderVbInstanceClient})
+}
+
+func initVisualbuilderVbInstanceClient(configProvider oci_common.ConfigurationProvider, configureClient ConfigureClient, serviceClientOverrides ServiceClientOverrides) (interface{}, error) {
+	client, err := oci_visual_builder.NewVbInstanceClientWithConfigurationProvider(configProvider)
+	if err != nil {
+		return nil, err
+	}
+	err = configureClient(&client.BaseClient)
+	if err != nil {
+		return nil, err
+	}
+
+	if serviceClientOverrides.HostUrlOverride != "" {
+		client.Host = serviceClientOverrides.HostUrlOverride
+	}
+	return &client, nil
+}
+
+func (m *OracleClients) VbInstanceClient() *oci_visual_builder.VbInstanceClient {
+	return m.GetClient("oci_visual_builder.VbInstanceClient").(*oci_visual_builder.VbInstanceClient)
+}

internal/integrationtest/data_labeling_service_dataset_test.go

@@ -107,7 +107,7 @@ func TestDataLabelingServiceDatasetResource_basic(t *testing.T) {
 	config := acctest.ProviderTestConfig()
 
 	compartmentId := utils.GetEnvSettingWithBlankDefault("compartment_ocid")
-	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id"+
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id" +
 		"\" { default = \"%s\" }\n", compartmentId)
 
 	compartmentIdU := utils.GetEnvSettingWithDefault("compartment_id_for_Update", compartmentId)

internal/integrationtest/visual_builder_vb_instance_test.go

@@ -37,6 +37,7 @@ import (
 	oci_opsi "github.com/oracle/oci-go-sdk/v55/opsi"
 	oci_sch "github.com/oracle/oci-go-sdk/v55/sch"
 	oci_streaming "github.com/oracle/oci-go-sdk/v55/streaming"
+	oci_visual_builder "github.com/oracle/oci-go-sdk/v55/visualbuilder"
 	oci_vulnerability_scanning "github.com/oracle/oci-go-sdk/v55/vulnerabilityscanning"
 	oci_waas "github.com/oracle/oci-go-sdk/v55/waas"
 	oci_waf "github.com/oracle/oci-go-sdk/v55/waf"
@@ -2771,6 +2772,18 @@ var exportUsageProxySubscriptionRedeemableUserHints = &TerraformResourceHints{
 	resourceAbbreviation:   "subscription_redeemable_user",
 }
 
+var exportVisualBuilderVbInstanceHints = &TerraformResourceHints{
+	resourceClass:          "oci_visual_builder_vb_instance",
+	datasourceClass:        "oci_visual_builder_vb_instances",
+	datasourceItemsAttr:    "vb_instance_summary_collection",
+	isDatasourceCollection: true,
+	resourceAbbreviation:   "vb_instance",
+	requireResourceRefresh: true,
+	discoverableLifecycleStates: []string{
+		string(oci_visual_builder.VbInstanceLifecycleStateActive),
+	},
+}
+
 var exportVulnerabilityScanningHostScanRecipeHints = &TerraformResourceHints{
 	resourceClass:          "oci_vulnerability_scanning_host_scan_recipe",
 	datasourceClass:        "oci_vulnerability_scanning_host_scan_recipes",

internal/resourcediscovery/export_definitions.go

@@ -77,6 +77,7 @@ var compartmentResourceGraphs = map[string]TerraformResourceGraph{
 	"waf":                    wafResourceGraph,
 	"streaming":              streamingResourceGraph,
 	"tagging":                taggingResourceGraph,
+	"visual_builder":         visualBuilderResourceGraph,
 	//"vulnerability_scanning": vulnerabilityScanningResourceGraph,
 	//"waas":                   waasResourceGraph,
 	//"waf":                    wafResourceGraph,
@@ -1087,6 +1088,12 @@ var usageProxyResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {},
 }
 
+var visualBuilderResourceGraph = TerraformResourceGraph{
+	"oci_identity_compartment": {
+		{TerraformResourceHints: exportVisualBuilderVbInstanceHints},
+	},
+}
+
 var vulnerabilityScanningResourceGraph = TerraformResourceGraph{
 	"oci_identity_compartment": {
 		{TerraformResourceHints: exportVulnerabilityScanningHostScanRecipeHints},

internal/resourcediscovery/export_graphs.go

@@ -0,0 +1,144 @@
+package visual_builder
+
+import (
+	"context"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/terraform-providers/terraform-provider-oci/internal/client"
+	"github.com/terraform-providers/terraform-provider-oci/internal/tfresource"
+	"github.com/terraform-providers/terraform-provider-oci/internal/utils"
+
+	oci_visual_builder "github.com/oracle/oci-go-sdk/v55/visualbuilder"
+)
+
+func VisualBuilderVbInstanceApplicationsDataSource() *schema.Resource {
+	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+		Read: readVisualBuilderVbInstanceApplication,
+		Schema: map[string]*schema.Schema{
+			"vb_instance_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"idcs_open_id": {
+				Type:      schema.TypeString,
+				Optional:  true,
+				StateFunc: utils.GetMd5Hash,
+				Sensitive: true,
+			},
+			"application_summary_collection": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"items": {
+							Type:     schema.TypeList,
+							Computed: true,
+							// Elem:     GetDataSourceItemSchema(VisualBuilderVbInstanceApplicationsDataSource()),
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"state": {
+										Type:     schema.TypeString,
+										Required: true,
+									},
+									"id": {
+										Type:     schema.TypeString,
+										Required: true,
+									},
+									"version": {
+										Type:     schema.TypeString,
+										Required: true,
+									},
+									"project_id": {
+										Type:     schema.TypeString,
+										Required: true,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func readVisualBuilderVbInstanceApplication(d *schema.ResourceData, m interface{}) error {
+	sync := &VisualBuilderVbInstanceApplicationsDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).VbInstanceClient()
+
+	return tfresource.ReadResource(sync)
+}
+
+type VisualBuilderVbInstanceApplicationsDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_visual_builder.VbInstanceClient
+	Res    *oci_visual_builder.RequestSummarizedApplicationsResponse
+}
+
+func (s *VisualBuilderVbInstanceApplicationsDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *VisualBuilderVbInstanceApplicationsDataSourceCrud) Get() error {
+	request := oci_visual_builder.RequestSummarizedApplicationsRequest{}
+
+	if vbInstanceId, ok := s.D.GetOkExists("vb_instance_id"); ok {
+		tmp := vbInstanceId.(string)
+		request.VbInstanceId = &tmp
+	}
+
+	if idcsOpenId, ok := s.D.GetOkExists("idcs_open_id"); ok {
+		tmp := idcsOpenId.(string)
+		request.IdcsOpenId = &tmp
+	} else {
+		tmp := ""
+		request.IdcsOpenId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "visual_builder")
+
+	response, err := s.Client.RequestSummarizedApplications(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *VisualBuilderVbInstanceApplicationsDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(tfresource.GenerateDataSourceHashID("VisualBuilderVbInstanceApplicationsDataSource-", VisualBuilderVbInstanceApplicationsDataSource(), s.D))
+	resources := []map[string]interface{}{}
+	vbInstanceApplication := map[string]interface{}{}
+
+	items := []interface{}{}
+	for _, item := range s.Res.Items {
+		items = append(items, VbApplicationSummaryToMap(item))
+	}
+	vbInstanceApplication["items"] = items
+
+	resources = append(resources, vbInstanceApplication)
+	if err := s.D.Set("application_summary_collection", resources); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func VbApplicationSummaryToMap(obj oci_visual_builder.ApplicationSummary) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	result["state"] = string(obj.State)
+	result["id"] = *obj.Id
+	result["version"] = *obj.Version
+	result["project_id"] = *obj.ProjectId
+
+	return result
+}