Merge pull request #200 from hisume/fix-stanza-validation

mploski · web-flow · commit 2728d131ee25 · 2024-12-06T08:37:27.000+01:00
Update stanza validation in resource_splunk_configs_conf.go
diff --git a/splunk/resource_splunk_configs_conf.go b/splunk/resource_splunk_configs_conf.go
@@ -32,7 +32,7 @@ func configsConf() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validation.StringMatch(regexp.MustCompile(`^[a-zA-Z0-9_\-.]+/[a-zA-Z0-9_\-.]+`), "A '/' separated string consisting of {conf_file_name}/{stanza_name} ex. props/custom_stanza"),
+				ValidateFunc: validation.StringMatch(regexp.MustCompile(`^[a-zA-Z0-9_\-.]+/[a-zA-Z0-9_\-.:/]+`), "A '/' separated string consisting of {conf_file_name}/{stanza_name} ex. props/custom_stanza"),
 				Description:  `A '/' separated string consisting of {conf_file_name}/{stanza_name} ex. props/custom_stanza`,
 			},
 			"acl": aclSchema(),
diff --git a/splunk/resource_splunk_configs_conf_test.go b/splunk/resource_splunk_configs_conf_test.go
@@ -60,6 +60,59 @@ func TestAccCreateSplunkConfigsConf(t *testing.T) {
 	})
 }
 
+const newConfigsConfSpecialChars = `
+resource "splunk_configs_conf" "tftest-stanza-special-chars" {
+	name = "tf_test/sqs://tftest_stanza_special_chars"
+	variables = {
+        "disabled": "false"
+		"key": "value"
+	}
+}
+`
+
+const updateConfigsConfSpecialChars = `
+resource "splunk_configs_conf" "tftest-stanza-special-chars" {
+	name = "tf_test/sqs://tftest_stanza_special_chars"
+	variables = {
+        "disabled": "false"
+		"key": "new-value"
+	}
+}
+`
+
+func TestAccCreateSplunkConfigsConfSpecialChars(t *testing.T) {
+	resourceName := "splunk_configs_conf.tftest-stanza-special-chars"
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+		},
+		Providers:    testAccProviders,
+		CheckDestroy: testAccSplunkConfigsConfDestroyResources,
+		Steps: []resource.TestStep{
+			{
+				Config: newConfigsConfSpecialChars,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "variables.%", "2"),
+					resource.TestCheckResourceAttr(resourceName, "variables.key", "value"),
+				),
+			},
+			{
+				Config: updateConfigsConfSpecialChars,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(resourceName, "variables.%", "2"),
+					resource.TestCheckResourceAttr(resourceName, "variables.key", "new-value"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
+
 func testAccSplunkConfigsConfDestroyResources(s *terraform.State) error {
 	client, err := newTestClient()
 	if err != nil {
