feat: rename backend classes

backend/pki-service/cmd/run.go

@@ -31,7 +31,7 @@ var runCmd = &cobra.Command{
 		}
 
 		// load Sectigo config
-		var sectigoCfg cfg.SectigoConfiguration
+		var sectigoCfg cfg.PKIConfiguration
 		if err := viper.Unmarshal(&sectigoCfg); err != nil {
 			logger.Panic("config unmarshal failed", zap.Error(err))
 		}
@@ -121,5 +121,7 @@ func init() {
 	runCmd.Flags().String("mail_from", "", "The mail from")
 	runCmd.Flags().String("acme_storage", "", "Storage for the internal acme client")
 	runCmd.Flags().String("acme_email", "", "Email for the acme client")
+	runCmd.Flags().String("acme_eab", "", "EAB for the acme client")
+	runCmd.Flags().String("acme_key", "", "Key for the acme client")
 	runCmd.Flags().String("dns_configs", "", "Config file for the dns provider")
 }

backend/pki-service/cmd/sync.go

@@ -25,7 +25,7 @@ var syncCmd = &cobra.Command{
 		defer deferFunc(logger)
 
 		// load HTTP server config
-		var sectigoCfg cfg.SectigoConfiguration
+		var sectigoCfg cfg.PKIConfiguration
 		if err := viper.Unmarshal(&sectigoCfg); err != nil {
 			logger.Panic("config unmarshal failed", zap.Error(err))
 		}

backend/pki-service/pkg/cfg/sectigo.go

@@ -9,8 +9,8 @@ import (
 	"go.uber.org/zap"
 )
 
-// SectigoConfiguration handles different configuration properties for the sectigo client
-type SectigoConfiguration struct {
+// PKIConfiguration handles different configuration properties for the sectigo client
+type PKIConfiguration struct {
 	User                 string `mapstructure:"sectigo_user"`
 	Password             string `mapstructure:"sectigo_password"`
 	CustomerURI          string `mapstructure:"sectigo_customeruri"`
@@ -26,11 +26,13 @@ type SectigoConfiguration struct {
 	SmimeKeyType         string `mapstructure:"smime_key_type"`
 	AcmeStorage          string `mapstructure:"acme_storage"`
 	AcmeEmail            string `mapstructure:"acme_email"`
+	AcmeEab              string `mapstructure:"acme_eab"`
+	AcmeKey              string `mapstructure:"acme_key"`
 	DnsConfigs           string `mapstructure:"dns_configs"`
 }
 
 // CheckSectigoConfiguration checks the sectigo configuration for the syntactical correctness.
-func (cfg *SectigoConfiguration) CheckSectigoConfiguration() {
+func (cfg *PKIConfiguration) CheckSectigoConfiguration() {
 
 	logger := zap.L()
 

backend/pki-service/pkg/grpc/server.go

@@ -29,7 +29,7 @@ import (
 type Server struct {
 	logger     *zap.Logger
 	config     *Config
-	sectigoCfg *cfg.SectigoConfiguration
+	sectigoCfg *cfg.PKIConfiguration
 	db         *ent.Client
 }
 
@@ -41,7 +41,7 @@ type Config struct {
 }
 
 // NewServer creates a new GRPC server
-func NewServer(config *Config, logger *zap.Logger, sectigoCfg *cfg.SectigoConfiguration, db *ent.Client) (*Server, error) {
+func NewServer(config *Config, logger *zap.Logger, sectigoCfg *cfg.PKIConfiguration, db *ent.Client) (*Server, error) {
 	srv := &Server{
 		logger:     logger,
 		sectigoCfg: sectigoCfg,

backend/pki-service/pkg/grpc/smime.go

@@ -27,11 +27,11 @@ import (
 type smimeAPIServer struct {
 	pb.UnimplementedSmimeServiceServer
 	client *sectigo.Client
-	cfg    *cfg.SectigoConfiguration
+	cfg    *cfg.PKIConfiguration
 	logger *zap.Logger
 }
 
-func newSmimeAPIServer(client *sectigo.Client, cfg *cfg.SectigoConfiguration) *smimeAPIServer {
+func newSmimeAPIServer(client *sectigo.Client, cfg *cfg.PKIConfiguration) *smimeAPIServer {
 	return &smimeAPIServer{client: client, cfg: cfg, logger: zap.L()}
 }
 

backend/pki-service/pkg/grpc/ssl.go

@@ -95,15 +95,16 @@ type sslAPIServer struct {
 	pb.UnimplementedSSLServiceServer
 	client     *sectigo.Client
 	db         *ent.Client
-	cfg        *cfg.SectigoConfiguration
+	cfg        *cfg.PKIConfiguration
 	logger     *zap.Logger
 	legoClient *lego.Client
 
 	last     *time.Time
 	duration *time.Duration
 }
 
-func newSslAPIServer(client *sectigo.Client, cfg *cfg.SectigoConfiguration, db *ent.Client) *sslAPIServer {
+func newSslAPIServer(client *sectigo.Client, cfg *cfg.PKIConfiguration, db *ent.Client) *sslAPIServer {
+
 	legoClient := registerAcme(cfg)
 	instance := &sslAPIServer{client: client, legoClient: legoClient, cfg: cfg, logger: zap.L(), db: db}
 	_ = promauto.NewGaugeFunc(prometheus.GaugeOpts{
@@ -112,6 +113,7 @@ func newSslAPIServer(client *sectigo.Client, cfg *cfg.SectigoConfiguration, db *
 	}, func() float64 {
 		if instance.duration != nil {
 			return instance.duration.Seconds()
+		}
 		return 0
 	})
 
@@ -128,7 +130,7 @@ func newSslAPIServer(client *sectigo.Client, cfg *cfg.SectigoConfiguration, db *
 	return instance
 }
 
-func registerAcme(cfg *cfg.SectigoConfiguration) *lego.Client {
+func registerAcme(cfg *cfg.PKIConfiguration) *lego.Client {
 	accountFile := filepath.Join(cfg.AcmeStorage, "reg.json")
 	keyFile := filepath.Join(cfg.AcmeStorage, "reg.key")
 
@@ -310,7 +312,7 @@ func (s *sslAPIServer) IssueCertificate(ctx context.Context, req *pb.IssueSslReq
 
 	resp, err := s.legoClient.Certificate.ObtainForCSR(legoCert.ObtainForCSRRequest{CSR: csr, Bundle: true})
 	if err != nil {
-		return s.handleError("Error while obtaining certificate", err, logger)
+		return s.handleError("Error while obtaining certificate", err, logger, hub)
 	}
 	hub.AddBreadcrumb(&sentry.Breadcrumb{Message: "Certificate collected", Category: "info", Level: sentry.LevelInfo}, nil)
 	stop := time.Now()