fmt changes and registration

Author: varmax2511

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

@@ -6,12 +6,13 @@ package integrationtest
 import (
 	"context"
 	"fmt"
-	"github.com/terraform-providers/terraform-provider-oci/internal/resourcediscovery"
-	"github.com/terraform-providers/terraform-provider-oci/internal/tfresource"
 	"strconv"
 	"testing"
 	"time"
 
+	"github.com/terraform-providers/terraform-provider-oci/internal/resourcediscovery"
+	"github.com/terraform-providers/terraform-provider-oci/internal/tfresource"
+
 	"github.com/terraform-providers/terraform-provider-oci/internal/acctest"
 	tf_client "github.com/terraform-providers/terraform-provider-oci/internal/client"
 	"github.com/terraform-providers/terraform-provider-oci/internal/utils"
@@ -58,7 +59,7 @@ var (
 		// Not supported yet
 		// "alternate_custom_endpoints": RepresentationGroup{Optional, vbInstanceAlternateCustomEndpointsRepresentation},
 		"consumption_model":         acctest.Representation{RepType: acctest.Optional, Create: `UCM`},
-		"custom_endpoint":           acctest.RepresentationGroup{acctest.Optional, vbInstanceCustomEndpointRepresentation},
+		"custom_endpoint":           acctest.RepresentationGroup{RepType: acctest.Optional, Group: vbInstanceCustomEndpointRepresentation},
 		"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")}`},
 		"freeform_tags":             acctest.Representation{RepType: acctest.Optional, Create: map[string]string{"bar-key": "value"}, Update: map[string]string{"Department": "Accounting"}},
 		"idcs_open_id":              acctest.Representation{RepType: acctest.Required, Create: `${var.idcs_access_token}`},

internal/provider/register_datasource.go

@@ -71,6 +71,7 @@ import (
 	tf_streaming "github.com/terraform-providers/terraform-provider-oci/internal/service/streaming"
 	tf_usage_proxy "github.com/terraform-providers/terraform-provider-oci/internal/service/usage_proxy"
 	tf_vault "github.com/terraform-providers/terraform-provider-oci/internal/service/vault"
+	tf_visual_builder "github.com/terraform-providers/terraform-provider-oci/internal/service/visual_builder"
 	tf_vulnerability_scanning "github.com/terraform-providers/terraform-provider-oci/internal/service/vulnerability_scanning"
 	tf_waas "github.com/terraform-providers/terraform-provider-oci/internal/service/waas"
 	tf_waf "github.com/terraform-providers/terraform-provider-oci/internal/service/waf"
@@ -1038,4 +1039,6 @@ func init() {
 	RegisterDatasource("oci_bastion_session", tf_bastion.BastionSessionDataSource())
 	RegisterDatasource("oci_bastion_sessions", tf_bastion.BastionSessionsDataSource())
 
+	//visual builder
+	RegisterResource("oci_visual_builder_vb_instance", tf_visual_builder.VisualBuilderVbInstanceDataSource())
 }

internal/provider/register_resource.go

@@ -68,6 +68,7 @@ import (
 	tf_service_catalog "github.com/terraform-providers/terraform-provider-oci/internal/service/service_catalog"
 	tf_streaming "github.com/terraform-providers/terraform-provider-oci/internal/service/streaming"
 	tf_usage_proxy "github.com/terraform-providers/terraform-provider-oci/internal/service/usage_proxy"
+	tf_visual_builder "github.com/terraform-providers/terraform-provider-oci/internal/service/visual_builder"
 	tf_vulnerability_scanning "github.com/terraform-providers/terraform-provider-oci/internal/service/vulnerability_scanning"
 	tf_waas "github.com/terraform-providers/terraform-provider-oci/internal/service/waas"
 	tf_waf "github.com/terraform-providers/terraform-provider-oci/internal/service/waf"
@@ -552,4 +553,6 @@ func init() {
 	RegisterResource("oci_bastion_bastion", tf_bastion.BastionBastionResource())
 	RegisterResource("oci_bastion_session", tf_bastion.BastionSessionResource())
 
+	// visual builder
+	RegisterResource("oci_visual_builder_vb_instance", tf_visual_builder.VisualBuilderVbInstanceResource())
 }

internal/service/visual_builder/visual_builder_vb_instance_applications_data_source.go

@@ -2,7 +2,9 @@ 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"

internal/service/visual_builder/visual_builder_vb_instance_data_source.go

@@ -5,6 +5,7 @@ package visual_builder
 
 import (
 	"context"
+
 	"github.com/terraform-providers/terraform-provider-oci/internal/client"
 	"github.com/terraform-providers/terraform-provider-oci/internal/tfresource"
 

internal/service/visual_builder/visual_builder_vb_instance_resource.go

@@ -6,11 +6,12 @@ package visual_builder
 import (
 	"context"
 	"fmt"
+	"strings"
+	"time"
+
 	"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"
-	"strings"
-	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -601,7 +602,7 @@ func (s *VisualBuilderVbInstanceResourceCrud) SetData() error {
 	}
 
 	if s.Res.SystemTags != nil {
-		s.D.Set("system_tags", systemTagsToMap(s.Res.SystemTags))
+		s.D.Set("system_tags", tfresource.SystemTagsToMap(s.Res.SystemTags))
 	}
 
 	if s.Res.TimeCreated != nil {
@@ -717,7 +718,7 @@ func VbInstanceSummaryToMap(obj oci_visual_builder.VbInstanceSummary) map[string
 	}
 
 	if obj.SystemTags != nil {
-		result["system_tags"] = systemTagsToMap(obj.SystemTags)
+		result["system_tags"] = tfresource.SystemTagsToMap(obj.SystemTags)
 	}
 
 	if obj.TimeCreated != nil {

internal/service/visual_builder/visual_builder_vb_instances_data_source.go

@@ -5,6 +5,7 @@ package visual_builder
 
 import (
 	"context"
+
 	"github.com/terraform-providers/terraform-provider-oci/internal/client"
 	"github.com/terraform-providers/terraform-provider-oci/internal/tfresource"