prefix tls flags with "tls-"

Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>
linka-cloud · Oct 8, 2023 · 0977e07 · 0977e07
1 parent 12b5e9e
commit 0977e07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cmd/artifact-registry/main.go b/cmd/artifact-registry/main.go
@@ -113,8 +113,8 @@ func main() {
 	cmd.Flags().BoolVar(&insecure, "insecure", insecure, "disable backend registry client tls verification")
 	cmd.Flags().BoolVar(&tagPerArtifact, "tag-artifacts", tagPerArtifact, "tag artifacts manifests")
 	cmd.Flags().StringVar(&clientCA, "client-ca", "", "tls client certificate authority")
-	cmd.Flags().StringVar(&cert, "cert", "", "tls certificate")
-	cmd.Flags().StringVar(&key, "key", "", "tls key")
+	cmd.Flags().StringVar(&cert, "tls-cert", "", "tls certificate")
+	cmd.Flags().StringVar(&key, "tls-key", "", "tls key")
 	if err := cmd.Execute(); err != nil {
 		logrus.Fatal(err)
 	}
@@ -162,6 +162,7 @@ func run(ctx context.Context, opts ...storage.Option) error {
 	if err := packages.Init(ctx, router, domain); err != nil {
 		return err
 	}
+	router.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {})
 
 	s := http.Server{
 		BaseContext: func(lis net.Listener) context.Context {

diff --git a/pkg/packages/provider.go b/pkg/packages/provider.go
@@ -69,7 +69,9 @@ func Init(ctx context.Context, r *mux.Router, domain string) error {
 		for _, v := range subs {
 			v.Use(mdlw)
 			for _, vv := range p.Routes() {
-				v.Path(vv.Path).Methods(vv.Method).HandlerFunc(vv.Handler)
+				if err := v.Path(vv.Path).Methods(vv.Method).HandlerFunc(vv.Handler).GetError(); err != nil {
+					return fmt.Errorf("%s: %q: %w", k, vv.Path, err)
+				}
 			}
 		}
 	}