Skip to content

Commit

Permalink
Fix azure file failing the integration tests
Browse files Browse the repository at this point in the history
Signed-off-by: Omer Demirok <odemirok@chef.io>
  • Loading branch information
Omer Demirok authored and Stuart Paterson committed Aug 12, 2020
1 parent fbfd35d commit a9e88f1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 deletions.
3 changes: 2 additions & 1 deletion terraform/azure.tf
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,8 @@ resource "random_string" "apim-random" {
}

resource "azurerm_api_management" "apim01" {
name = "{random_string.apim-random.result}-apim"
count = var.api_management_count
name = "${random_string.apim-random.result}-apim"
location = var.location
resource_group_name = azurerm_resource_group.rg.name
publisher_name = "My Inspec"
Expand Down
2 changes: 1 addition & 1 deletion terraform/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,6 @@ output "ip_address_name" {

output "api_management_name" {
description = "the name for the azurerm_api_management resource"
value = azurerm_api_management.apim01.name
value = var.api_management_count > 0 ? azurerm_api_management.apim01[0].name : ""
}

5 changes: 5 additions & 0 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,9 @@ variable "hd_insight_count" {
variable "public_ip_address_count" {
# This is added due to resource constraints.
default = 1
}

variable "api_management_count" {
# This is added due to resource constraints.
default = 0
}
4 changes: 2 additions & 2 deletions test/integration/verify/controls/azurerm_api_management.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
resource_group = attribute('resource_group', default: nil)
api_management_name = attribute('api_management_name', default: nil)
api_management_name = attribute('api_management_name', default: '')

control 'azurerm_api_management' do

only_if { !api_management_name.empty? }
describe azurerm_api_management(resource_group: resource_group, api_management_name: api_management_name) do
it { should exist }
its('id') { should_not be_nil }
Expand Down
4 changes: 2 additions & 2 deletions test/integration/verify/controls/azurerm_api_managements.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
resource_group = attribute('resource_group', default: nil)
api_management_name = attribute('api_management_name', default: nil)
api_management_name = attribute('api_management_name', default: '')

control 'azurerm_api_managements' do

only_if { !api_management_name.empty? }
describe azurerm_api_managements(resource_group: resource_group) do
it { should exist }
its('names') { should include api_management_name }
Expand Down

0 comments on commit a9e88f1

Please sign in to comment.