Added - Support for Logging Analytics Import Custom Content

Author: xt0nguye

CHANGELOG.md

@@ -8,6 +8,7 @@
 ### Added
 - Support InstanceConsoleConnection API with new serviceHostKeyFingerprint Property 
 - Support for Data science ML jobs added
+- Support for Logging Analytics Import Custom Content
 
 ### Notes
 - Disabled resource discovery on resource `oci_core_drg_route_distribution_statement`

examples/log_analytics/files/TFSource1.zip

@@ -0,0 +1,29 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+/*
+ * This example shows how to import custom content
+ */
+
+# Create a custom content
+resource "oci_log_analytics_log_analytics_import_custom_content" "importCustomContentNew" {
+  namespace                  = data.oci_objectstorage_namespace.ns.namespace
+  import_custom_content_file = "./files/TFSource1.zip"
+
+}
+
+# Create a custom content with overwrite false
+resource "oci_log_analytics_log_analytics_import_custom_content" "importCustomContentOverwriteFalse" {
+  depends_on = [oci_log_analytics_log_analytics_import_custom_content.importCustomContentNew]
+  namespace                  = data.oci_objectstorage_namespace.ns.namespace
+  import_custom_content_file = "./files/TFSource1.zip"
+  is_overwrite               = "false"
+}
+
+# Create a custom content with overwrite true
+resource "oci_log_analytics_log_analytics_import_custom_content" "importCustomContentOverwriteTrue" {
+  depends_on = [oci_log_analytics_log_analytics_import_custom_content.importCustomContentOverwriteFalse]
+  namespace                  = data.oci_objectstorage_namespace.ns.namespace
+  import_custom_content_file = "./files/TFSource1.zip"
+  is_overwrite               = "true"
+}

examples/log_analytics/import_custom_content.tf

@@ -0,0 +1,260 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io/ioutil"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	oci_log_analytics "github.com/oracle/oci-go-sdk/v47/loganalytics"
+)
+
+func init() {
+	RegisterResource("oci_log_analytics_log_analytics_import_custom_content", LogAnalyticsLogAnalyticsImportCustomContentResource())
+}
+
+func LogAnalyticsLogAnalyticsImportCustomContentResource() *schema.Resource {
+	return &schema.Resource{
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+		Timeouts: DefaultTimeout,
+		Create:   createLogAnalyticsLogAnalyticsImportCustomContent,
+		Read:     readLogAnalyticsLogAnalyticsImportCustomContent,
+		Delete:   deleteLogAnalyticsLogAnalyticsImportCustomContent,
+		Schema: map[string]*schema.Schema{
+			// Required
+			"import_custom_content_file": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+			"namespace": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+
+			// Optional
+			"is_overwrite": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Computed: true,
+				ForceNew: true,
+			},
+
+			// Computed
+			"change_list": {
+				Type:     schema.TypeList,
+				Computed: true,
+				MaxItems: 1,
+				MinItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"conflict_field_display_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"conflict_parser_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"conflict_source_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"created_field_display_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"created_parser_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"created_source_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"updated_field_display_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"updated_parser_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"updated_source_names": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+					},
+				},
+			},
+			"content_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"field_names": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"parser_names": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+			"source_names": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+		},
+	}
+}
+
+func createLogAnalyticsLogAnalyticsImportCustomContent(d *schema.ResourceData, m interface{}) error {
+	sync := &LogAnalyticsLogAnalyticsImportCustomContentResourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).logAnalyticsClient()
+
+	return CreateResource(d, sync)
+}
+
+func readLogAnalyticsLogAnalyticsImportCustomContent(d *schema.ResourceData, m interface{}) error {
+	return nil
+}
+
+func deleteLogAnalyticsLogAnalyticsImportCustomContent(d *schema.ResourceData, m interface{}) error {
+	return nil
+}
+
+type LogAnalyticsLogAnalyticsImportCustomContentResourceCrud struct {
+	BaseCrud
+	Client                 *oci_log_analytics.LogAnalyticsClient
+	Res                    *oci_log_analytics.LogAnalyticsImportCustomContent
+	DisableNotFoundRetries bool
+}
+
+func (s *LogAnalyticsLogAnalyticsImportCustomContentResourceCrud) ID() string {
+	return GenerateDataSourceHashID("LogAnalyticsLogAnalyticsImportCustomContentResource-", LogAnalyticsLogAnalyticsImportCustomContentResource(), s.D)
+}
+
+func (s *LogAnalyticsLogAnalyticsImportCustomContentResourceCrud) Create() error {
+	request := oci_log_analytics.ImportCustomContentRequest{}
+
+	if importFile, ok := s.D.GetOkExists("import_custom_content_file"); ok {
+		tmp := importFile.(string)
+		contents, err := ioutil.ReadFile(tmp)
+		if err != nil {
+			return fmt.Errorf("the specified content file is not available: %q", err)
+		}
+		request.ImportCustomContentFileBody = ioutil.NopCloser(bytes.NewReader(contents))
+	}
+
+	if isOverwrite, ok := s.D.GetOkExists("is_overwrite"); ok {
+		tmp := isOverwrite.(bool)
+		request.IsOverwrite = &tmp
+	}
+
+	if namespace, ok := s.D.GetOkExists("namespace"); ok {
+		tmp := namespace.(string)
+		request.NamespaceName = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(s.DisableNotFoundRetries, "log_analytics")
+
+	response, err := s.Client.ImportCustomContent(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response.LogAnalyticsImportCustomContent
+	return nil
+}
+
+func (s *LogAnalyticsLogAnalyticsImportCustomContentResourceCrud) SetData() error {
+	if s.Res.ChangeList != nil {
+		s.D.Set("change_list", []interface{}{LogAnalyticsImportCustomChangeListToMap(s.Res.ChangeList)})
+	} else {
+		s.D.Set("change_list", nil)
+	}
+
+	if s.Res.ContentName != nil {
+		s.D.Set("content_name", *s.Res.ContentName)
+	}
+
+	s.D.Set("field_names", s.Res.FieldNames)
+
+	s.D.Set("parser_names", s.Res.ParserNames)
+
+	s.D.Set("source_names", s.Res.SourceNames)
+
+	return nil
+}
+
+func LogAnalyticsImportCustomChangeListToMap(obj *oci_log_analytics.LogAnalyticsImportCustomChangeList) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	result["conflict_field_display_names"] = obj.ConflictFieldDisplayNames
+
+	result["conflict_parser_names"] = obj.ConflictParserNames
+
+	result["conflict_source_names"] = obj.ConflictSourceNames
+
+	result["created_field_display_names"] = obj.CreatedFieldDisplayNames
+
+	result["created_parser_names"] = obj.CreatedParserNames
+
+	result["created_source_names"] = obj.CreatedSourceNames
+
+	result["updated_field_display_names"] = obj.UpdatedFieldDisplayNames
+
+	result["updated_parser_names"] = obj.UpdatedParserNames
+
+	result["updated_source_names"] = obj.UpdatedSourceNames
+
+	return result
+}

oci/log_analytics_log_analytics_import_custom_content_resource.go

@@ -0,0 +1,73 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+
+	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
+)
+
+const zipFile = "../examples/log_analytics/files/TFSource1.zip"
+
+var (
+	LogAnalyticsImportCustomContentRequiredOnlyResource = LogAnalyticsImportCustomContentResourceDependencies +
+		generateResourceFromRepresentationMap("oci_log_analytics_log_analytics_import_custom_content", "test_log_analytics_import_custom_content", Required, Create, logAnalyticsImportCustomContentRepresentation)
+
+	logAnalyticsImportCustomContentRepresentation = map[string]interface{}{
+		"import_custom_content_file": Representation{repType: Required, create: zipFile},
+		"namespace":                  Representation{repType: Required, create: `${data.oci_objectstorage_namespace.test_namespace.namespace}`},
+		"is_overwrite":               Representation{repType: Optional, create: `true`},
+	}
+
+	LogAnalyticsImportCustomContentResourceDependencies = "" +
+		generateDataSourceFromRepresentationMap("oci_objectstorage_namespace", "test_namespace", Required, Create, namespaceSingularDataSourceRepresentation)
+)
+
+// issue-routing-tag: log_analytics/default
+func TestLogAnalyticsLogAnalyticsImportCustomContentResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestLogAnalyticsLogAnalyticsImportCustomContentResource_basic")
+	defer httpreplay.SaveScenario()
+
+	config := testProviderConfig()
+
+	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	resourceName := "oci_log_analytics_log_analytics_import_custom_content.test_log_analytics_import_custom_content"
+
+	// Save TF content to create resource with optional properties. This has to be exactly the same as the config part in the "create with optionals" step in the test.
+	saveConfigContent(config+compartmentIdVariableStr+LogAnalyticsImportCustomContentResourceDependencies+
+		generateResourceFromRepresentationMap("oci_log_analytics_log_analytics_import_custom_content", "test_log_analytics_import_custom_content", Optional, Create, logAnalyticsImportCustomContentRepresentation), "loganalytics", "logAnalyticsImportCustomContent", t)
+
+	ResourceTest(t, nil, []resource.TestStep{
+		// verify create
+		{
+			Config: config + compartmentIdVariableStr + LogAnalyticsImportCustomContentResourceDependencies +
+				generateResourceFromRepresentationMap("oci_log_analytics_log_analytics_import_custom_content", "test_log_analytics_import_custom_content", Required, Create, logAnalyticsImportCustomContentRepresentation),
+			Check: ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "import_custom_content_file", zipFile),
+				resource.TestCheckResourceAttrSet(resourceName, "namespace"),
+			),
+		},
+
+		// delete before next create
+		{
+			Config: config + compartmentIdVariableStr + LogAnalyticsImportCustomContentResourceDependencies,
+		},
+		// verify create with optionals
+		{
+			Config: config + compartmentIdVariableStr + LogAnalyticsImportCustomContentResourceDependencies +
+				generateResourceFromRepresentationMap("oci_log_analytics_log_analytics_import_custom_content", "test_log_analytics_import_custom_content", Optional, Create, logAnalyticsImportCustomContentRepresentation),
+			Check: ComposeAggregateTestCheckFuncWrapper(
+				resource.TestCheckResourceAttr(resourceName, "import_custom_content_file", zipFile),
+				resource.TestCheckResourceAttr(resourceName, "is_overwrite", "true"),
+				resource.TestCheckResourceAttrSet(resourceName, "namespace"),
+			),
+		},
+	})
+}