Merge branch 'master' of github.com:SumoLogic/terraform-provider-sumologic into cse-rule-resource

Author: Josh Williams

.github/workflows/test.yml

@@ -14,7 +14,7 @@ on:
       - 'README.md'
       - 'CHANGELOG.md'
   # For systems with an upstream API that could drift unexpectedly (like most SaaS systems, etc.),
-  # we recommend testing at a regular interval not necessarily tied to code changes. This will 
+  # we recommend testing at a regular interval not necessarily tied to code changes. This will
   # ensure you are alerted to something breaking due to an API change, even if the code did not
   # change.
   schedule:
@@ -47,7 +47,7 @@ jobs:
     name: Matrix Test
     needs: build
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:
@@ -68,9 +68,9 @@ jobs:
     - name: Get dependencies
       run: |
         go mod download
-        
+
     - name: TF acceptance tests
-      timeout-minutes: 10
+      timeout-minutes: 15
       env:
         TF_ACC: "1"
         TF_ACC_TERRAFORM_VERSION: ${{ matrix.terraform }}

CHANGELOG.md

@@ -10,6 +10,8 @@ FEATURES:
 * **New Resource:** sumologic_cse_insights_resolution (GH-274)
 * **New Resource:** sumologic_cse_insights_status (GH-274)
 * **New Resource:** sumologic_cse_insights_configuration (GH-274)
+* **New Resource:** sumologic_cse_log_mapping (GH-284) 
+* **New Datasource:** sumologic_cse_log_mapping_vendor_product (GH-284)
 * **New Resource:** sumologic_cse_match_rule (GH-287)
 * **New Resource:** sumologic_cse_threshold_rule (GH-287)
 

sumologic/data_source_sumologic_cse_log_mapping_vendor_product.go

@@ -0,0 +1,53 @@
+package sumologic
+
+import (
+	"fmt"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+func dataSourceCSELogMappingVendorAndProduct() *schema.Resource {
+
+	return &schema.Resource{
+		Read: dataSourceCSELogMappingVendorAndProductRead,
+		Schema: map[string]*schema.Schema{
+			"guid": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"product": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"vendor": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+		},
+	}
+
+}
+
+func dataSourceCSELogMappingVendorAndProductRead(d *schema.ResourceData, meta interface{}) error {
+	c := meta.(*Client)
+
+	id := d.Id()
+
+	vendorAndProduct, err := c.GetCSELogMappingVendorsAndProducts(d.Get("product").(string), d.Get("vendor").(string))
+
+	if err != nil {
+		return err
+	}
+
+	if vendorAndProduct == nil {
+		d.SetId("")
+		return fmt.Errorf("Vendor product not found, removing from state: %v", id)
+	}
+
+	d.SetId(vendorAndProduct.GUID)
+	d.Set("guid", vendorAndProduct.GUID)
+	d.Set("product", vendorAndProduct.Product)
+	d.Set("vendor", vendorAndProduct.Vendor)
+
+	return nil
+}

sumologic/data_source_sumologic_cse_log_mapping_vendor_product_test.go

@@ -0,0 +1,39 @@
+package sumologic
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+)
+
+func TestAccDataSourceCSELogMappingVendorProduct_basic(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testDataSourceSumologicCSELogMappingVendorProduct,
+				Check: resource.ComposeTestCheckFunc(
+					testAccDataSourceSumologicCSELogMappingVendorProductCheck("data.sumologic_cse_log_mapping_vendor_product.web_gateway"),
+				),
+			},
+		},
+	})
+}
+
+func testAccDataSourceSumologicCSELogMappingVendorProductCheck(name string) resource.TestCheckFunc {
+	return resource.ComposeTestCheckFunc(
+		resource.TestCheckResourceAttrSet(name, "product"),
+		resource.TestCheckResourceAttr(name, "product", "Web Gateway"),
+		resource.TestCheckResourceAttrSet(name, "vendor"),
+		resource.TestCheckResourceAttr(name, "vendor", "McAfee"),
+		resource.TestCheckResourceAttrSet(name, "guid"),
+	)
+}
+
+var testDataSourceSumologicCSELogMappingVendorProduct = `
+data "sumologic_cse_log_mapping_vendor_product" "web_gateway" {
+  	product = "Web Gateway"
+	vendor = "McAfee"
+}
+`

sumologic/provider.go

@@ -43,6 +43,7 @@ func Provider() terraform.ResourceProvider {
 			},
 		},
 		ResourcesMap: map[string]*schema.Resource{
+			"sumologic_cse_log_mapping":                    resourceSumologicCSELogMapping(),
 			"sumologic_cse_rule_tuning_expression":         resourceSumologicCSERuleTuningExpression(),
 			"sumologic_cse_network_block":                  resourceSumologicCSENetworkBlock(),
 			"sumologic_cse_custom_entity_type":             resourceSumologicCSECustomEntityType(),
@@ -92,13 +93,14 @@ func Provider() terraform.ResourceProvider {
 			"sumologic_hierarchy":                          resourceSumologicHierarchy(),
 		},
 		DataSourcesMap: map[string]*schema.Resource{
-			"sumologic_admin_recommended_folder": dataSourceSumologicAdminRecommendedFolder(),
-			"sumologic_caller_identity":          dataSourceSumologicCallerIdentity(),
-			"sumologic_collector":                dataSourceSumologicCollector(),
-			"sumologic_http_source":              dataSourceSumologicHTTPSource(),
-			"sumologic_personal_folder":          dataSourceSumologicPersonalFolder(),
-			"sumologic_my_user_id":               dataSourceSumologicMyUserId(),
-			"sumologic_role":                     dataSourceSumologicRole(),
+			"sumologic_cse_log_mapping_vendor_product": dataSourceCSELogMappingVendorAndProduct(),
+			"sumologic_admin_recommended_folder":       dataSourceSumologicAdminRecommendedFolder(),
+			"sumologic_caller_identity":                dataSourceSumologicCallerIdentity(),
+			"sumologic_collector":                      dataSourceSumologicCollector(),
+			"sumologic_http_source":                    dataSourceSumologicHTTPSource(),
+			"sumologic_personal_folder":                dataSourceSumologicPersonalFolder(),
+			"sumologic_my_user_id":                     dataSourceSumologicMyUserId(),
+			"sumologic_role":                           dataSourceSumologicRole(),
 		},
 		ConfigureFunc: providerConfigure,
 	}