Allow hyphens in configurable names, too, I guess.

Author: Paddy Carver

tfprotov5/tf5server/server.go

@@ -94,11 +94,11 @@ func WithoutLogLocation() ServeOpt {
 // logging environment variable that controls the provider's log level. It is
 // the part following TF_LOG_PROVIDER_ and defaults to the name part of the
 // provider's registry address, or disabled if it can't parse the provider's
-// registry address. Name must only contain letters and numbers.
+// registry address. Name must only contain letters, numbers, and hyphens.
 func WithLogEnvVarName(name string) ServeOpt {
 	return serveConfigFunc(func(in *ServeConfig) error {
-		if !regexp.MustCompile(`^[a-zA-Z0-9]+$`).MatchString(name) {
-			return errors.New("environment variable names can only contain a-z, A-Z, and 0-9")
+		if !regexp.MustCompile(`^[a-zA-Z0-9-]+$`).MatchString(name) {
+			return errors.New("environment variable names can only contain a-z, A-Z, 0-9, and -")
 		}
 		in.envVar = name
 		return nil
@@ -262,9 +262,10 @@ func New(name string, serve tfprotov5.ProviderServer, opts ...ServeOpt) tfplugin
 		if err != nil {
 			log.Println("[ERROR] Error parsing provider name:", err)
 		} else {
-			envVar = strings.ReplaceAll(addr.Type, "-", "_")
+			envVar = addr.Type
 		}
 	}
+	envVar = strings.ReplaceAll(envVar, "-", "_")
 	if envVar != "" {
 		options = append(options, tflog.WithLogName(envVar), tflog.WithLevelFromEnv("TF", "LOG", "PROVIDER", envVar))
 	}

tfprotov6/tf6server/server.go

@@ -94,11 +94,11 @@ func WithoutLogLocation() ServeOpt {
 // logging environment variable that controls the provider's log level. It is
 // the part following TF_LOG_PROVIDER_ and defaults to the name part of the
 // provider's registry address, or disabled if it can't parse the provider's
-// registry address. Name must only contain letters and numbers.
+// registry address. Name must only contain letters, numbers, and hyphens.
 func WithLogEnvVarName(name string) ServeOpt {
 	return serveConfigFunc(func(in *ServeConfig) error {
-		if !regexp.MustCompile(`^[a-zA-Z0-9]+$`).MatchString(name) {
-			return errors.New("environment variable names can only contain a-z, A-Z, and 0-9")
+		if !regexp.MustCompile(`^[a-zA-Z0-9-]+$`).MatchString(name) {
+			return errors.New("environment variable names can only contain a-z, A-Z, 0-9, and -")
 		}
 		in.envVar = name
 		return nil
@@ -263,9 +263,10 @@ func New(name string, serve tfprotov6.ProviderServer, opts ...ServeOpt) tfplugin
 		if err != nil {
 			log.Println("[ERROR] Error parsing provider name:", err)
 		} else {
-			envVar = strings.ReplaceAll(addr.Type, "-", "_")
+			envVar = addr.Type
 		}
 	}
+	envVar = strings.ReplaceAll(envVar, "-", "_")
 	if envVar != "" {
 		options = append(options, tflog.WithLogName(envVar), tflog.WithLevelFromEnv("TF", "LOG", "PROVIDER", envVar))
 	}