Adding type to data okta group

examples/okta_group/datasource.tf

@@ -1,17 +1,23 @@
-resource okta_group test {
+resource "okta_group" "test" {
   name        = "testAcc_replace_with_uuid"
   description = "testing, testing"
   users       = ["${okta_user.test.id}"]
 }
 
-resource okta_user test {
+resource "okta_user" "test" {
   first_name = "TestAcc"
   last_name  = "Jones"
   login      = "john_replace_with_uuid@ledzeppelin.com"
   email      = "john_replace_with_uuid@ledzeppelin.com"
 }
 
-data okta_group test {
+data "okta_group" "test" {
   include_users = true
   name          = "${okta_group.test.name}"
 }
+
+data "okta_group" "test_type" {
+  include_users = true
+  name          = "${okta_group.test.name}"
+  type          = "nonExistentType"
+}

go.sum

@@ -218,6 +218,7 @@ github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjH
 github.com/hashicorp/terraform-json v0.4.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU=
 github.com/hashicorp/terraform-plugin-sdk v1.9.0 h1:WBHHIX/RgF6/lbfMCzx0qKl96BbQy3bexWFvDqt1bhE=
 github.com/hashicorp/terraform-plugin-sdk v1.9.0/go.mod h1:C/AXwmDHqbc3h6URiHpIsVKrwV4PS0Sh0+VTaeEkShw=
+github.com/hashicorp/terraform-plugin-sdk v1.15.0 h1:bmYnTT7MqNXlUHDc7pT8E6uKT2g/upjlRLypJFK1OQU=
 github.com/hashicorp/terraform-plugin-test v1.2.0 h1:AWFdqyfnOj04sxTdaAF57QqvW7XXrT8PseUHkbKsE8I=
 github.com/hashicorp/terraform-plugin-test v1.2.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs=
 github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 h1:hjyO2JsNZUKT1ym+FAdlBEkGPevazYsmVgIMw7dVELg=

okta/data_source_okta_group.go

@@ -18,6 +18,12 @@ func dataSourceGroup() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
+			"type": &schema.Schema{
+				Type:        schema.TypeString,
+				Optional:    true,
+				Default:     false,
+				Description: "Type of the group. When specified in the terraform resource, will act as a filter when searching for the group",
+			},
 			"description": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -44,7 +50,13 @@ func dataSourceGroupRead(d *schema.ResourceData, m interface{}) error {
 
 func findGroup(name string, d *schema.ResourceData, m interface{}) error {
 	client := getOktaClientFromMetadata(m)
-	groups, _, err := client.Group.ListGroups(&query.Params{Q: name})
+	searchParams := &query.Params{Q: name}
+	if d.Get("type") != nil {
+		groupType := d.Get("type").(string)
+		searchParams = &query.Params{Q: name, Type: groupType}
+	}
+
+	groups, _, err := client.Group.ListGroups(searchParams)
 	if err != nil {
 		return fmt.Errorf("failed to query for groups: %v", err)
 	} else if len(groups) < 1 {
@@ -53,6 +65,7 @@ func findGroup(name string, d *schema.ResourceData, m interface{}) error {
 
 	d.SetId(groups[0].Id)
 	d.Set("description", groups[0].Profile.Description)
+	d.Set("type", groups[0].Type)
 
 	if d.Get("include_users").(bool) {
 		userIdList, err := listGroupUserIds(m, d.Id())

okta/data_source_okta_group_test.go

@@ -1,10 +1,12 @@
 package okta
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
 func TestAccOktaDataSourceGroup_read(t *testing.T) {
@@ -22,10 +24,25 @@ func TestAccOktaDataSourceGroup_read(t *testing.T) {
 				Config: config,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.okta_group.test", "id"),
+					resource.TestCheckResourceAttrSet("data.okta_group.test", "type"),
 					resource.TestCheckResourceAttrSet("okta_group.test", "id"),
 					resource.TestCheckResourceAttr("okta_group.test", "users.#", "1"),
 				),
 			},
+			{
+				Config: config,
+				Check:  resource.ComposeTestCheckFunc(testDoesNotExist("okta_group.test_type")),
+			},
 		},
 	})
 }
+
+func testDoesNotExist(name string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		_, ok := s.RootModule().Resources[name]
+		if ok {
+			return fmt.Errorf("Resource should not exist: %s", name)
+		}
+		return nil
+	}
+}

website/docs/d/group.html.markdown

@@ -22,6 +22,8 @@ data "okta_group" "example" {
 
 * `name` - (Required) name of group to retrieve.
 
+* `type` - (Optional) type of the group to retrieve.
+
 * `include_users` - (Optional) whether or not to retrieve all member ids.
 
 ## Attributes Reference
@@ -30,6 +32,8 @@ data "okta_group" "example" {
 
 * `name` - name of group.
 
+* `type` - type of group.
+
 * `description` - description of group.
 
 * `users` - user ids that are members of this group, only included if `include_users` is set to `true`.