Merge pull request ovh#366 from ovh/ldp_improvements_230124

fix(dbaas-logs): input tests

Author: scraly

ovh/data_dbaas_logs_input_engine_test.go

@@ -28,7 +28,8 @@ data "ovh_dbaas_logs_input_engine" "logstash" {
 func TestAccDataSourceDbaasLogsInputEngine_basic(t *testing.T) {
 	serviceName := os.Getenv("OVH_DBAAS_LOGS_SERVICE_TEST")
 	name := "LOGSTASH"
-	version := "7.x"
+	// version := "7.x"
+	version := os.Getenv("OVH_DBAAS_LOGS_LOGSTASH_VERSION_TEST")
 
 	config := fmt.Sprintf(
 		testAccDataSourceDbaasLogsInputEngine_basic,
@@ -38,7 +39,7 @@ func TestAccDataSourceDbaasLogsInputEngine_basic(t *testing.T) {
 	)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() { testAccPreCheckDbaasLogs(t) },
+		PreCheck: func() { testAccPreCheckDbaasLogsInput(t) },
 
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
@@ -53,7 +54,7 @@ func TestAccDataSourceDbaasLogsInputEngine_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"data.ovh_dbaas_logs_input_engine.logstash",
 						"version",
-						"7.x",
+						version,
 					),
 				),
 			},

ovh/provider_test.go

@@ -168,6 +168,12 @@ func testAccPreCheckDbaasLogs(t *testing.T) {
 	checkEnvOrSkip(t, "OVH_DBAAS_LOGS_SERVICE_TEST")
 }
 
+func testAccPreCheckDbaasLogsInput(t *testing.T) {
+	testAccPreCheckCredentials(t)
+	checkEnvOrSkip(t, "OVH_DBAAS_LOGS_SERVICE_TEST")
+	checkEnvOrSkip(t, "OVH_DBAAS_LOGS_LOGSTASH_VERSION_TEST")
+}
+
 // Checks that the environment variables needed for the /cloud acceptance tests
 // are set.
 func testAccPreCheckCloud(t *testing.T) {

ovh/resource_dbaas_logs_input_test.go

@@ -14,9 +14,10 @@ import (
 )
 
 const testAccResourceDbaasLogsInput_basic = `
-data "ovh_dbaas_logs_input_engine" "logstash" {
- name          = "logstash"
- version       = "7.x"
+data "ovh_dbaas_logs_input_engine" "logstash" {	
+	service_name  = "%s"
+	name          = "%s"
+	version       = "%s"
 }
 
 resource "ovh_dbaas_logs_output_graylog_stream" "stream" {
@@ -152,18 +153,23 @@ func testSweepDbaasInput(region string) error {
 
 func TestAccResourceDbaasLogsInput_basic(t *testing.T) {
 	serviceName := os.Getenv("OVH_DBAAS_LOGS_SERVICE_TEST")
+	name := "LOGSTASH"
+	version := os.Getenv("OVH_DBAAS_LOGS_LOGSTASH_VERSION_TEST")
 	title := acctest.RandomWithPrefix(test_prefix)
 	desc := acctest.RandomWithPrefix(test_prefix)
 
 	config := fmt.Sprintf(
 		testAccResourceDbaasLogsInput_basic,
 		serviceName,
+		name,
+		version,
+		serviceName,
 		title,
 		desc,
 	)
 
 	resource.Test(t, resource.TestCase{
-		PreCheck: func() { testAccPreCheckDbaasLogs(t) },
+		PreCheck: func() { testAccPreCheckDbaasLogsInput(t) },
 
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{

website/docs/index.html.markdown

@@ -163,6 +163,8 @@ variables must also be set:
 
 * `OVH_DBAAS_LOGS_SERVICE_TEST` - The name of your Dbaas logs service.
 
+* `OVH_DBAAS_LOGS_LOGSTASH_VERSION_TEST` - The name of your Dbaas logs Logstash version.
+
 * `OVH_TESTACC_ORDER_VRACK` - set this variable to "yes" will order vracks.
 
 * `OVH_TESTACC_ORDER_CLOUDPROJECT` - set this variable to "yes" will order cloud projects.