Export ProfileConfig.Name field

letsencrypt · Feb 17, 2024 · 800b3c5 · 800b3c5
1 parent cc026bb
commit 800b3c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/ca/ca.go b/ca/ca.go
@@ -110,8 +110,8 @@ func makeCertificateProfilesMap(origProfile *issuance.Profile, certProfiles []*i
 
 	profilesByName := make(map[string]*issuance.Profile, len(allProfiles))
 	for _, profile := range allProfiles {
-		if profilesByName[profile.Name()] == nil {
-			profilesByName[profile.Name()] = profile
+		if profilesByName[profile.Name] == nil {
+			profilesByName[profile.Name] = profile
 		} else {
 			return nil, fmt.Errorf("duplicate certificate profile name %+v", profile)
 		}

diff --git a/issuance/cert.go b/issuance/cert.go
@@ -28,7 +28,7 @@ import (
 
 // ProfileConfig describes the certificate issuance constraints for all issuers.
 type ProfileConfig struct {
-	name            string
+	Name            string
 	AllowMustStaple bool
 	AllowCTPoison   bool
 	AllowSCTList    bool
@@ -48,7 +48,7 @@ type PolicyConfig struct {
 
 // Profile is the validated structure created by reading in ProfileConfigs and IssuerConfigs
 type Profile struct {
-	name            string
+	Name            string
 	allowMustStaple bool
 	allowCTPoison   bool
 	allowSCTList    bool
@@ -60,11 +60,6 @@ type Profile struct {
 	lints lint.Registry
 }
 
-// Name gets the human-readable name of a certificate profile.
-func (p *Profile) Name() string {
-	return p.name
-}
-
 // NewProfile synthesizes the profile config and issuer config into a single
 // object, and checks various aspects for correctness.
 func NewProfile(profileConfig ProfileConfig, skipLints []string) (*Profile, error) {
@@ -74,11 +69,7 @@ func NewProfile(profileConfig ProfileConfig, skipLints []string) (*Profile, erro
 	}
 
 	sp := &Profile{
-		// TODO(@pgporada): Once the issuance.ProfileConfig name field is
-		// exported and we can begin using multiple profiles, allow for an
-		// operator to configure a profile name, but use a default name when one
-		// is not provided.
-		name:            "defaultCertificateProfileName",
+		Name:            "defaultCertificateProfileName",
 		allowMustStaple: profileConfig.AllowMustStaple,
 		allowCTPoison:   profileConfig.AllowCTPoison,
 		allowSCTList:    profileConfig.AllowSCTList,

diff --git a/issuance/issuer_test.go b/issuance/issuer_test.go
@@ -24,7 +24,7 @@ import (
 
 func defaultProfileConfig() ProfileConfig {
 	return ProfileConfig{
-		name:                "testCertProfileName",
+		Name:                "testCertProfileName",
 		AllowCommonName:     true,
 		AllowCTPoison:       true,
 		AllowSCTList:        true,