Merge pull request #11236 from magodo/hpc_cache_network_setting

`azurerm_hpc_cache` - support for `ntp_server` and `dns`
hashicorp · Apr 8, 2021 · 169aa72 · 169aa72
2 parents 195aee4 + 4fcfe12
commit 169aa72
Show file tree

Hide file tree

Showing 3 changed files with 199 additions and 8 deletions.
diff --git a/azurerm/internal/services/hpccache/hpc_cache_resource.go b/azurerm/internal/services/hpccache/hpc_cache_resource.go
@@ -86,6 +86,38 @@ func resourceHPCCache() *schema.Resource {
 				ValidateFunc: validation.IntBetween(576, 1500),
 			},
 
+			"ntp_server": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				Default:      "time.windows.com",
+				ValidateFunc: validation.StringIsNotEmpty,
+			},
+
+			"dns": {
+				Type:     schema.TypeList,
+				Optional: true,
+				MaxItems: 1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"servers": {
+							Type:     schema.TypeList,
+							Required: true,
+							MaxItems: 3,
+							Elem: &schema.Schema{
+								Type:         schema.TypeString,
+								ValidateFunc: validation.IsIPAddress,
+							},
+						},
+
+						"search_domain": {
+							Type:         schema.TypeString,
+							Optional:     true,
+							ValidateFunc: validation.StringIsNotEmpty,
+						},
+					},
+				},
+			},
+
 			// TODO 3.0: remove this property
 			"root_squash_enabled": {
 				Type:       schema.TypeBool,
@@ -207,7 +239,6 @@ func resourceHPCCacheCreateOrUpdate(d *schema.ResourceData, meta interface{}) er
 	cacheSize := d.Get("cache_size_in_gb").(int)
 	subnet := d.Get("subnet_id").(string)
 	skuName := d.Get("sku_name").(string)
-	mtu := d.Get("mtu").(int)
 
 	var accessPolicies []storagecache.NfsAccessPolicy
 	if !d.IsNewResource() {
@@ -236,11 +267,9 @@ func resourceHPCCacheCreateOrUpdate(d *schema.ResourceData, meta interface{}) er
 		Name:     utils.String(name),
 		Location: utils.String(location),
 		CacheProperties: &storagecache.CacheProperties{
-			CacheSizeGB: utils.Int32(int32(cacheSize)),
-			Subnet:      utils.String(subnet),
-			NetworkSettings: &storagecache.CacheNetworkSettings{
-				Mtu: utils.Int32(int32(mtu)),
-			},
+			CacheSizeGB:     utils.Int32(int32(cacheSize)),
+			Subnet:          utils.String(subnet),
+			NetworkSettings: expandStorageCacheNetworkSettings(d),
 			SecuritySettings: &storagecache.CacheSecuritySettings{
 				AccessPolicies: &accessPolicies,
 			},
@@ -300,9 +329,14 @@ func resourceHPCCacheRead(d *schema.ResourceData, meta interface{}) error {
 		d.Set("cache_size_in_gb", props.CacheSizeGB)
 		d.Set("subnet_id", props.Subnet)
 		d.Set("mount_addresses", utils.FlattenStringSlice(props.MountAddresses))
-		if props.NetworkSettings != nil {
-			d.Set("mtu", props.NetworkSettings.Mtu)
+
+		mtu, ntpServer, dnsSetting := flattenStorageCacheNetworkSettings(props.NetworkSettings)
+		d.Set("mtu", mtu)
+		d.Set("ntp_server", ntpServer)
+		if err := d.Set("dns", dnsSetting); err != nil {
+			return fmt.Errorf("setting `dns`: %v", err)
 		}
+
 		if securitySettings := props.SecuritySettings; securitySettings != nil {
 			if securitySettings.AccessPolicies != nil {
 				defaultPolicy := CacheGetAccessPolicyByName(*securitySettings.AccessPolicies, "default")
@@ -454,3 +488,51 @@ func flattenStorageCacheNfsAccessRules(input *[]storagecache.NfsAccessRule) ([]i
 
 	return rules, nil
 }
+
+func expandStorageCacheNetworkSettings(d *schema.ResourceData) *storagecache.CacheNetworkSettings {
+	out := &storagecache.CacheNetworkSettings{
+		Mtu:       utils.Int32(int32(d.Get("mtu").(int))),
+		NtpServer: utils.String(d.Get("ntp_server").(string)),
+	}
+
+	if dnsSetting, ok := d.GetOk("dns"); ok {
+		dnsSetting := dnsSetting.([]interface{})[0].(map[string]interface{})
+		out.DNSServers = utils.ExpandStringSlice(dnsSetting["servers"].([]interface{}))
+		searchDomain := dnsSetting["search_domain"].(string)
+		if searchDomain != "" {
+			out.DNSSearchDomain = &searchDomain
+		}
+	}
+	return out
+}
+
+func flattenStorageCacheNetworkSettings(settings *storagecache.CacheNetworkSettings) (mtu int, ntpServer string, dnsSetting []interface{}) {
+	if settings == nil {
+		return
+	}
+
+	if settings.Mtu != nil {
+		mtu = int(*settings.Mtu)
+	}
+
+	if settings.NtpServer != nil {
+		ntpServer = *settings.NtpServer
+	}
+
+	if settings.DNSServers != nil {
+		dnsServers := utils.FlattenStringSlice(settings.DNSServers)
+
+		searchDomain := ""
+		if settings.DNSSearchDomain != nil {
+			searchDomain = *settings.DNSSearchDomain
+		}
+
+		dnsSetting = []interface{}{
+			map[string]interface{}{
+				"servers":       dnsServers,
+				"search_domain": searchDomain,
+			},
+		}
+	}
+	return
+}
diff --git a/azurerm/internal/services/hpccache/hpc_cache_resource_test.go b/azurerm/internal/services/hpccache/hpc_cache_resource_test.go
@@ -65,6 +65,68 @@ func TestAccHPCCache_mtu(t *testing.T) {
 	})
 }
 
+func TestAccHPCCache_ntpServer(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_hpc_cache", "test")
+	r := HPCCacheResource{}
+
+	data.ResourceTest(t, r, []resource.TestStep{
+		{
+			Config: r.basic(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+		{
+			Config: r.ntpServer(data, "time.microsoft.com"),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+				check.That(data.ResourceName).Key("mount_addresses.#").Exists(),
+			),
+		},
+		data.ImportStep(),
+		{
+			Config: r.basic(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+				check.That(data.ResourceName).Key("mount_addresses.#").Exists(),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
+func TestAccHPCCache_dnsSetting(t *testing.T) {
+	data := acceptance.BuildTestData(t, "azurerm_hpc_cache", "test")
+	r := HPCCacheResource{}
+
+	data.ResourceTest(t, r, []resource.TestStep{
+		{
+			Config: r.basic(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+			),
+		},
+		data.ImportStep(),
+		{
+			Config: r.dnsSetting(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+				check.That(data.ResourceName).Key("mount_addresses.#").Exists(),
+			),
+		},
+		data.ImportStep(),
+		{
+			Config: r.basic(data),
+			Check: resource.ComposeTestCheckFunc(
+				check.That(data.ResourceName).ExistsInAzure(r),
+				check.That(data.ResourceName).Key("mount_addresses.#").Exists(),
+			),
+		},
+		data.ImportStep(),
+	})
+}
+
 func TestAccHPCCache_rootSquashDeprecated(t *testing.T) {
 	data := acceptance.BuildTestData(t, "azurerm_hpc_cache", "test")
 	r := HPCCacheResource{}
@@ -286,6 +348,41 @@ resource "azurerm_hpc_cache" "test" {
 `, r.template(data), data.RandomInteger)
 }
 
+func (r HPCCacheResource) ntpServer(data acceptance.TestData, server string) string {
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_hpc_cache" "test" {
+  name                = "acctest-HPCC-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  cache_size_in_gb    = 3072
+  subnet_id           = azurerm_subnet.test.id
+  sku_name            = "Standard_2G"
+  ntp_server          = %q
+}
+`, r.template(data), data.RandomInteger, server)
+}
+
+func (r HPCCacheResource) dnsSetting(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+%s
+
+resource "azurerm_hpc_cache" "test" {
+  name                = "acctest-HPCC-%d"
+  resource_group_name = azurerm_resource_group.test.name
+  location            = azurerm_resource_group.test.location
+  cache_size_in_gb    = 3072
+  subnet_id           = azurerm_subnet.test.id
+  sku_name            = "Standard_2G"
+  dns {
+    servers       = ["8.8.8.8"]
+    search_domain = "foo.com"
+  }
+}
+`, r.template(data), data.RandomInteger)
+}
+
 func (HPCCacheResource) template(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 provider "azurerm" {

diff --git a/website/docs/r/hpc_cache.html.markdown b/website/docs/r/hpc_cache.html.markdown
@@ -67,6 +67,10 @@ The following arguments are supported:
 * `mtu` - (Optional) The IPv4 maximum transmission unit configured for the subnet of the HPC Cache. Possible values range from 576 - 1500. Defaults to 1500.
 
 * `default_access_policy` - (Optional) A `default_access_policy` block as defined below.
+
+* `ntp_server` - (Optional) The NTP server IP Address or FQDN for the HPC Cache. Defaults to `time.windows.com`.
+
+* `dns` - (Optional) A `dns` block as defined below.
 
 ---
 
@@ -96,6 +100,14 @@ A `default_access_policy` block contains the following:
 
 * `access_rule` - (Required) One to three `access_rule` blocks as defined above.
 
+---
+
+A `dns` block contains the following:
+
+* `servers` - (Required) A list of DNS servers for the HPC Cache. At most three IP(s) are allowed to set.
+
+* `search_domain` - (Optional) The DNS search domain for the HPC Cache.
+
 ## Attributes Reference
 
 The following attributes are exported: