Add azurerm_data_factory_trigger_tumbling_window resource

azurerm/helpers/validate/datafactory.go

@@ -28,3 +28,14 @@ func DataFactoryName() schema.SchemaValidateFunc {
 		return warnings, errors
 	}
 }
+
+func TriggerDelayTimespan() schema.SchemaValidateFunc {
+	return func(i interface{}, k string) (warnings []string, errors []error) {
+		value := i.(string)
+		if !regexp.MustCompile(`^\-?((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9]))`).MatchString(value) {
+			errors = append(errors, fmt.Errorf("invalid timespan, must be of format hh:mm:ss %q: %q", k, value))
+		}
+
+		return warnings, errors
+	}
+}

azurerm/internal/services/datafactory/data_factory_trigger_schedule_resource_test.go

@@ -2,15 +2,11 @@ package datafactory_test
 
 import (
 	"fmt"
-	"net/http"
 	"testing"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
-	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
 func TestAccAzureRMDataFactoryTriggerSchedule_basic(t *testing.T) {
@@ -19,12 +15,12 @@ func TestAccAzureRMDataFactoryTriggerSchedule_basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { acceptance.PreCheck(t) },
 		Providers:    acceptance.SupportedProviders,
-		CheckDestroy: testCheckAzureRMDataFactoryTriggerScheduleDestroy,
+		CheckDestroy: testCheckAzureRMDataFactoryTriggerDestroy("azurerm_data_factory_trigger_schedule"),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAzureRMDataFactoryTriggerSchedule_basic(data),
 				Check: resource.ComposeTestCheckFunc(
-					testCheckAzureRMDataFactoryTriggerScheduleExists(data.ResourceName),
+					testCheckAzureRMDataFactoryTriggerExists(data.ResourceName),
 				),
 			},
 			data.ImportStep(),
@@ -40,84 +36,26 @@ func TestAccAzureRMDataFactoryTriggerSchedule_complete(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { acceptance.PreCheck(t) },
 		Providers:    acceptance.SupportedProviders,
-		CheckDestroy: testCheckAzureRMDataFactoryTriggerScheduleDestroy,
+		CheckDestroy: testCheckAzureRMDataFactoryTriggerDestroy("azurerm_data_factory_trigger_schedule"),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccAzureRMDataFactoryTriggerSchedule_basic(data),
 				Check: resource.ComposeTestCheckFunc(
-					testCheckAzureRMDataFactoryTriggerScheduleExists(data.ResourceName),
+					testCheckAzureRMDataFactoryTriggerExists(data.ResourceName),
 				),
 			},
 			data.ImportStep(),
 			{
 				Config: testAccAzureRMDataFactoryTriggerSchedule_update(data, endTime),
 				Check: resource.ComposeTestCheckFunc(
-					testCheckAzureRMDataFactoryTriggerScheduleExists(data.ResourceName),
+					testCheckAzureRMDataFactoryTriggerExists(data.ResourceName),
 				),
 			},
 			data.ImportStep(),
 		},
 	})
 }
 
-func testCheckAzureRMDataFactoryTriggerScheduleExists(name string) resource.TestCheckFunc {
-	return func(s *terraform.State) error {
-		client := acceptance.AzureProvider.Meta().(*clients.Client).DataFactory.TriggersClient
-		ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
-
-		// Ensure we have enough information in state to look up in API
-		rs, ok := s.RootModule().Resources[name]
-		if !ok {
-			return fmt.Errorf("Not found: %s", name)
-		}
-
-		name := rs.Primary.Attributes["name"]
-		resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"]
-		dataFactoryName := rs.Primary.Attributes["data_factory_name"]
-		if !hasResourceGroup {
-			return fmt.Errorf("Bad: no resource group found in state for Data Factory: %s", name)
-		}
-
-		resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "")
-		if err != nil {
-			return fmt.Errorf("Bad: Get on dataFactory.TriggersClient: %+v", err)
-		}
-
-		if utils.ResponseWasNotFound(resp.Response) {
-			return fmt.Errorf("Bad: Data Factory Trigger Schdule %q (data factory name: %q / resource group: %q) does not exist", name, dataFactoryName, resourceGroup)
-		}
-
-		return nil
-	}
-}
-
-func testCheckAzureRMDataFactoryTriggerScheduleDestroy(s *terraform.State) error {
-	client := acceptance.AzureProvider.Meta().(*clients.Client).DataFactory.TriggersClient
-	ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
-
-	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "azurerm_data_factory_trigger_schedule" {
-			continue
-		}
-
-		name := rs.Primary.Attributes["name"]
-		resourceGroup := rs.Primary.Attributes["resource_group_name"]
-		dataFactoryName := rs.Primary.Attributes["data_factory_name"]
-
-		resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "")
-
-		if err != nil {
-			return nil
-		}
-
-		if resp.StatusCode != http.StatusNotFound {
-			return fmt.Errorf("Data Factory Trigger Schedule still exists:\n%#v", resp.Properties)
-		}
-	}
-
-	return nil
-}
-
 func testAccAzureRMDataFactoryTriggerSchedule_basic(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azurerm" {

azurerm/internal/services/datafactory/data_factory_trigger_test.go

@@ -0,0 +1,125 @@
+package datafactory_test
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
+)
+
+func findTriggerByName(name string, s *terraform.State) (*string, *string, *string, error) {
+	// Ensure we have enough information in state to look up in API
+	rs, ok := s.RootModule().Resources[name]
+	if !ok {
+		return nil, nil, nil, fmt.Errorf("Not found: %s", name)
+	}
+
+	triggerName := rs.Primary.Attributes["name"]
+	resourceGroup, hasResourceGroup := rs.Primary.Attributes["resource_group_name"]
+	dataFactoryName := rs.Primary.Attributes["data_factory_name"]
+	if !hasResourceGroup {
+		return nil, nil, nil, fmt.Errorf("Bad: no resource group found in state for Data Factory: %s", name)
+	}
+
+	return &triggerName, &dataFactoryName, &resourceGroup, nil
+}
+
+func testCheckAzureRMDataFactoryTriggerStarts(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		client := acceptance.AzureProvider.Meta().(*clients.Client).DataFactory.TriggersClient
+		ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
+
+		name, dataFactoryName, resourceGroup, err := findTriggerByName(name, s)
+		if err != nil {
+			return err
+		}
+
+		future, err := client.Start(ctx, *resourceGroup, *dataFactoryName, *name)
+		if err != nil {
+			return err
+		}
+		if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
+			return err
+		}
+
+		return nil
+	}
+}
+
+func testCheckAzureRMDataFactoryTriggerStops(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		client := acceptance.AzureProvider.Meta().(*clients.Client).DataFactory.TriggersClient
+		ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
+
+		name, dataFactoryName, resourceGroup, err := findTriggerByName(name, s)
+		if err != nil {
+			return err
+		}
+
+		future, err := client.Stop(ctx, *resourceGroup, *dataFactoryName, *name)
+		if err != nil {
+			return err
+		}
+		if err = future.WaitForCompletionRef(ctx, client.Client); err != nil {
+			return err
+		}
+
+		return nil
+	}
+}
+
+func testCheckAzureRMDataFactoryTriggerExists(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		client := acceptance.AzureProvider.Meta().(*clients.Client).DataFactory.TriggersClient
+		ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
+
+		name, dataFactoryName, resourceGroup, err := findTriggerByName(name, s)
+		if err != nil {
+			return err
+		}
+
+		resp, err := client.Get(ctx, *resourceGroup, *dataFactoryName, *name, "")
+		if err != nil {
+			return fmt.Errorf("Bad: Get on dataFactory.TriggersClient: %+v", err)
+		}
+
+		if utils.ResponseWasNotFound(resp.Response) {
+			return fmt.Errorf("Bad: Data Factory Trigger %q (data factory name: %q / resource group: %q) does not exist", *name, *dataFactoryName, *resourceGroup)
+		}
+
+		return nil
+	}
+}
+
+func testCheckAzureRMDataFactoryTriggerDestroy(resource_type string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		client := acceptance.AzureProvider.Meta().(*clients.Client).DataFactory.TriggersClient
+		ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext
+
+		for _, rs := range s.RootModule().Resources {
+			if rs.Type != resource_type {
+				continue
+			}
+
+			name := rs.Primary.Attributes["name"]
+			resourceGroup := rs.Primary.Attributes["resource_group_name"]
+			dataFactoryName := rs.Primary.Attributes["data_factory_name"]
+
+			resp, err := client.Get(ctx, resourceGroup, dataFactoryName, name, "")
+
+			if err != nil {
+				return nil
+			}
+
+			if resp.StatusCode != http.StatusNotFound {
+				return fmt.Errorf("Data Factory Trigger still exists:\n%#v", resp.Properties)
+			}
+		}
+
+		return nil
+	}
+}