Skip to content

Commit

Permalink
Update google_folder import description (#5325)
Browse files Browse the repository at this point in the history
* Allow domain mapping to succeed if DNS is pending

Signed-off-by: Modular Magician <[email protected]>

* Updated google_folder.html (#4149)

* Updated google_folder.html

The page in the first example shows that you should use organization_id with value of 1234567. In the Import example, it's not clear whether organization_id is user, or folder_id is used. API call behind this import command is only accepting folder_id (can be checked when setting TF_LOG to trace and viewing the API call)

* Update website/docs/r/google_folder.html.markdown

Co-Authored-By: Dana Hoffman <[email protected]>

Co-authored-by: Dana Hoffman <[email protected]>

* add google_kms_secret_ciphertext resource, deprecate datasource (#5314)

Signed-off-by: Modular Magician <[email protected]>

Co-authored-by: Dana Hoffman <[email protected]>

* Update google_folder import description (#2924)

Merged PR #2924.

Co-authored-by: Chris Stephens <[email protected]>
Co-authored-by: Petar Marinkovic <[email protected]>
Co-authored-by: Dana Hoffman <[email protected]>
  • Loading branch information
4 people authored Jan 7, 2020
1 parent fb98676 commit fc38db6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .changelog/2924.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
2 changes: 1 addition & 1 deletion website/docs/r/google_folder.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ exported:

## Import

Folders can be imported using the folder autogenerated `name`, e.g.
Folders can be imported using the folder's id, e.g.

```
# Both syntaxes are valid
Expand Down

0 comments on commit fc38db6

Please sign in to comment.