Add project_id to data_source_openstack_identity_project_v3

openstack/data_source_openstack_identity_project_v3.go

@@ -62,6 +62,15 @@ func dataSourceIdentityProjectV3() *schema.Resource {
 				Elem:     &schema.Schema{Type: schema.TypeString},
 				Set:      schema.HashString,
 			},
+
+			"project_id": {
+				Type:     schema.TypeString,
+				Optional: true,
+				ForceNew: true,
+				ConflictsWith: []string{
+					"name", "domain_id", "description", "enabled", "is_domain", "parent_id", "tags",
+				},
+			},
 		},
 	}
 }
@@ -85,43 +94,50 @@ func dataSourceIdentityProjectV3Read(ctx context.Context, d *schema.ResourceData
 		return diag.Errorf("Error creating OpenStack identity client: %s", err)
 	}
 
-	enabled := d.Get("enabled").(bool)
-	isDomain := d.Get("is_domain").(bool)
-	listOpts := projects.ListOpts{
-		DomainID: d.Get("domain_id").(string),
-		Enabled:  &enabled,
-		IsDomain: &isDomain,
-		Name:     d.Get("name").(string),
-		ParentID: d.Get("parent_id").(string),
-	}
-
-	var project projects.Project
 	var allProjects []projects.Project
-	allPages, err := projects.List(identityClient, listOpts).AllPages()
-	if err != nil {
-		userID := config.UserID
-		log.Printf("[DEBUG] Will try to find project with users.ListProjects as I am unable to query openstack_identity_project_v3: %s. Trying listing userprojects.", err)
-		if userID == "" {
-			tokenInfo, tokenErr := getTokenInfo(identityClient)
-			if tokenErr != nil {
-				return diag.Errorf("Error when getting token info: %s", err)
-			}
-			userID = tokenInfo.userID
-		}
-		// Search for all the projects using the users.ListProjects API call and filter them
-		allPages, err = users.ListProjects(identityClient, userID).AllPages()
+	if v := d.Get("project_id").(string); v != "" {
+		project, err := projects.Get(identityClient, v).Extract()
 		if err != nil {
 			return diag.Errorf("Unable to query openstack_identity_project_v3: %s", err)
 		}
-		allProjects, err = projects.ExtractProjects(allPages)
-		if err != nil {
-			return diag.Errorf("Unable to retrieve openstack_identity_project_v3: %s", err)
-		}
-		allProjects = filterProjects(allProjects, listOpts)
+		allProjects = append(allProjects, *project)
 	} else {
-		allProjects, err = projects.ExtractProjects(allPages)
+		enabled := d.Get("enabled").(bool)
+		isDomain := d.Get("is_domain").(bool)
+		listOpts := projects.ListOpts{
+			DomainID: d.Get("domain_id").(string),
+			Enabled:  &enabled,
+			IsDomain: &isDomain,
+			Name:     d.Get("name").(string),
+			ParentID: d.Get("parent_id").(string),
+		}
+
+		allPages, err := projects.List(identityClient, listOpts).AllPages()
 		if err != nil {
-			return diag.Errorf("Unable to retrieve openstack_identity_project_v3: %s", err)
+			userID := config.UserID
+			log.Printf("[DEBUG] Will try to find project with users.ListProjects as I am unable to query openstack_identity_project_v3: %s. Trying listing userprojects.", err)
+			if userID == "" {
+				tokenInfo, tokenErr := getTokenInfo(identityClient)
+				if tokenErr != nil {
+					return diag.Errorf("Error when getting token info: %s", err)
+				}
+				userID = tokenInfo.userID
+			}
+			// Search for all the projects using the users.ListProjects API call and filter them
+			allPages, err = users.ListProjects(identityClient, userID).AllPages()
+			if err != nil {
+				return diag.Errorf("Unable to query openstack_identity_project_v3: %s", err)
+			}
+			allProjects, err = projects.ExtractProjects(allPages)
+			if err != nil {
+				return diag.Errorf("Unable to retrieve openstack_identity_project_v3: %s", err)
+			}
+			allProjects = filterProjects(allProjects, listOpts)
+		} else {
+			allProjects, err = projects.ExtractProjects(allPages)
+			if err != nil {
+				return diag.Errorf("Unable to retrieve openstack_identity_project_v3: %s", err)
+			}
 		}
 	}
 
@@ -134,9 +150,7 @@ func dataSourceIdentityProjectV3Read(ctx context.Context, d *schema.ResourceData
 		return diag.Errorf("Your openstack_identity_project_v3 query returned more than one result %#v", allProjects)
 	}
 
-	project = allProjects[0]
-
-	dataSourceIdentityProjectV3Attributes(d, &project)
+	dataSourceIdentityProjectV3Attributes(d, &allProjects[0])
 
 	return nil
 }
@@ -146,6 +160,7 @@ func dataSourceIdentityProjectV3Attributes(d *schema.ResourceData, project *proj
 	log.Printf("[DEBUG] openstack_identity_project_v3 details: %#v", project)
 
 	d.SetId(project.ID)
+	d.Set("project_id", project.ID)
 	d.Set("is_domain", project.IsDomain)
 	d.Set("description", project.Description)
 	d.Set("domain_id", project.DomainID)

openstack/data_source_openstack_identity_project_v3_test.go

@@ -45,6 +45,42 @@ func TestAccOpenStackIdentityV3ProjectDataSource_basic(t *testing.T) {
 	})
 }
 
+func TestAccOpenStackIdentityV3ProjectDataSource_withProjectID(t *testing.T) {
+	projectName := fmt.Sprintf("tf_test_%s", acctest.RandString(5))
+	projectDescription := acctest.RandString(20)
+	projectTag1 := acctest.RandString(20)
+	projectTag2 := acctest.RandString(20)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheck(t)
+			testAccPreCheckAdminOnly(t)
+		},
+		ProviderFactories: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccOpenStackIdentityProjectV3DataSourceProject(projectName, projectDescription, projectTag1, projectTag2),
+			},
+			{
+				Config: testAccOpenStackIdentityProjectV3DataSourceWithProjectID(projectName, projectDescription, projectTag1, projectTag2),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckIdentityV3ProjectDataSourceID("data.openstack_identity_project_v3.project_1"),
+					resource.TestCheckResourceAttr(
+						"data.openstack_identity_project_v3.project_1", "name", projectName),
+					resource.TestCheckResourceAttr(
+						"openstack_identity_project_v3.project_1", "description", projectDescription),
+					resource.TestCheckResourceAttr(
+						"openstack_identity_project_v3.project_1", "enabled", "true"),
+					resource.TestCheckResourceAttr(
+						"openstack_identity_project_v3.project_1", "is_domain", "false"),
+					resource.TestCheckResourceAttr(
+						"openstack_identity_project_v3.project_1", "tags.#", "2"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckIdentityV3ProjectDataSourceID(n string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
@@ -79,3 +115,13 @@ func testAccOpenStackIdentityProjectV3DataSourceBasic(name, description, tag1, t
 	}
 `, testAccOpenStackIdentityProjectV3DataSourceProject(name, description, tag1, tag2))
 }
+
+func testAccOpenStackIdentityProjectV3DataSourceWithProjectID(name, description, tag1, tag2 string) string {
+	return fmt.Sprintf(`
+	%s
+
+	data "openstack_identity_project_v3" "project_1" {
+      project_id = "${openstack_identity_project_v3.project_1.id}"
+	}
+`, testAccOpenStackIdentityProjectV3DataSourceProject(name, description, tag1, tag2))
+}

website/docs/d/identity_project_v3.html.markdown

@@ -37,6 +37,9 @@ The following arguments are supported:
 
 * `tags` - (Optional) Tags for the project.
 
+* `project_id` - (Optional) The id of the project. Conflicts with any of the
+  above arguments.
+
 ## Attributes Reference
 
 `id` is set to the ID of the found project. In addition, the following attributes
@@ -49,4 +52,5 @@ are exported:
 * `name` - See Argument Reference above.
 * `parent_id` - See Argument Reference above.
 * `tags` - See Argument Reference above.
+* `project_id` - See Argument Reference above.
 * `region` - The region the project is located in.