From 9227ae9bd55c02f4615214185de51ef758163963 Mon Sep 17 00:00:00 2001 From: ziyeqf Date: Tue, 11 Oct 2022 14:14:24 +0800 Subject: [PATCH 1/5] `azurerm_data_factory_integration_runtime_azure_ssis` - support elastic pool --- ...integration_runtime_azure_ssis_resource.go | 35 ++++++++- ...ration_runtime_azure_ssis_resource_test.go | 77 +++++++++++++++++++ ...tegration_runtime_azure_ssis.html.markdown | 4 +- 3 files changed, 112 insertions(+), 4 deletions(-) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go index 78aa78d2a01b..829cde5b87ec 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go @@ -2,7 +2,9 @@ package datafactory import ( "fmt" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/datafactory/validate" "regexp" + "strings" "time" "github.com/Azure/azure-sdk-for-go/services/datafactory/mgmt/2018-06-01/datafactory" @@ -10,7 +12,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/services/datafactory/parse" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/datafactory/validate" + sqlValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/mssql/validate" networkValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/network/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/validation" @@ -230,6 +232,11 @@ func resourceDataFactoryIntegrationRuntimeAzureSsis() *pluginsdk.Resource { "HS_Gen5_2", "HS_Gen5_4", "HS_Gen5_6", "HS_Gen5_8", "HS_Gen5_10", "HS_Gen5_12", "HS_Gen5_14", "HS_Gen5_16", "HS_Gen5_18", "HS_Gen5_20", "HS_Gen5_24", "HS_Gen5_32", "HS_Gen5_40", "HS_Gen5_80", }, false), }, + "elastic_pool_name": { + Type: pluginsdk.TypeString, + Optional: true, + ValidateFunc: sqlValidate.ValidateMsSqlElasticPoolName, + }, "dual_standby_pair_name": { Type: pluginsdk.TypeString, Optional: true, @@ -638,9 +645,16 @@ func expandDataFactoryIntegrationRuntimeAzureSsisProperties(d *pluginsdk.Resourc if catalogInfos, ok := d.GetOk("catalog_info"); ok && len(catalogInfos.([]interface{})) > 0 { catalogInfo := catalogInfos.([]interface{})[0].(map[string]interface{}) + var pricingTier datafactory.IntegrationRuntimeSsisCatalogPricingTier + if elasticPoolName := catalogInfo["elastic_pool_name"]; elasticPoolName != nil && elasticPoolName.(string) != "" { + pricingTier = datafactory.IntegrationRuntimeSsisCatalogPricingTier(expandDataFactoryIntegrationRuntimeElasticPool(elasticPoolName.(string))) + } else { + pricingTier = datafactory.IntegrationRuntimeSsisCatalogPricingTier(catalogInfo["pricing_tier"].(string)) + } + ssisProperties.CatalogInfo = &datafactory.IntegrationRuntimeSsisCatalogInfo{ CatalogServerEndpoint: utils.String(catalogInfo["server_endpoint"].(string)), - CatalogPricingTier: datafactory.IntegrationRuntimeSsisCatalogPricingTier(catalogInfo["pricing_tier"].(string)), + CatalogPricingTier: pricingTier, } if adminUserName := catalogInfo["administrator_login"]; adminUserName.(string) != "" { @@ -869,6 +883,16 @@ func flattenDataFactoryIntegrationRuntimeAzureSsisCatalogInfo(ssisProperties *da dualStandbyPairName = *ssisProperties.DualStandbyPairName } + var pricingTier, elasticPoolName string + if strings.HasPrefix(string(ssisProperties.CatalogPricingTier), "ELASTIC_POOL") { + re, _ := regexp.Compile(`(?:name=\")([^&%\\\/?]{0,127}[^\s.&%\\\/?])(?:\")`) + if result := re.FindStringSubmatch(string(ssisProperties.CatalogPricingTier)); len(result) > 1 { + elasticPoolName = result[1] + } + } else { + pricingTier = string(ssisProperties.CatalogPricingTier) + } + // read back if adminPassword, ok := d.GetOk("catalog_info.0.administrator_password"); ok { administratorPassword = adminPassword.(string) @@ -877,7 +901,8 @@ func flattenDataFactoryIntegrationRuntimeAzureSsisCatalogInfo(ssisProperties *da return []interface{}{ map[string]interface{}{ "server_endpoint": serverEndpoint, - "pricing_tier": string(ssisProperties.CatalogPricingTier), + "pricing_tier": pricingTier, + "elastic_pool_name": elasticPoolName, "administrator_login": catalogAdminUserName, "administrator_password": administratorPassword, "dual_standby_pair_name": dualStandbyPairName, @@ -1111,3 +1136,7 @@ func readBackSensitiveValue(input []interface{}, propertyName string, filters ma } return "" } + +func expandDataFactoryIntegrationRuntimeElasticPool(input string) string { + return fmt.Sprintf(`ELASTIC_POOL(name="%s")`, input) +} diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go index a5b0b13b513b..287068099128 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource_test.go @@ -162,6 +162,21 @@ func TestAccDataFactoryIntegrationRuntimeManagedSsis_expressVnetInjection(t *tes }) } +func TestAccDataFactoryIntegrationRuntimeManagedSsis_withElasticPool(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_data_factory_integration_runtime_azure_ssis", "test") + r := IntegrationRuntimeManagedSsisResource{} + + data.ResourceTest(t, r, []acceptance.TestStep{ + { + Config: r.withElasticPool(data), + Check: acceptance.ComposeTestCheckFunc( + check.That(data.ResourceName).ExistsInAzure(r), + ), + }, + data.ImportStep("catalog_info.0.administrator_password"), + }) +} + func (IntegrationRuntimeManagedSsisResource) basic(data acceptance.TestData) string { return fmt.Sprintf(` provider "azurerm" { @@ -766,6 +781,68 @@ resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { `, data.RandomInteger, data.Locations.Primary) } +func (IntegrationRuntimeManagedSsisResource) withElasticPool(data acceptance.TestData) string { + return fmt.Sprintf(` +provider "azurerm" { + features {} +} + +resource "azurerm_resource_group" "test" { + name = "acctestRG-%[1]d" + location = "%[2]s" +} + +resource "azurerm_mssql_server" "test" { + name = "acctest%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + version = "12.0" + administrator_login = "4dm1n157r470r" + administrator_login_password = "4-v3ry-53cr37-p455w0rd" +} + +resource "azurerm_mssql_elasticpool" "test" { + name = "acctest-ssis-%[1]d" + resource_group_name = azurerm_resource_group.test.name + location = azurerm_resource_group.test.location + server_name = azurerm_mssql_server.test.name + max_size_gb = 4.8828125 + + sku { + name = "BasicPool" + tier = "Basic" + capacity = 50 + } + + per_database_settings { + min_capacity = 0 + max_capacity = 5 + } +} + +resource "azurerm_data_factory" "test" { + name = "acctestdfirm%[1]d" + location = "${azurerm_resource_group.test.location}" + resource_group_name = "${azurerm_resource_group.test.name}" +} + +resource "azurerm_data_factory_integration_runtime_azure_ssis" "test" { + name = "managed-integration-runtime" + data_factory_id = azurerm_data_factory.test.id + location = azurerm_resource_group.test.location + node_size = "Standard_D8_v3" + + catalog_info { + server_endpoint = "${azurerm_mssql_server.test.fully_qualified_domain_name}" + administrator_login = "ssis_catalog_admin" + administrator_password = "my-s3cret-p4ssword!" + elastic_pool_name = "${azurerm_mssql_elasticpool.test.name}" + dual_standby_pair_name = "dual_name" + } +} +`, data.RandomInteger, data.Locations.Primary, data.RandomString) +} + func (t IntegrationRuntimeManagedSsisResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.IntegrationRuntimeID(state.ID) if err != nil { diff --git a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown index 0c49f999b2c8..f1ff7b499f2d 100644 --- a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown +++ b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown @@ -79,7 +79,9 @@ A `catalog_info` block supports the following: * `administrator_password` - (Optional) Administrator login password for the SQL Server. -* `pricing_tier` - (Optional) Pricing tier for the database that will be created for the SSIS catalog. Valid values are: `Basic`, `S0`, `S1`, `S2`, `S3`, `S4`, `S6`, `S7`, `S9`, `S12`, `P1`, `P2`, `P4`, `P6`, `P11`, `P15`, `GP_S_Gen5_1`, `GP_S_Gen5_2`, `GP_S_Gen5_4`, `GP_S_Gen5_6`, `GP_S_Gen5_8`, `GP_S_Gen5_10`, `GP_S_Gen5_12`, `GP_S_Gen5_14`, `GP_S_Gen5_16`, `GP_S_Gen5_18`, `GP_S_Gen5_20`, `GP_S_Gen5_24`, `GP_S_Gen5_32`, `GP_S_Gen5_40`, `GP_Gen5_2`, `GP_Gen5_4`, `GP_Gen5_6`, `GP_Gen5_8`, `GP_Gen5_10`, `GP_Gen5_12`, `GP_Gen5_14`, `GP_Gen5_16`, `GP_Gen5_18`, `GP_Gen5_20`, `GP_Gen5_24`, `GP_Gen5_32`, `GP_Gen5_40`, `GP_Gen5_80`, `BC_Gen5_2`, `BC_Gen5_4`, `BC_Gen5_6`, `BC_Gen5_8`, `BC_Gen5_10`, `BC_Gen5_12`, `BC_Gen5_14`, `BC_Gen5_16`, `BC_Gen5_18`, `BC_Gen5_20`, `BC_Gen5_24`, `BC_Gen5_32`, `BC_Gen5_40`, `BC_Gen5_80`, `HS_Gen5_2`, `HS_Gen5_4`, `HS_Gen5_6`, `HS_Gen5_8`, `HS_Gen5_10`, `HS_Gen5_12`, `HS_Gen5_14`, `HS_Gen5_16`, `HS_Gen5_18`, `HS_Gen5_20`, `HS_Gen5_24`, `HS_Gen5_32`, `HS_Gen5_40` and `HS_Gen5_80`. +* `pricing_tier` - (Optional) Pricing tier for the database that will be created for the SSIS catalog. Valid values are: `Basic`, `S0`, `S1`, `S2`, `S3`, `S4`, `S6`, `S7`, `S9`, `S12`, `P1`, `P2`, `P4`, `P6`, `P11`, `P15`, `GP_S_Gen5_1`, `GP_S_Gen5_2`, `GP_S_Gen5_4`, `GP_S_Gen5_6`, `GP_S_Gen5_8`, `GP_S_Gen5_10`, `GP_S_Gen5_12`, `GP_S_Gen5_14`, `GP_S_Gen5_16`, `GP_S_Gen5_18`, `GP_S_Gen5_20`, `GP_S_Gen5_24`, `GP_S_Gen5_32`, `GP_S_Gen5_40`, `GP_Gen5_2`, `GP_Gen5_4`, `GP_Gen5_6`, `GP_Gen5_8`, `GP_Gen5_10`, `GP_Gen5_12`, `GP_Gen5_14`, `GP_Gen5_16`, `GP_Gen5_18`, `GP_Gen5_20`, `GP_Gen5_24`, `GP_Gen5_32`, `GP_Gen5_40`, `GP_Gen5_80`, `BC_Gen5_2`, `BC_Gen5_4`, `BC_Gen5_6`, `BC_Gen5_8`, `BC_Gen5_10`, `BC_Gen5_12`, `BC_Gen5_14`, `BC_Gen5_16`, `BC_Gen5_18`, `BC_Gen5_20`, `BC_Gen5_24`, `BC_Gen5_32`, `BC_Gen5_40`, `BC_Gen5_80`, `HS_Gen5_2`, `HS_Gen5_4`, `HS_Gen5_6`, `HS_Gen5_8`, `HS_Gen5_10`, `HS_Gen5_12`, `HS_Gen5_14`, `HS_Gen5_16`, `HS_Gen5_18`, `HS_Gen5_20`, `HS_Gen5_24`, `HS_Gen5_32`, `HS_Gen5_40` and `HS_Gen5_80`. (Mutually exclusive with `elastic_pool_name`.) + +* `elastic_pool_name` - (Optional) the name of SQL elastic pool where the database will be created for the SSIS catalog. (Mutually exclusive with `pricing_tier`.) * `dual_standby_pair_name` - (Optional) The dual standby Azure-SSIS Integration Runtime pair with SSISDB failover. From 2019ddb5f7b0ca9b07909c695c00754ed93ab31b Mon Sep 17 00:00:00 2001 From: ziyeqf Date: Tue, 11 Oct 2022 15:23:41 +0800 Subject: [PATCH 2/5] golint --- .../data_factory_integration_runtime_azure_ssis_resource.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go index 829cde5b87ec..7bf49d90fd07 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go @@ -885,8 +885,7 @@ func flattenDataFactoryIntegrationRuntimeAzureSsisCatalogInfo(ssisProperties *da var pricingTier, elasticPoolName string if strings.HasPrefix(string(ssisProperties.CatalogPricingTier), "ELASTIC_POOL") { - re, _ := regexp.Compile(`(?:name=\")([^&%\\\/?]{0,127}[^\s.&%\\\/?])(?:\")`) - if result := re.FindStringSubmatch(string(ssisProperties.CatalogPricingTier)); len(result) > 1 { + if result := regexp.MustCompile(`(?:name=\")([^&%\\\/?]{0,127}[^\s.&%\\\/?])(?:\")`).FindStringSubmatch(string(ssisProperties.CatalogPricingTier)); len(result) > 1 { elasticPoolName = result[1] } } else { From 334f407cf0a0bac7ccea9cf20ef168051b1d3dc3 Mon Sep 17 00:00:00 2001 From: ziyeqf Date: Tue, 11 Oct 2022 15:43:50 +0800 Subject: [PATCH 3/5] import lint --- .../data_factory_integration_runtime_azure_ssis_resource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go index 7bf49d90fd07..d756cff248a5 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go @@ -2,7 +2,6 @@ package datafactory import ( "fmt" - "github.com/hashicorp/terraform-provider-azurerm/internal/services/datafactory/validate" "regexp" "strings" "time" @@ -12,6 +11,7 @@ import ( "github.com/hashicorp/terraform-provider-azurerm/helpers/tf" "github.com/hashicorp/terraform-provider-azurerm/internal/clients" "github.com/hashicorp/terraform-provider-azurerm/internal/services/datafactory/parse" + "github.com/hashicorp/terraform-provider-azurerm/internal/services/datafactory/validate" sqlValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/mssql/validate" networkValidate "github.com/hashicorp/terraform-provider-azurerm/internal/services/network/validate" "github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk" From c809666f565dadcb9cb139c8f070a707b778b678 Mon Sep 17 00:00:00 2001 From: ziyeqf Date: Tue, 11 Oct 2022 17:26:00 +0800 Subject: [PATCH 4/5] refactor & clean code --- ...integration_runtime_azure_ssis_resource.go | 29 ++++++++++++------- ...tegration_runtime_azure_ssis.html.markdown | 4 +-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go index d756cff248a5..e67d8bf89eae 100644 --- a/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go +++ b/internal/services/datafactory/data_factory_integration_runtime_azure_ssis_resource.go @@ -3,7 +3,6 @@ package datafactory import ( "fmt" "regexp" - "strings" "time" "github.com/Azure/azure-sdk-for-go/services/datafactory/mgmt/2018-06-01/datafactory" @@ -231,11 +230,13 @@ func resourceDataFactoryIntegrationRuntimeAzureSsis() *pluginsdk.Resource { "BC_Gen5_2", "BC_Gen5_4", "BC_Gen5_6", "BC_Gen5_8", "BC_Gen5_10", "BC_Gen5_12", "BC_Gen5_14", "BC_Gen5_16", "BC_Gen5_18", "BC_Gen5_20", "BC_Gen5_24", "BC_Gen5_32", "BC_Gen5_40", "BC_Gen5_80", "HS_Gen5_2", "HS_Gen5_4", "HS_Gen5_6", "HS_Gen5_8", "HS_Gen5_10", "HS_Gen5_12", "HS_Gen5_14", "HS_Gen5_16", "HS_Gen5_18", "HS_Gen5_20", "HS_Gen5_24", "HS_Gen5_32", "HS_Gen5_40", "HS_Gen5_80", }, false), + ConflictsWith: []string{"catalog_info.0.elastic_pool_name"}, }, "elastic_pool_name": { - Type: pluginsdk.TypeString, - Optional: true, - ValidateFunc: sqlValidate.ValidateMsSqlElasticPoolName, + Type: pluginsdk.TypeString, + Optional: true, + ValidateFunc: sqlValidate.ValidateMsSqlElasticPoolName, + ConflictsWith: []string{"catalog_info.0.pricing_tier"}, }, "dual_standby_pair_name": { Type: pluginsdk.TypeString, @@ -645,9 +646,10 @@ func expandDataFactoryIntegrationRuntimeAzureSsisProperties(d *pluginsdk.Resourc if catalogInfos, ok := d.GetOk("catalog_info"); ok && len(catalogInfos.([]interface{})) > 0 { catalogInfo := catalogInfos.([]interface{})[0].(map[string]interface{}) + // the property `elastic_pool_name` and `pricing_tier` share the same prop `CatalogPricingTier` in request and response. var pricingTier datafactory.IntegrationRuntimeSsisCatalogPricingTier if elasticPoolName := catalogInfo["elastic_pool_name"]; elasticPoolName != nil && elasticPoolName.(string) != "" { - pricingTier = datafactory.IntegrationRuntimeSsisCatalogPricingTier(expandDataFactoryIntegrationRuntimeElasticPool(elasticPoolName.(string))) + pricingTier = datafactory.IntegrationRuntimeSsisCatalogPricingTier(formatDataFactoryIntegrationRuntimeElasticPool(elasticPoolName.(string))) } else { pricingTier = datafactory.IntegrationRuntimeSsisCatalogPricingTier(catalogInfo["pricing_tier"].(string)) } @@ -884,11 +886,8 @@ func flattenDataFactoryIntegrationRuntimeAzureSsisCatalogInfo(ssisProperties *da } var pricingTier, elasticPoolName string - if strings.HasPrefix(string(ssisProperties.CatalogPricingTier), "ELASTIC_POOL") { - if result := regexp.MustCompile(`(?:name=\")([^&%\\\/?]{0,127}[^\s.&%\\\/?])(?:\")`).FindStringSubmatch(string(ssisProperties.CatalogPricingTier)); len(result) > 1 { - elasticPoolName = result[1] - } - } else { + elasticPoolName, elasticPoolNameMatched := parseDataFactoryIntegrationRuntimeElasticPool(string(ssisProperties.CatalogPricingTier)) + if !elasticPoolNameMatched { pricingTier = string(ssisProperties.CatalogPricingTier) } @@ -1136,6 +1135,14 @@ func readBackSensitiveValue(input []interface{}, propertyName string, filters ma return "" } -func expandDataFactoryIntegrationRuntimeElasticPool(input string) string { +func formatDataFactoryIntegrationRuntimeElasticPool(input string) string { return fmt.Sprintf(`ELASTIC_POOL(name="%s")`, input) } + +func parseDataFactoryIntegrationRuntimeElasticPool(input string) (string, bool) { + matches := regexp.MustCompile(`^ELASTIC_POOL\(name="(.+)"\)$`).FindStringSubmatch(input) + if len(matches) != 2 { + return "", false + } + return matches[1], true +} diff --git a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown index f1ff7b499f2d..cc4f427ef5e2 100644 --- a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown +++ b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown @@ -79,9 +79,9 @@ A `catalog_info` block supports the following: * `administrator_password` - (Optional) Administrator login password for the SQL Server. -* `pricing_tier` - (Optional) Pricing tier for the database that will be created for the SSIS catalog. Valid values are: `Basic`, `S0`, `S1`, `S2`, `S3`, `S4`, `S6`, `S7`, `S9`, `S12`, `P1`, `P2`, `P4`, `P6`, `P11`, `P15`, `GP_S_Gen5_1`, `GP_S_Gen5_2`, `GP_S_Gen5_4`, `GP_S_Gen5_6`, `GP_S_Gen5_8`, `GP_S_Gen5_10`, `GP_S_Gen5_12`, `GP_S_Gen5_14`, `GP_S_Gen5_16`, `GP_S_Gen5_18`, `GP_S_Gen5_20`, `GP_S_Gen5_24`, `GP_S_Gen5_32`, `GP_S_Gen5_40`, `GP_Gen5_2`, `GP_Gen5_4`, `GP_Gen5_6`, `GP_Gen5_8`, `GP_Gen5_10`, `GP_Gen5_12`, `GP_Gen5_14`, `GP_Gen5_16`, `GP_Gen5_18`, `GP_Gen5_20`, `GP_Gen5_24`, `GP_Gen5_32`, `GP_Gen5_40`, `GP_Gen5_80`, `BC_Gen5_2`, `BC_Gen5_4`, `BC_Gen5_6`, `BC_Gen5_8`, `BC_Gen5_10`, `BC_Gen5_12`, `BC_Gen5_14`, `BC_Gen5_16`, `BC_Gen5_18`, `BC_Gen5_20`, `BC_Gen5_24`, `BC_Gen5_32`, `BC_Gen5_40`, `BC_Gen5_80`, `HS_Gen5_2`, `HS_Gen5_4`, `HS_Gen5_6`, `HS_Gen5_8`, `HS_Gen5_10`, `HS_Gen5_12`, `HS_Gen5_14`, `HS_Gen5_16`, `HS_Gen5_18`, `HS_Gen5_20`, `HS_Gen5_24`, `HS_Gen5_32`, `HS_Gen5_40` and `HS_Gen5_80`. (Mutually exclusive with `elastic_pool_name`.) +* `pricing_tier` - (Optional) Pricing tier for the database that will be created for the SSIS catalog. Valid values are: `Basic`, `S0`, `S1`, `S2`, `S3`, `S4`, `S6`, `S7`, `S9`, `S12`, `P1`, `P2`, `P4`, `P6`, `P11`, `P15`, `GP_S_Gen5_1`, `GP_S_Gen5_2`, `GP_S_Gen5_4`, `GP_S_Gen5_6`, `GP_S_Gen5_8`, `GP_S_Gen5_10`, `GP_S_Gen5_12`, `GP_S_Gen5_14`, `GP_S_Gen5_16`, `GP_S_Gen5_18`, `GP_S_Gen5_20`, `GP_S_Gen5_24`, `GP_S_Gen5_32`, `GP_S_Gen5_40`, `GP_Gen5_2`, `GP_Gen5_4`, `GP_Gen5_6`, `GP_Gen5_8`, `GP_Gen5_10`, `GP_Gen5_12`, `GP_Gen5_14`, `GP_Gen5_16`, `GP_Gen5_18`, `GP_Gen5_20`, `GP_Gen5_24`, `GP_Gen5_32`, `GP_Gen5_40`, `GP_Gen5_80`, `BC_Gen5_2`, `BC_Gen5_4`, `BC_Gen5_6`, `BC_Gen5_8`, `BC_Gen5_10`, `BC_Gen5_12`, `BC_Gen5_14`, `BC_Gen5_16`, `BC_Gen5_18`, `BC_Gen5_20`, `BC_Gen5_24`, `BC_Gen5_32`, `BC_Gen5_40`, `BC_Gen5_80`, `HS_Gen5_2`, `HS_Gen5_4`, `HS_Gen5_6`, `HS_Gen5_8`, `HS_Gen5_10`, `HS_Gen5_12`, `HS_Gen5_14`, `HS_Gen5_16`, `HS_Gen5_18`, `HS_Gen5_20`, `HS_Gen5_24`, `HS_Gen5_32`, `HS_Gen5_40` and `HS_Gen5_80`. Mutually exclusive with `elastic_pool_name`. -* `elastic_pool_name` - (Optional) the name of SQL elastic pool where the database will be created for the SSIS catalog. (Mutually exclusive with `pricing_tier`.) +* `elastic_pool_name` - (Optional) the name of SQL elastic pool where the database will be created for the SSIS catalog. Mutually exclusive with `pricing_tier`. * `dual_standby_pair_name` - (Optional) The dual standby Azure-SSIS Integration Runtime pair with SSISDB failover. From 4167ce661b1767b44a8866b69c0b1dd6729eb4b9 Mon Sep 17 00:00:00 2001 From: ziyeqf Date: Wed, 12 Oct 2022 10:27:52 +0800 Subject: [PATCH 5/5] fix: typo --- .../r/data_factory_integration_runtime_azure_ssis.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown index cc4f427ef5e2..e6264574628a 100644 --- a/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown +++ b/website/docs/r/data_factory_integration_runtime_azure_ssis.html.markdown @@ -81,7 +81,7 @@ A `catalog_info` block supports the following: * `pricing_tier` - (Optional) Pricing tier for the database that will be created for the SSIS catalog. Valid values are: `Basic`, `S0`, `S1`, `S2`, `S3`, `S4`, `S6`, `S7`, `S9`, `S12`, `P1`, `P2`, `P4`, `P6`, `P11`, `P15`, `GP_S_Gen5_1`, `GP_S_Gen5_2`, `GP_S_Gen5_4`, `GP_S_Gen5_6`, `GP_S_Gen5_8`, `GP_S_Gen5_10`, `GP_S_Gen5_12`, `GP_S_Gen5_14`, `GP_S_Gen5_16`, `GP_S_Gen5_18`, `GP_S_Gen5_20`, `GP_S_Gen5_24`, `GP_S_Gen5_32`, `GP_S_Gen5_40`, `GP_Gen5_2`, `GP_Gen5_4`, `GP_Gen5_6`, `GP_Gen5_8`, `GP_Gen5_10`, `GP_Gen5_12`, `GP_Gen5_14`, `GP_Gen5_16`, `GP_Gen5_18`, `GP_Gen5_20`, `GP_Gen5_24`, `GP_Gen5_32`, `GP_Gen5_40`, `GP_Gen5_80`, `BC_Gen5_2`, `BC_Gen5_4`, `BC_Gen5_6`, `BC_Gen5_8`, `BC_Gen5_10`, `BC_Gen5_12`, `BC_Gen5_14`, `BC_Gen5_16`, `BC_Gen5_18`, `BC_Gen5_20`, `BC_Gen5_24`, `BC_Gen5_32`, `BC_Gen5_40`, `BC_Gen5_80`, `HS_Gen5_2`, `HS_Gen5_4`, `HS_Gen5_6`, `HS_Gen5_8`, `HS_Gen5_10`, `HS_Gen5_12`, `HS_Gen5_14`, `HS_Gen5_16`, `HS_Gen5_18`, `HS_Gen5_20`, `HS_Gen5_24`, `HS_Gen5_32`, `HS_Gen5_40` and `HS_Gen5_80`. Mutually exclusive with `elastic_pool_name`. -* `elastic_pool_name` - (Optional) the name of SQL elastic pool where the database will be created for the SSIS catalog. Mutually exclusive with `pricing_tier`. +* `elastic_pool_name` - (Optional) The name of SQL elastic pool where the database will be created for the SSIS catalog. Mutually exclusive with `pricing_tier`. * `dual_standby_pair_name` - (Optional) The dual standby Azure-SSIS Integration Runtime pair with SSISDB failover.