Merge pull request #5029 from allantargino/search-service-query-keys

feature: query keys for azure search

azurerm/internal/services/search/client/client.go

@@ -7,18 +7,23 @@ import (
 
 type Client struct {
 	AdminKeysClient *search.AdminKeysClient
+	QueryKeysClient *search.QueryKeysClient
 	ServicesClient  *search.ServicesClient
 }
 
 func NewClient(o *common.ClientOptions) *Client {
 	adminKeysClient := search.NewAdminKeysClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&adminKeysClient.Client, o.ResourceManagerAuthorizer)
 
+	queryKeysClient := search.NewQueryKeysClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
+	o.ConfigureClient(&queryKeysClient.Client, o.ResourceManagerAuthorizer)
+
 	servicesClient := search.NewServicesClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId)
 	o.ConfigureClient(&servicesClient.Client, o.ResourceManagerAuthorizer)
 
 	return &Client{
 		AdminKeysClient: &adminKeysClient,
+		QueryKeysClient: &queryKeysClient,
 		ServicesClient:  &servicesClient,
 	}
 }

azurerm/resource_arm_search_service.go

@@ -81,6 +81,24 @@ func resourceArmSearchService() *schema.Resource {
 				Computed: true,
 			},
 
+			"query_keys": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"name": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+
+						"key": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+					},
+				},
+			},
+
 			"tags": tags.Schema(),
 		},
 	}
@@ -193,6 +211,12 @@ func resourceArmSearchServiceRead(d *schema.ResourceData, meta interface{}) erro
 		d.Set("secondary_key", adminKeysResp.SecondaryKey)
 	}
 
+	queryKeysClient := meta.(*ArmClient).Search.QueryKeysClient
+	queryKeysResp, err := queryKeysClient.ListBySearchService(ctx, resourceGroup, name, nil)
+	if err == nil {
+		d.Set("query_keys", flattenSearchQueryKeys(queryKeysResp.Value))
+	}
+
 	return tags.FlattenAndSet(d, resp.Tags)
 }
 
@@ -220,3 +244,20 @@ func resourceArmSearchServiceDelete(d *schema.ResourceData, meta interface{}) er
 
 	return nil
 }
+
+func flattenSearchQueryKeys(input *[]search.QueryKey) []interface{} {
+	results := make([]interface{}, 0)
+
+	for _, v := range *input {
+		result := make(map[string]interface{})
+
+		if v.Name != nil {
+			result["name"] = *v.Name
+		}
+		result["key"] = *v.Key
+
+		results = append(results, result)
+	}
+
+	return results
+}

azurerm/resource_arm_search_service_test.go

@@ -82,6 +82,7 @@ func TestAccAzureRMSearchService_complete(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "replica_count", "2"),
 					resource.TestCheckResourceAttrSet(resourceName, "primary_key"),
 					resource.TestCheckResourceAttrSet(resourceName, "secondary_key"),
+					resource.TestCheckResourceAttr(resourceName, "query_keys.#", "1"),
 				),
 			},
 			{

website/docs/r/search_service.html.markdown

@@ -59,6 +59,18 @@ The following attributes are exported:
 
 * `secondary_key` - The Search Service Administration secondary key.
 
+* `query_keys` - A `query_keys` block as defined below.
+
+---
+
+A `query_keys` block exports the following:
+
+* `name` - The name of the query key.
+
+* `key` - The value of the query key.
+
+---
+
 ## Import
 
 Search Services can be imported using the `resource id`, e.g.