Backport of cli: fix tls ca create command with -domain into release/1.7.x

.changelog/19892.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+cli: Fixed a bug where the `nomad tls ca create` command failed when the `-domain` was used without other values
+```

command/tls_ca_create.go

@@ -147,9 +147,9 @@ func (c *TLSCACreateCommand) Run(args []string) int {
 	flagSet := c.Meta.FlagSet(c.Name(), FlagSetClient)
 	flagSet.Usage = func() { c.Ui.Output(c.Help()) }
 	flagSet.Var(&c.additionalDomain, "additional-domain", "")
-	flagSet.IntVar(&c.days, "days", 0, "")
+	flagSet.IntVar(&c.days, "days", 1825, "")
 	flagSet.BoolVar(&c.constraint, "name-constraint", false, "")
-	flagSet.StringVar(&c.domain, "domain", "", "")
+	flagSet.StringVar(&c.domain, "domain", "nomad", "")
 	flagSet.StringVar(&c.commonName, "common-name", "", "")
 	flagSet.StringVar(&c.country, "country", "", "")
 	flagSet.StringVar(&c.postalCode, "postal-code", "", "")
@@ -169,9 +169,7 @@ func (c *TLSCACreateCommand) Run(args []string) int {
 		c.Ui.Error(commandErrorText(c))
 		return 1
 	}
-	if c.IsCustom() && c.days != 0 || c.IsCustom() {
-		c.domain = "nomad"
-	} else {
+	if c.IsCustom() {
 		if c.commonName == "" {
 			c.Ui.Error("Please provide the -common-name flag when customizing the CA")
 			c.Ui.Error(commandErrorText(c))
@@ -261,13 +259,12 @@ func (c *TLSCACreateCommand) Run(args []string) int {
 // IsCustom checks whether any of TLSCACreateCommand parameters have been populated with
 // non-default values.
 func (c *TLSCACreateCommand) IsCustom() bool {
-	return c.commonName == "" &&
-		c.country == "" &&
-		c.postalCode == "" &&
-		c.province == "" &&
-		c.locality == "" &&
-		c.streetAddress == "" &&
-		c.organization == "" &&
-		c.organizationalUnit == ""
-
+	return c.commonName != "" ||
+		c.country != "" ||
+		c.postalCode != "" ||
+		c.province != "" ||
+		c.locality != "" ||
+		c.streetAddress != "" ||
+		c.organization != "" ||
+		c.organizationalUnit != ""
 }

command/tls_ca_create_test.go

@@ -40,6 +40,17 @@ func TestCACreateCommand(t *testing.T) {
 				require.Len(t, cert.PermittedDNSDomains, 0)
 			},
 		},
+		{"ca custom domain",
+			[]string{
+				"-name-constraint=true",
+				"-domain=foo.com",
+			},
+			"foo.com-agent-ca.pem",
+			"foo.com-agent-ca-key.pem",
+			func(t *testing.T, cert *x509.Certificate) {
+				require.ElementsMatch(t, cert.PermittedDNSDomains, []string{"nomad", "foo.com", "localhost"})
+			},
+		},
 		{"ca options",
 			[]string{
 				"-days=365",

helper/tlsutil/generate.go

@@ -88,17 +88,17 @@ type CertOpts struct {
 	ExtKeyUsage []x509.ExtKeyUsage
 }
 
-// IsNotCustom checks whether any of CAOpts parameters have been populated with
+// IsCustom checks whether any of CAOpts parameters have been populated with
 // non-default values.
-func (c *CAOpts) IsNotCustom() bool {
-	return c.Country == "" &&
-		c.PostalCode == "" &&
-		c.Province == "" &&
-		c.Locality == "" &&
-		c.StreetAddress == "" &&
-		c.Organization == "" &&
-		c.OrganizationalUnit == "" &&
-		c.Name == ""
+func (c *CAOpts) IsCustom() bool {
+	return c.Country != "" ||
+		c.PostalCode != "" ||
+		c.Province != "" ||
+		c.Locality != "" ||
+		c.StreetAddress != "" ||
+		c.Organization != "" ||
+		c.OrganizationalUnit != "" ||
+		c.Name != ""
 }
 
 // GenerateCA generates a new CA for agent TLS (not to be confused with Connect TLS)
@@ -131,19 +131,11 @@ func GenerateCA(opts CAOpts) (string, string, error) {
 		}
 	}
 
-	if opts.IsNotCustom() {
-		opts.Name = fmt.Sprintf("Nomad Agent CA %d", sn)
-		if opts.Days == 0 {
-			opts.Days = 1825
-		}
-		opts.Country = "US"
-		opts.PostalCode = "94105"
-		opts.Province = "CA"
-		opts.Locality = "San Francisco"
-		opts.StreetAddress = "101 Second Street"
-		opts.Organization = "HashiCorp Inc."
-		opts.OrganizationalUnit = "Nomad"
-	} else {
+	if opts.Days == 0 {
+		opts.Days = 1825
+	}
+
+	if opts.IsCustom() {
 		if opts.Name == "" {
 			return "", "", errors.New("common name value not provided")
 		} else {
@@ -160,6 +152,15 @@ func GenerateCA(opts CAOpts) (string, string, error) {
 		if opts.OrganizationalUnit == "" {
 			return "", "", errors.New("organizational unit value not provided")
 		}
+	} else {
+		opts.Name = fmt.Sprintf("Nomad Agent CA %d", sn)
+		opts.Country = "US"
+		opts.PostalCode = "94105"
+		opts.Province = "CA"
+		opts.Locality = "San Francisco"
+		opts.StreetAddress = "101 Second Street"
+		opts.Organization = "HashiCorp Inc."
+		opts.OrganizationalUnit = "Nomad"
 	}
 
 	// Create the CA cert