update to only sanitize package name

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

Author: everettraven

pkg/quarkus/v1alpha/init.go

@@ -21,7 +21,6 @@ import (
 	"strings"
 
 	"github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/scaffolds"
-	"github.com/operator-framework/java-operator-plugins/pkg/quarkus/v1alpha/util"
 	"github.com/spf13/pflag"
 	"k8s.io/apimachinery/pkg/util/validation"
 
@@ -47,12 +46,11 @@ type initSubcommand struct {
 	commandName string
 
 	// Flags
-	group          string
-	domain         string
-	version        string
-	kind           string
-	projectName    string
-	sanitizeDomain bool
+	group       string
+	domain      string
+	version     string
+	kind        string
+	projectName string
 }
 
 var (
@@ -79,20 +77,13 @@ func (p *initSubcommand) BindFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&p.group, groupFlag, "", "resource Group")
 	fs.StringVar(&p.version, versionFlag, "", "resource Version")
 	fs.StringVar(&p.kind, kindFlag, "", "resource Kind")
-
-	fs.BoolVar(&p.sanitizeDomain, "sanitize-domain", true, "whether or not the domain should be sanitized to produce a legal Java package name")
 	p.apiSubcommand.BindFlags(fs)
 }
 
 func (p *initSubcommand) InjectConfig(c config.Config) error {
 	p.config = c
 
-	domain := p.domain
-
-	if p.sanitizeDomain {
-		domain = util.SanitizeDomain(p.domain)
-	}
-	if err := p.config.SetDomain(domain); err != nil {
+	if err := p.config.SetDomain(p.domain); err != nil {
 		return err
 	}
 

pkg/quarkus/v1alpha/init_test.go

@@ -35,8 +35,7 @@ var _ = Describe("v1", func() {
 
 	BeforeEach(func() {
 		successInitSubcommand = initSubcommand{
-			domain:         "testDomain",
-			sanitizeDomain: true,
+			domain: "testDomain",
 		}
 
 		failureInitSubcommand = initSubcommand{
@@ -67,7 +66,6 @@ var _ = Describe("v1", func() {
 			Expect(successInitSubcommand.group).To(Equal(""))
 			Expect(successInitSubcommand.version).To(Equal(""))
 			Expect(successInitSubcommand.kind).To(Equal(""))
-			Expect(successInitSubcommand.sanitizeDomain).To(BeTrue())
 		})
 	})
 

pkg/quarkus/v1alpha/scaffolds/api.go

@@ -62,19 +62,19 @@ func (s *apiScaffolder) Scaffold() error {
 	var createAPITemplates []machinery.Builder
 	createAPITemplates = append(createAPITemplates,
 		&model.Model{
-			Package:   util.ReverseDomain(s.config.GetDomain()),
+			Package:   util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())),
 			ClassName: util.ToClassname(s.resource.Kind),
 		},
 		&model.ModelSpec{
-			Package:   util.ReverseDomain(s.config.GetDomain()),
+			Package:   util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())),
 			ClassName: util.ToClassname(s.resource.Kind),
 		},
 		&model.ModelStatus{
-			Package:   util.ReverseDomain(s.config.GetDomain()),
+			Package:   util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())),
 			ClassName: util.ToClassname(s.resource.Kind),
 		},
 		&controller.Controller{
-			Package:   util.ReverseDomain(s.config.GetDomain()),
+			Package:   util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())),
 			ClassName: util.ToClassname(s.resource.Kind),
 		},
 	)

pkg/quarkus/v1alpha/scaffolds/init.go

@@ -71,7 +71,7 @@ func (s *initScaffolder) Scaffold() error {
 	}
 	return scaffold.Execute(
 		&templates.PomXmlFile{
-			Package:         util.ReverseDomain(s.config.GetDomain()),
+			Package:         util.ReverseDomain(util.SanitizeDomain(s.config.GetDomain())),
 			ProjectName:     s.config.GetProjectName(),
 			OperatorVersion: "0.0.1",
 		},