operator package cleanup

Author: Jeff McCormick

apiserver.go

@@ -19,6 +19,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	log "github.com/Sirupsen/logrus"
+	"github.com/crunchydata/postgres-operator/apiserver"
 	"github.com/crunchydata/postgres-operator/apiserver/backupservice"
 	"github.com/crunchydata/postgres-operator/apiserver/clusterservice"
 	"github.com/crunchydata/postgres-operator/apiserver/failoverservice"
@@ -66,6 +67,9 @@ func main() {
 	tlsNoVerify, _ := strconv.ParseBool(tmp)
 
 	log.Infoln("postgres-operator apiserver starts")
+
+	apiserver.Initialize()
+
 	r := mux.NewRouter()
 	r.HandleFunc("/version", versionservice.VersionHandler)
 	r.HandleFunc("/policies", policyservice.CreatePolicyHandler)

apiserver/loadservice/loadimpl.go

@@ -27,12 +27,9 @@ import (
 	"github.com/crunchydata/postgres-operator/kubeapi"
 	operutil "github.com/crunchydata/postgres-operator/util"
 	"github.com/spf13/viper"
-	"io/ioutil"
 	v1batch "k8s.io/api/batch/v1"
 	"k8s.io/apimachinery/pkg/labels"
-	"os"
 	"strings"
-	"text/template"
 )
 
 type loadJobTemplateFields struct {
@@ -54,37 +51,6 @@ type loadJobTemplateFields struct {
 // LoadConfig ...
 var LoadConfig string
 
-// LoadConfigTemplate ....
-var LoadConfigTemplate loadJobTemplateFields
-
-// LoadTemplatePath ...
-var LoadTemplatePath string
-
-// JobTemplate ...
-var JobTemplate *template.Template
-
-func init() {
-
-	log.Debug("loadimpl init called")
-
-	LoadTemplatePath = viper.GetString("Pgo.LoadTemplate")
-	if LoadTemplatePath == "" {
-		log.Error("Pgo.LoadTemplate not defined in pgo config 1.")
-		os.Exit(2)
-	}
-
-	//get the job template
-	var err error
-	var buf []byte
-
-	buf, err = ioutil.ReadFile(LoadTemplatePath)
-	if err != nil {
-		log.Error("error loading pgo-load job template..." + err.Error())
-		os.Exit(2)
-	}
-	JobTemplate = template.Must(template.New("pgo-load job template").Parse(string(buf)))
-}
-
 // Load ...
 // pgo load  --policies=jsonload --selector=name=mycluster --load-config=./sample-load-config.json
 func Load(request *msgs.LoadRequest) msgs.LoadResponse {
@@ -94,16 +60,7 @@ func Load(request *msgs.LoadRequest) msgs.LoadResponse {
 	resp.Status.Code = msgs.Ok
 	resp.Status.Msg = ""
 
-	/**
-	LoadTemplatePath = viper.GetString("Pgo.LoadTemplate")
-	if LoadTemplatePath == "" {
-		resp.Status.Code = msgs.Error
-		resp.Status.Msg = "Pgo.LoadTemplate not defined in pgo config 2."
-		return resp
-	}
-	*/
-
-	LoadConfigTemplate = loadJobTemplateFields{}
+	LoadConfigTemplate := loadJobTemplateFields{}
 
 	viper.SetConfigType("yaml")
 
@@ -163,8 +120,11 @@ func Load(request *msgs.LoadRequest) msgs.LoadResponse {
 
 	}
 
-	log.Debug("policies to apply before loading are %v\n", request.Policies)
-	policies := strings.Split(request.Policies, ",")
+	var policies []string
+	if request.Policies != "" {
+		policies = strings.Split(request.Policies, ",")
+	}
+	log.Debugf("policies to apply before loading are %v len=%d\n", request.Policies, len(policies))
 
 	for _, arg := range args {
 		for _, p := range policies {
@@ -178,12 +138,15 @@ func Load(request *msgs.LoadRequest) msgs.LoadResponse {
 			applyResp := policyservice.ApplyPolicy(&applyReq)
 			if applyResp.Status.Code != msgs.Ok {
 				log.Error("error in applying policy " + applyResp.Status.Msg)
+				resp.Status.Code = msgs.Error
+				resp.Status.Msg = err.Error()
+				return resp
 			}
 		}
 
 		//create the load job for this cluster
 		log.Debug("created load for " + arg)
-		err = createJob(arg, LoadConfigTemplate.FileType, LoadConfigTemplate.FilePath)
+		err = createJob(arg, &LoadConfigTemplate)
 		if err != nil {
 			resp.Status.Code = msgs.Error
 			resp.Status.Msg = err.Error()
@@ -196,21 +159,20 @@ func Load(request *msgs.LoadRequest) msgs.LoadResponse {
 
 }
 
-func createJob(clusterName, filetype, filepath string) error {
+func createJob(clusterName string, template *loadJobTemplateFields) error {
 	var err error
+
 	randStr := operutil.GenerateRandString(3)
-	LoadConfigTemplate.Name = "pgo-load-" + clusterName + "-" + randStr
-	LoadConfigTemplate.DbHost = clusterName
-	LoadConfigTemplate.FilePath = filepath
-	LoadConfigTemplate.FileType = filetype
-	LoadConfigTemplate.DbPass, err = operutil.GetSecretPassword(apiserver.Clientset, clusterName, crv1.RootSecretSuffix, apiserver.Namespace)
+	template.Name = "pgo-load-" + clusterName + "-" + randStr
+	template.DbHost = clusterName
+	template.DbPass, err = operutil.GetSecretPassword(apiserver.Clientset, clusterName, crv1.RootSecretSuffix, apiserver.Namespace)
 	if err != nil {
 		log.Error(err)
 		return err
 	}
 
 	var doc2 bytes.Buffer
-	err = JobTemplate.Execute(&doc2, LoadConfigTemplate)
+	err = apiserver.JobTemplate.Execute(&doc2, template)
 	if err != nil {
 		log.Error(err.Error())
 		return err

apiserver/perms.go

@@ -53,7 +53,7 @@ var PermMap map[string]string
 
 const pgorolePath = "/config/pgorole"
 
-func init() {
+func InitializePerms() {
 	PermMap = make(map[string]string)
 	RoleMap = make(map[string]map[string]string)
 

apiserver/pvcservice/pvcimpl.go

@@ -24,11 +24,9 @@ import (
 	"github.com/crunchydata/postgres-operator/util"
 	"github.com/spf13/viper"
 	"io"
-	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	//"k8s.io/client-go/pkg/api/v1"
 	"k8s.io/api/core/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"strings"
-	"text/template"
 	"time"
 )
 
@@ -40,12 +38,14 @@ type lspvcTemplateFields struct {
 	PVCName       string
 }
 
-var lspvcTemplate *template.Template
+//var lspvcTemplate *template.Template
 
-func init() {
+/**
+func Initialize() {
 	lspvcTemplate = util.LoadTemplate("/config/pgo.lspvc-template.json")
 
 }
+*/
 
 // ShowPVC ...
 func ShowPVC(pvcName, PVCRoot string) ([]string, error) {
@@ -119,7 +119,7 @@ func printPVCListing(pvcName, PVCRoot string) ([]string, error) {
 		PVCName:       pvcName,
 	}
 
-	err = lspvcTemplate.Execute(&doc2, pvcFields)
+	err = apiserver.LspvcTemplate.Execute(&doc2, pvcFields)
 	if err != nil {
 		log.Error(err.Error())
 		return newlines, err

apiserver/root.go

@@ -32,6 +32,7 @@ import (
 	"os"
 	"strconv"
 	"strings"
+	"text/template"
 )
 
 // pgouserPath ...
@@ -76,7 +77,10 @@ var Credentials map[string]CredentialDetail
 var StorageMap map[string]interface{}
 var ContainerResourcesMap map[string]interface{}
 
-func init() {
+var LspvcTemplate *template.Template
+var JobTemplate *template.Template
+
+func Initialize() {
 	BasicAuth = true
 	MetricsFlag = false
 	AuditFlag = false
@@ -87,6 +91,10 @@ func init() {
 
 	initConfig()
 
+	initTemplates()
+
+	InitializePerms()
+
 	ConnectToKube()
 
 }
@@ -102,7 +110,6 @@ func ConnectToKube() {
 		panic(err)
 	}
 
-	//Clientset, err = apiextensionsclient.NewForConfig(config)
 	Clientset, err = kubernetes.NewForConfig(config)
 	if err != nil {
 		panic(err)
@@ -216,8 +223,6 @@ func parseUserMap(dat string) CredentialDetail {
 	creds := CredentialDetail{}
 
 	fields := strings.Split(strings.TrimSpace(dat), ":")
-	//log.Infof("%v\n", fields)
-	//log.Infof("username=[%s] password=[%s] role=[%s]\n", fields[0], fields[1], fields[2])
 	creds.Username = fields[0]
 	creds.Password = fields[1]
 	creds.Role = fields[2]
@@ -427,3 +432,16 @@ func IsValidContainerResourceValues() bool {
 	}
 	return true
 }
+
+func initTemplates() {
+	LspvcTemplate = util.LoadTemplate("/config/pgo.lspvc-template.json")
+
+	LoadTemplatePath := viper.GetString("Pgo.LoadTemplate")
+	if LoadTemplatePath == "" {
+		log.Error("Pgo.LoadTemplate not defined in pgo config 1.")
+		os.Exit(2)
+	}
+
+	JobTemplate = util.LoadTemplate(LoadTemplatePath)
+
+}

apiserver/userservice/userimpl.go

@@ -53,10 +53,6 @@ var defaultPasswordAgeDays = 365
 // defaultPasswordLength password length
 var defaultPasswordLength = 8
 
-func init() {
-	getDefaults()
-}
-
 //  User ...
 // pgo user --change-password=bob --db=userdb
 //  --expired=7 --managed=true --selector=env=research --update-passwords=true
@@ -68,6 +64,8 @@ func User(request *msgs.UserRequest) msgs.UserResponse {
 	resp.Status.Msg = ""
 	resp.Results = make([]string, 0)
 
+	getDefaults()
+
 	//set up the selector
 	var sel string
 	if request.Selector != "" {
@@ -436,6 +434,8 @@ func CreateUser(request *msgs.CreateUserRequest) msgs.CreateUserResponse {
 	resp.Status.Msg = ""
 	resp.Results = make([]string, 0)
 
+	getDefaults()
+
 	log.Debug("createUser selector is " + request.Selector)
 	if request.Selector == "" {
 		log.Error("--selector value is empty not allowed")