Skip to content

Commit

Permalink
Merge pull request #10565 from terraform-providers/b/10439-template-d…
Browse files Browse the repository at this point in the history
…eployment

r/resource_group_template_deployment: checking for the resource name insensitively
  • Loading branch information
tombuildsstuff authored Feb 15, 2021
2 parents bc1fe97 + 14d5011 commit 911cdc8
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,21 @@ func TestAccResourceGroupTemplateDeployment_incremental(t *testing.T) {
})
}

func TestAccResourceGroupTemplateDeployment_singleItemIncorrectCasing(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_resource_group_template_deployment", "test")
r := ResourceGroupTemplateDeploymentResource{}

data.ResourceTest(t, r, []resource.TestStep{
{
Config: r.singleItemWithIncorrectCasingConfig(data, "first"),
Check: resource.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccResourceGroupTemplateDeployment_singleItemUpdatingParams(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_resource_group_template_deployment", "test")
r := ResourceGroupTemplateDeploymentResource{}
Expand Down Expand Up @@ -264,6 +279,73 @@ TEMPLATE
`, data.RandomInteger, data.Locations.Primary, deploymentMode)
}

func (ResourceGroupTemplateDeploymentResource) singleItemWithIncorrectCasingConfig(data acceptance.TestData, value string) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}
resource "azurerm_resource_group" "test" {
name = "acctestrg-%d"
location = %q
}
resource "azurerm_resource_group_template_deployment" "test" {
name = "acctest"
resource_group_name = azurerm_resource_group.test.name
deployment_mode = "Complete"
template_content = <<TEMPLATE
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"someParam": {
"type": "String",
"allowedValues": [
"first",
"second",
"third"
]
}
},
"variables": {},
"resources": [
{
"type": "microsoft.insights/actionGroups",
"apiVersion": "2019-06-01",
"name": "acctestTemplateDeployAG-%d",
"location": "Global",
"dependsOn": [],
"tags": {},
"properties": {
"groupShortName": "rick-c137",
"enabled": true,
"emailReceivers": [
{
"name": "Rick Sanchez",
"emailAddress": "[email protected]"
}
],
"smsReceivers": [],
"webhookReceivers": []
}
}
]
}
TEMPLATE
parameters_content = <<PARAM
{
"someParam": {
"value": %q
}
}
PARAM
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, value)
}

func (ResourceGroupTemplateDeploymentResource) singleItemWithParameterConfig(data acceptance.TestData, value string) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ func findApiVersionForResourceType(resourceType string, availableResourceTypes [
continue
}

if strings.HasPrefix(resourceType, *item.ResourceType) {
if strings.HasPrefix(strings.ToLower(resourceType), strings.ToLower(*item.ResourceType)) {
apiVersions := *item.APIVersions
apiVersion := apiVersions[0]
return &apiVersion
Expand Down

0 comments on commit 911cdc8

Please sign in to comment.