Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added descriptions and formatted #3686

Merged
merged 3 commits into from
Jun 26, 2020
Merged

added descriptions and formatted #3686

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4c5ed7
added descriptions and formatted
trodge Jun 18, 2020
8ab0e48
Update third_party/terraform/resources/resource_google_service_accoun…
trodge Jun 26, 2020
923aa6b
Update third_party/terraform/resources/resource_google_service_accoun…
trodge Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions third_party/terraform/resources/resource_google_service_account_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ func resourceGoogleServiceAccountKey() *schema.Resource {
Schema: map[string]*schema.Schema{
// Required
"service_account_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: `The ID of the parent service account of the key. This can be a string in the format {ACCOUNT} or projects/{PROJECT_ID}/serviceAccounts/{ACCOUNT}, where {ACCOUNT} is the email address or unique id of the service account. If the {ACCOUNT} syntax is used, the project will be inferred from the account.`,
},
// Optional
"key_algorithm": {
Expand All @@ -29,6 +30,7 @@ func resourceGoogleServiceAccountKey() *schema.Resource {
Optional: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{"KEY_ALG_UNSPECIFIED", "KEY_ALG_RSA_1024", "KEY_ALG_RSA_2048"}, false),
Description: `The algorithm used to generate the key, used only on create. KEY_ALG_RSA_2048 is the default algorithm. Valid values are: "KEY_ALG_RSA_1024", "KEY_ALG_RSA_2048".`,
},
"pgp_key": {
Type: schema.TypeString,
Expand All @@ -52,27 +54,32 @@ func resourceGoogleServiceAccountKey() *schema.Resource {
},
// Computed
"name": {
Type: schema.TypeString,
Computed: true,
ForceNew: true,
Type: schema.TypeString,
Computed: true,
ForceNew: true,
Description: `The name used for this key pair`,
},
"public_key": {
Type: schema.TypeString,
Computed: true,
ForceNew: true,
Type: schema.TypeString,
Computed: true,
ForceNew: true,
Description: `The public key, base64 encoded`,
},
"private_key": {
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Type: schema.TypeString,
Computed: true,
Sensitive: true,
Description: `The private key in JSON format, base64 encoded. This is what you normally get as a file when creating service account keys through the CLI or web console. This is only populated when creating a new key.`,
},
"valid_after": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Description: `The key can be used after this timestamp. A timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds. Example: "2014-10-02T15:01:23.045123456Z".`,
},
"valid_before": {
Type: schema.TypeString,
Computed: true,
Type: schema.TypeString,
Computed: true,
Description: `The key can be used before this timestamp. A timestamp in RFC3339 UTC "Zulu" format, accurate to nanoseconds. Example: "2014-10-02T15:01:23.045123456Z".`,
},
"private_key_encrypted": {
Type: schema.TypeString,
Expand Down