Merge branch 'master' into pipeline-github-release-tool-fix

Venafi · Nov 11, 2024 · 3043e29 · 3043e29
2 parents 8863a70 + 0b9a778
commit 3043e29
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/README-PLAYBOOK.md b/README-PLAYBOOK.md
@@ -182,7 +182,7 @@ The top-level structure of the file is described as follows:
 | fields      | array of [CustomField](#customfield) objects | *Optional*     | - Sets the specified custom field on certificate object. Only valid when [Connection.platform](#connection) is `tpp`.                                                                                                                                                                                                                                                                                                                                                                                                           |
 | issuerHint  | string                                       | *Optional*     | - Used only when [Request.validDays](#request) is specified to determine the correct Specific End Date attribute to set on the TPP certificate object. Valid options are `DIGICERT`, `MICROSOFT`, `ENTRUST`, `ALL_ISSUERS`. If not defined, but `validDays` are set, the attribute 'Specific End Date' will be used. Only valid when [Connection.platform](#connection) is `tpp`.                                                                                                                                               |
 | keyCurve    | string                                       | ***Required*** | when [Request.keyType](#request) is `ECDSA`, `EC`, or `ECC`. Valid values are `P256`, `P384`, `P521`, `ED25519`.                                                                                                                                                                                                                                                                                                                                                                                                                |
-| keySize     | integer                                      | *Optional*     | - Specifies the key size when specified [Request.keyType](#request) is `RSA`. Supported values are `1024`, `2048`, `4096`, and `8192`. Defaults to 2048.                                                                                                                                                                                                                                                                                                                                                                        |
+| keySize     | integer                                      | *Optional*     | - Specifies the key size when specified [Request.keyType](#request) is `RSA`. Supported values are `1024`, `2048`, `3072`, `4096`, and `8192`. Defaults to 2048.                                                                                                                                                                                                                                                                                                                                                                        |
 | keyType     | string                                       | *Optional*     | - Specify the key type of the requested certificate. Valid options are `RSA`, `ECDSA`, `EC`, `ECC` and `ED25519`. Default is `RSA`.                                                                                                                                                                                                                                                                                                                                                                                             |
 | location    | [Location](#location) object                 | *Optional*     | - Use to provide the name/address of the compute instance and an identifier for the workload using the certificate. This results in a device (node) and application (workload) being associated with the certificate in the Venafi Platform.<br/>Example: `node:workload`.                                                                                                                                                                                                                                                      |
 | nickname    | string                                       | *Optional*     | - Specify the certificate object name to be created in TPP for the requested certificate. If not specified, TPP will use the [Subject.commonName](#subject). Only valid when [Connection.platform](#connection) is `tpp`.                                                                                                                                                                                                                                                                                                       |

diff --git a/cmd/vcert/validatorsCloud.go b/cmd/vcert/validatorsCloud.go
@@ -17,10 +17,10 @@ func validateConnectionFlagsCloud(commandName string) error {
 		emailPresent := flags.email != ""
 
 		if tokenURLPresent && !jwtPresent {
-			return fmt.Errorf("missing jwt for service account authentication. Set the jwt using --idp-jwt flag")
+			return fmt.Errorf("missing jwt for service account authentication. Set the jwt using --external-jwt flag")
 		}
 
-		advice := "Use --token-url/--idp-jwt for authentication or --email for registration"
+		advice := "Use --token-url/--external-jwt for authentication or --email for registration"
 		if !svcAccountPresent && !emailPresent {
 			return fmt.Errorf("missing flags for Venafi Cloud Platform authentication. %s", advice)
 		}