New Resource: azurerm_private_link_endpoint New Data Source: azurerm_private_link_endpoint_connection and expose attibute in azurerm_subnet

azurerm/data_source_private_link_endpoint.go

@@ -0,0 +1,165 @@
+package azurerm
+
+import (
+	"fmt"
+
+	"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/validate"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
+)
+
+func dataSourceArmPrivateLinkEndpoint() *schema.Resource {
+	return &schema.Resource{
+		Read: dataSourceArmPrivateLinkEndpointRead,
+
+		Schema: map[string]*schema.Schema{
+			"name": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validate.NoEmptyStrings,
+			},
+
+			"location": azure.SchemaLocationForDataSource(),
+
+			"resource_group_name": azure.SchemaResourceGroupNameForDataSource(),
+
+			"manual_private_link_service_connection": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"private_link_service_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"group_ids": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"state_action_required": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"state_description": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"state_status": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"request_message": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+
+			"private_link_service_connection": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"private_link_service_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"group_ids": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+						},
+						"state_action_required": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"state_description": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"state_status": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"request_message": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+
+			"network_interface_ids": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+			},
+
+			"subnet_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
+			"tags": tags.SchemaDataSource(),
+		},
+	}
+}
+
+func dataSourceArmPrivateLinkEndpointRead(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*ArmClient).Network.PrivateEndpointClient
+	ctx := meta.(*ArmClient).StopContext
+
+	name := d.Get("name").(string)
+	resourceGroup := d.Get("resource_group_name").(string)
+
+	resp, err := client.Get(ctx, resourceGroup, name, "")
+	if err != nil {
+		if utils.ResponseWasNotFound(resp.Response) {
+			return fmt.Errorf("Error: Private Endpoint %q (Resource Group %q) was not found", name, resourceGroup)
+		}
+		return fmt.Errorf("Error reading Private Endpoint %q (Resource Group %q): %+v", name, resourceGroup, err)
+	}
+
+	d.SetId(*resp.ID)
+
+	d.Set("name", resp.Name)
+	d.Set("resource_group_name", resourceGroup)
+	if location := resp.Location; location != nil {
+		d.Set("location", azure.NormalizeLocation(*location))
+	}
+	if props := resp.PrivateEndpointProperties; props != nil {
+		if err := d.Set("manual_private_link_service_connection", flattenArmPrivateLinkEndpointServiceConnection(props.ManualPrivateLinkServiceConnections)); err != nil {
+			return fmt.Errorf("Error setting `manual_private_link_service_connection`: %+v", err)
+		}
+		if err := d.Set("private_link_service_connection", flattenArmPrivateLinkEndpointServiceConnection(props.PrivateLinkServiceConnections)); err != nil {
+			return fmt.Errorf("Error setting `private_link_service_connection`: %+v", err)
+		}
+		if err := d.Set("network_interfaces", flattenArmPrivateLinkEndpointInterface(props.NetworkInterfaces)); err != nil {
+			return fmt.Errorf("Error setting `network_interfaces`: %+v", err)
+		}
+		if subnet := props.Subnet; subnet != nil {
+			d.Set("subnet_id", subnet.ID)
+		}
+	}
+	tags.FlattenAndSet(d, resp.Tags)
+
+	return nil
+}

azurerm/data_source_private_link_endpoint_test.go

@@ -0,0 +1,80 @@
+package azurerm
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
+)
+
+func TestAccDataSourceAzureRMPrivateEndpoint_basic(t *testing.T) {
+	dataSourceName := "data.azurerm_private_link_endpoint.test"
+	ri := tf.AccRandTimeInt()
+	location := testLocation()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourcePrivateEndpoint_basic(ri, location),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(dataSourceName, "subnet_id"),
+					resource.TestCheckResourceAttr(dataSourceName, "private_link_service_connections.0.name", fmt.Sprintf("acctestconnection-%d", ri)),
+					resource.TestCheckResourceAttrSet(dataSourceName, "private_link_service_connections.0.private_link_service_id"),
+					resource.TestCheckResourceAttr(dataSourceName, "private_link_service_connections.0.request_message", "Please approve my request"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccDataSourceAzureRMPrivateEndpoint_complete(t *testing.T) {
+	dataSourceName := "data.azurerm_private_link_endpoint.test"
+	ri := tf.AccRandTimeInt()
+	location := testLocation()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:  func() { testAccPreCheck(t) },
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourcePrivateEndpoint_complete(ri, location),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(dataSourceName, "subnet_id"),
+					resource.TestCheckResourceAttr(dataSourceName, "private_link_service_connections.0.name", fmt.Sprintf("acctestconnection-%d", ri)),
+					resource.TestCheckResourceAttrSet(dataSourceName, "private_link_service_connections.0.private_link_service_id"),
+					resource.TestCheckResourceAttr(dataSourceName, "private_link_service_connections.0.group_ids.#", "0"),
+					resource.TestCheckResourceAttr(dataSourceName, "private_link_service_connections.0.request_message", "plz approve my request"),
+					resource.TestCheckResourceAttr(dataSourceName, "tags.%", "1"),
+					resource.TestCheckResourceAttr(dataSourceName, "tags.env", "test"),
+				),
+			},
+		},
+	})
+}
+
+func testAccDataSourcePrivateEndpoint_basic(rInt int, location string) string {
+	config := testAccAzureRMPrivateEndpoint_basic(rInt, location)
+	return fmt.Sprintf(`
+%s
+
+data "azurerm_private_link_endpoint" "test" {
+  resource_group_name = "${azurerm_private_link_endpoint.test.resource_group_name}"
+  name                = "${azurerm_private_link_endpoint.test.name}"
+}
+`, config)
+}
+
+func testAccDataSourcePrivateEndpoint_complete(rInt int, location string) string {
+	config := testAccAzureRMPrivateEndpoint_complete(rInt, location)
+	return fmt.Sprintf(`
+%s
+
+data "azurerm_private_link_endpoint" "test" {
+  resource_group_name = "${azurerm_private_link_endpoint.test.resource_group_name}"
+  name                = "${azurerm_private_link_endpoint.test.name}"
+}
+`, config)
+}

azurerm/data_source_subnet.go

@@ -57,6 +57,11 @@ func dataSourceArmSubnet() *schema.Resource {
 					Type: schema.TypeString,
 				},
 			},
+
+			"disable_private_endpoint_network_policies": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
 		},
 	}
 }
@@ -86,6 +91,12 @@ func dataSourceArmSubnetRead(d *schema.ResourceData, meta interface{}) error {
 	if props := resp.SubnetPropertiesFormat; props != nil {
 		d.Set("address_prefix", props.AddressPrefix)
 
+		if privateEndpointNetworkPolicies := props.PrivateEndpointNetworkPolicies; privateEndpointNetworkPolicies != nil {
+			if err := d.Set("disable_private_endpoint_network_policies", *privateEndpointNetworkPolicies == "Disabled"); err != nil {
+				return err
+			}
+		}
+
 		if props.NetworkSecurityGroup != nil {
 			d.Set("network_security_group_id", props.NetworkSecurityGroup.ID)
 		} else {

azurerm/helpers/validate/strings.go

@@ -18,3 +18,27 @@ func NoEmptyStrings(i interface{}, k string) ([]string, []error) {
 
 	return nil, nil
 }
+
+// PrivateLinkEnpointRequestMessage validates that the Private Link Enpoint Request Message is less than 140 characters
+func PrivateLinkEnpointRequestMessage(i interface{}, k string) (_ []string, errors []error) {
+	return stringMaxLength(140)(i, k)
+}
+
+func stringMaxLength(maxLength int) func(i interface{}, k string) (_ []string, errors []error) {
+	return func(i interface{}, k string) (_ []string, errors []error) {
+		v, ok := i.(string)
+		if !ok {
+			return nil, []error{fmt.Errorf("expected type of %q to be string", k)}
+		}
+
+		if len(v) > maxLength {
+			return nil, []error{fmt.Errorf("%q must not be longer than %d characters, got %d", k, maxLength, len(v))}
+		}
+
+		if strings.TrimSpace(v) == "" {
+			return nil, []error{fmt.Errorf("%q must not be empty", k)}
+		}
+
+		return
+	}
+}

azurerm/internal/services/network/client.go

@@ -19,6 +19,7 @@ type Client struct {
 	LocalNetworkGatewaysClient           *network.LocalNetworkGatewaysClient
 	ProfileClient                        *network.ProfilesClient
 	PacketCapturesClient                 *network.PacketCapturesClient
+	PrivateEndpointClient                *network.PrivateEndpointsClient
 	PublicIPsClient                      *network.PublicIPAddressesClient
 	PublicIPPrefixesClient               *network.PublicIPPrefixesClient
 	RoutesClient                         *network.RoutesClient
@@ -78,6 +79,9 @@ func BuildClient(o *common.ClientOptions) *Client {
 	PacketCapturesClient := network.NewPacketCapturesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&PacketCapturesClient.Client, o.ResourceManagerAuthorizer)
 
+	PrivateEndpointClient := network.NewPrivateEndpointsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&PrivateEndpointClient.Client, o.ResourceManagerAuthorizer)
+
 	VnetPeeringsClient := network.NewVirtualNetworkPeeringsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&VnetPeeringsClient.Client, o.ResourceManagerAuthorizer)
 
@@ -131,6 +135,7 @@ func BuildClient(o *common.ClientOptions) *Client {
 		LocalNetworkGatewaysClient:           &LocalNetworkGatewaysClient,
 		ProfileClient:                        &ProfileClient,
 		PacketCapturesClient:                 &PacketCapturesClient,
+		PrivateEndpointClient:                &PrivateEndpointClient,
 		PublicIPsClient:                      &PublicIPsClient,
 		PublicIPPrefixesClient:               &PublicIPPrefixesClient,
 		RoutesClient:                         &RoutesClient,

azurerm/provider.go

@@ -110,6 +110,7 @@ func Provider() terraform.ResourceProvider {
 		"azurerm_network_watcher":                         dataSourceArmNetworkWatcher(),
 		"azurerm_notification_hub_namespace":              dataSourceNotificationHubNamespace(),
 		"azurerm_notification_hub":                        dataSourceNotificationHub(),
+		"azurerm_private_link_endpoint":                   dataSourceArmPrivateLinkEndpoint(),
 		"azurerm_platform_image":                          dataSourceArmPlatformImage(),
 		"azurerm_policy_definition":                       dataSourceArmPolicyDefinition(),
 		"azurerm_proximity_placement_group":               dataSourceArmProximityPlacementGroup(),
@@ -369,6 +370,7 @@ func Provider() terraform.ResourceProvider {
 		"azurerm_private_dns_zone":                                                       resourceArmPrivateDnsZone(),
 		"azurerm_private_dns_a_record":                                                   resourceArmPrivateDnsARecord(),
 		"azurerm_private_dns_cname_record":                                               resourceArmPrivateDnsCNameRecord(),
+		"azurerm_private_link_endpoint":                                                  resourceArmPrivateLinkEndpoint(),
 		"azurerm_private_dns_zone_virtual_network_link":                                  resourceArmPrivateDnsZoneVirtualNetworkLink(),
 		"azurerm_proximity_placement_group":                                              resourceArmProximityPlacementGroup(),
 		"azurerm_public_ip":                                                              resourceArmPublicIp(),