azuread_group - support for the description property

azuread/data_group.go

@@ -27,6 +27,12 @@ func dataGroup() *schema.Resource {
 				ConflictsWith: []string{"name"},
 			},
 
+			"description": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+
 			"name": {
 				Type:          schema.TypeString,
 				Optional:      true,
@@ -86,6 +92,10 @@ func dataSourceActiveDirectoryGroupRead(d *schema.ResourceData, meta interface{}
 	d.Set("object_id", group.ObjectID)
 	d.Set("name", group.DisplayName)
 
+	if v, ok := group.AdditionalProperties["Properties"]; ok {
+		d.Set("description", v.(string))
+	}
+
 	members, err := graph.GroupAllMembers(client, ctx, d.Id())
 	if err != nil {
 		return err

azuread/resource_group.go

@@ -42,6 +42,12 @@ func resourceGroup() *schema.Resource {
 				Computed: true,
 			},
 
+			"description": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+			},
+
 			"members": {
 				Type:     schema.TypeSet,
 				Optional: true,
@@ -73,11 +79,18 @@ func resourceGroupCreate(d *schema.ResourceData, meta interface{}) error {
 
 	name := d.Get("name").(string)
 
+	additionalProperties := make(map[string]interface{})
+
+	if v, ok := d.GetOk("description"); ok {
+		additionalProperties["Description"] = v.(string)
+	}
+
 	properties := graphrbac.GroupCreateParameters{
-		DisplayName:     &name,
-		MailEnabled:     p.Bool(false),                 // we're defaulting to false, as the API currently only supports the creation of non-mail enabled security groups.
-		MailNickname:    p.String(uuid.New().String()), // this matches the portal behaviour
-		SecurityEnabled: p.Bool(true),                  // we're defaulting to true, as the API currently only supports the creation of non-mail enabled security groups.
+		DisplayName:          &name,
+		MailEnabled:          p.Bool(false),           // we're defaulting to false, as the API currently only supports the creation of non-mail enabled security groups.
+		MailNickname:         p.String(uuid.New().String()), // this matches the portal behaviour
+		SecurityEnabled:      p.Bool(true),            // we're defaulting to true, as the API currently only supports the creation of non-mail enabled security groups.
+		AdditionalProperties: additionalProperties,
 	}
 
 	group, err := client.Create(ctx, properties)
@@ -87,6 +100,7 @@ func resourceGroupCreate(d *schema.ResourceData, meta interface{}) error {
 	if group.ObjectID == nil {
 		return fmt.Errorf("nil Group ID for %q: %+v", name, err)
 	}
+
 	d.SetId(*group.ObjectID)
 
 	// Add members if specified
@@ -132,6 +146,9 @@ func resourceGroupRead(d *schema.ResourceData, meta interface{}) error {
 		return fmt.Errorf("Error retrieving Azure AD Group with ID %q: %+v", d.Id(), err)
 	}
 
+	if v, ok := resp.AdditionalProperties["Properties"]; ok {
+		d.Set("description", v.(string))
+	}
 	d.Set("name", resp.DisplayName)
 	d.Set("object_id", resp.ObjectID)
 

website/docs/d/group.html.markdown

@@ -36,6 +36,7 @@ The following arguments are supported:
 The following attributes are exported:
 
 * `id` - The Object ID of the Azure AD Group.
+* `description` - The description of the AD Group.
 * `name` - The name of the Azure AD Group.
 * `owners` - The Object IDs of the Azure AD Group owners.
 * `members` - The Object IDs of the Azure AD Group members.

website/docs/r/group.markdown

@@ -43,6 +43,7 @@ resource "azuread_group" "example" {
 The following arguments are supported:
 
 * `name` - (Required) The display name for the Group. Changing this forces a new resource to be created.
+* `description` - (Optional) The description for the Group.  Changing this forces a new resource to be created.
 * `members` (Optional) A set of members who should be present in this Group. Supported Object types are Users, Groups or Service Principals.
 * `owners` (Optional) A set of owners who own this Group. Supported Object types are Users or Service Principals.
 
@@ -60,6 +61,8 @@ The following attributes are exported:
 
 * `name` - The Display Name of the Group.
 
+* `description` - The Description of the Group.
+
 * `members` - The Members of the Group.
 
 * `owners` - The Members of the Group.