Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support public_ips for resource azurerm_batch_pool #5967

Merged
merged 6 commits into from
Mar 4, 2020
Merged

support public_ips for resource azurerm_batch_pool #5967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26d634f
Support for 'public_ips' in the network_configuration block of azurer…
njuCZ Mar 2, 2020
3bd937a
update
njuCZ Mar 3, 2020
a61418a
rebase and add doc
njuCZ Mar 3, 2020
884e19e
update
njuCZ Mar 3, 2020
24d02ab
update
njuCZ Mar 4, 2020
dbcd8ac
update
njuCZ Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azurerm/helpers/azure/batch_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package azure
import (
"fmt"

"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch"
)

// ExpandBatchAccountKeyVaultReference expands Batch account KeyVault reference
Expand Down
11 changes: 10 additions & 1 deletion azurerm/helpers/azure/batch_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"strings"

"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)
Expand Down Expand Up @@ -571,6 +571,11 @@ func ExpandBatchPoolNetworkConfiguration(list []interface{}) (*batch.NetworkConf
}
}

if v, ok := networkConfigValue["public_ips"]; ok {
publicIPsRaw := v.(*schema.Set).List()
networkConfiguration.PublicIPs = utils.ExpandStringSlice(publicIPsRaw)
}

if v, ok := networkConfigValue["endpoint_configuration"]; ok {
endpoint, err := ExpandBatchPoolEndpointConfiguration(v.([]interface{}))
if err != nil {
Expand Down Expand Up @@ -661,6 +666,10 @@ func FlattenBatchPoolNetworkConfiguration(networkConfig *batch.NetworkConfigurat
result["subnet_id"] = *networkConfig.SubnetID
}

if networkConfig.PublicIPs != nil {
result["public_ips"] = schema.NewSet(schema.HashString, utils.FlattenStringSlice(networkConfig.PublicIPs))
}

if cfg := networkConfig.EndpointConfiguration; cfg != nil && cfg.InboundNatPools != nil && len(*cfg.InboundNatPools) != 0 {
endpointConfigs := make([]interface{}, len(*cfg.InboundNatPools))

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/batch/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
)

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/batch/data_source_batch_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/batch/resource_arm_batch_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"time"

"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/batch/resource_arm_batch_application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"regexp"
"time"

"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/batch/resource_arm_batch_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down
11 changes: 10 additions & 1 deletion azurerm/internal/services/batch/resource_arm_batch_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"time"

"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2018-12-01/batch"
"github.com/Azure/azure-sdk-for-go/services/batch/mgmt/2019-08-01/batch"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
Expand Down Expand Up @@ -397,6 +397,15 @@ func resourceArmBatchPool() *schema.Resource {
ForceNew: true,
ValidateFunc: validation.StringIsNotEmpty,
},
"public_ips": {
Type: schema.TypeSet,
Optional: true,
ForceNew: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Set: schema.HashString,
},
"endpoint_configuration": {
Type: schema.TypeList,
Optional: true,
Expand Down
28 changes: 26 additions & 2 deletions azurerm/internal/services/batch/tests/resource_arm_batch_pool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,20 @@ func TestAccAzureRMBatchPool_frontEndPortRanges(t *testing.T) {
Config: testaccAzureRMBatchPool_networkConfiguration(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMBatchPoolExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "vm_size", "STANDARD_A1"),
resource.TestCheckResourceAttr(data.ResourceName, "node_agent_sku_id", "batch.node.ubuntu 16.04"),
resource.TestCheckResourceAttr(data.ResourceName, "account_name", fmt.Sprintf("testaccbatch%s", data.RandomString)),
resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.#", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.0.publisher", "Canonical"),
resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.0.sku", "16.04.0-LTS"),
resource.TestCheckResourceAttr(data.ResourceName, "storage_image_reference.0.offer", "UbuntuServer"),
resource.TestCheckResourceAttr(data.ResourceName, "auto_scale.#", "0"),
resource.TestCheckResourceAttr(data.ResourceName, "fixed_scale.#", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "fixed_scale.0.target_dedicated_nodes", "1"),
resource.TestCheckResourceAttr(data.ResourceName, "start_task.#", "0"),
resource.TestCheckResourceAttr(data.ResourceName, "network_configuration.#", "1"),
resource.TestCheckResourceAttrSet(data.ResourceName, "network_configuration.0.subnet_id"),
resource.TestCheckResourceAttr(data.ResourceName, "network_configuration.0.public_ips.#", "1"),
),
},
data.ImportStep("stop_pending_resize_operation"),
Expand Down Expand Up @@ -1242,6 +1256,15 @@ resource "azurerm_subnet" "test" {
address_prefix = "10.0.2.0/24"
}

resource "azurerm_public_ip" "test" {
name = "acctestpublicip-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
allocation_method = "Static"
sku = "Standard"
domain_name_label = "acctest-publicip"
}

resource "azurerm_batch_account" "test" {
name = "testaccbatch%s"
resource_group_name = "${azurerm_resource_group.test.name}"
Expand All @@ -1267,7 +1290,8 @@ resource "azurerm_batch_pool" "test" {
}

network_configuration {
subnet_id = "${azurerm_subnet.test.id}"
subnet_id = azurerm_subnet.test.id
public_ips = [azurerm_public_ip.test.id]

endpoint_configuration {
name = "SSH"
Expand All @@ -1283,5 +1307,5 @@ resource "azurerm_batch_pool" "test" {
}
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomString, data.RandomString)
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomString, data.RandomString)
}
18 changes: 9 additions & 9 deletions ...es/batch/mgmt/2018-12-01/batch/account.go → ...es/batch/mgmt/2019-08-01/batch/account.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions ...atch/mgmt/2018-12-01/batch/application.go → ...atch/mgmt/2019-08-01/batch/application.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 10 additions & 7 deletions ...mt/2018-12-01/batch/applicationpackage.go → ...mt/2019-08-01/batch/applicationpackage.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading