Pre-compile S3 Repo Type RegEx

The regex used to determine if an S3 restore was requested for
bootstrapping a new cluster is now precompiled in order to  simplify
error checking and handling when the S3RepoTypeCLIOptionExists
function is used.

Author: andrewlecuyer

internal/apiserver/clusterservice/clusterimpl.go

@@ -2145,10 +2145,7 @@ func validateDataSourceParms(request *msgs.CreateClusterRequest) error {
 
 	// now detect if an 's3' repo type was specified via the restore opts, and if so verify that s3
 	// settings are present in backrest repo secret for the backup being restored from
-	s3Restore, err := backrest.S3RepoTypeCLIOptionExists(restoreOpts)
-	if err != nil {
-		return fmt.Errorf("%s: %w", ErrInvalidDataSource, err)
-	}
+	s3Restore := backrest.S3RepoTypeCLIOptionExists(restoreOpts)
 	if s3Restore && isMissingExistingDataSourceS3Config(backrestRepoSecret) {
 		return fmt.Errorf("Secret %s is missing the S3 configuration required to restore "+
 			"from an S3 repository", backrestRepoSecret.GetName())

internal/operator/backrest/repo.go

@@ -38,9 +38,9 @@ import (
 	"k8s.io/client-go/rest"
 )
 
-// S3RepoTypeRegexString defines a regex to detect if an S3 restore has been specified using the
+// s3RepoTypeRegex defines a regex to detect if an S3 restore has been specified using the
 // pgBackRest --repo-type option
-const S3RepoTypeRegexString = `--repo-type=["']?s3["']?`
+var s3RepoTypeRegex = regexp.MustCompile(`--repo-type=["']?s3["']?`)
 
 type RepoDeploymentTemplateFields struct {
 	SecurityContext           string
@@ -188,10 +188,7 @@ func setBootstrapRepoOverrides(clientset kubernetes.Interface, cluster *crv1.Pgc
 
 	// if an s3 restore is detected, override or set the pgbackrest S3 env vars, otherwise do
 	// not set the s3 env vars at all
-	s3Restore, err := S3RepoTypeCLIOptionExists(cluster.Spec.PGDataSource.RestoreOpts)
-	if err != nil {
-		return err
-	}
+	s3Restore := S3RepoTypeCLIOptionExists(cluster.Spec.PGDataSource.RestoreOpts)
 	if s3Restore {
 		// Now override any backrest S3 env vars for the bootstrap job
 		repoFields.PgbackrestS3EnvVars = operator.GetPgbackrestBootstrapS3EnvVars(cluster,
@@ -303,10 +300,6 @@ func createService(clientset kubernetes.Interface, fields *RepoServiceTemplateFi
 
 // S3RepoTypeCLIOptionExists detects if a S3 restore was requested via the '--repo-type'
 // command line option
-func S3RepoTypeCLIOptionExists(opts string) (exists bool, err error) {
-	exists, err = regexp.MatchString(S3RepoTypeRegexString, opts)
-	if err != nil {
-		return false, err
-	}
-	return exists, nil
+func S3RepoTypeCLIOptionExists(opts string) bool {
+	return s3RepoTypeRegex.MatchString(opts)
 }

internal/operator/cluster/clusterlogic.go

@@ -243,10 +243,7 @@ func getBootstrapJobFields(clientset kubernetes.Interface, client *rest.RESTClie
 
 	// if an s3 restore is detected, override or set the pgbackrest S3 env vars, otherwise do
 	// not set the s3 env vars at all
-	s3Restore, err := backrest.S3RepoTypeCLIOptionExists(cluster.Spec.PGDataSource.RestoreOpts)
-	if err != nil {
-		return bootstrapFields, err
-	}
+	s3Restore := backrest.S3RepoTypeCLIOptionExists(cluster.Spec.PGDataSource.RestoreOpts)
 	if s3Restore {
 		// Now override any backrest S3 env vars for the bootstrap job
 		bootstrapFields.PgbackrestS3EnvVars = operator.GetPgbackrestBootstrapS3EnvVars(cluster,