Extract cmd/ceremony into a separate binary (#6999)

aarongable · web-flow · commit 098176879343 · 2023-07-14T15:34:23.000-04:00
Fixes #6936
diff --git a/cmd/boulder/main.go b/cmd/boulder/main.go
@@ -16,7 +16,6 @@ import (
 	_ "github.com/letsencrypt/boulder/cmd/boulder-va"
 	_ "github.com/letsencrypt/boulder/cmd/boulder-wfe2"
 	_ "github.com/letsencrypt/boulder/cmd/caa-log-checker"
-	_ "github.com/letsencrypt/boulder/cmd/ceremony"
 	_ "github.com/letsencrypt/boulder/cmd/cert-checker"
 	_ "github.com/letsencrypt/boulder/cmd/contact-auditor"
 	_ "github.com/letsencrypt/boulder/cmd/crl-checker"
diff --git a/cmd/ceremony/cert.go b/cmd/ceremony/cert.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto"
diff --git a/cmd/ceremony/cert_test.go b/cmd/ceremony/cert_test.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"bytes"
diff --git a/cmd/ceremony/crl.go b/cmd/ceremony/crl.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto"
diff --git a/cmd/ceremony/crl_test.go b/cmd/ceremony/crl_test.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto"
diff --git a/cmd/ceremony/ecdsa.go b/cmd/ceremony/ecdsa.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto/ecdsa"
diff --git a/cmd/ceremony/ecdsa_test.go b/cmd/ceremony/ecdsa_test.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto/ecdsa"
diff --git a/cmd/ceremony/file.go b/cmd/ceremony/file.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import "os"
 
diff --git a/cmd/ceremony/file_test.go b/cmd/ceremony/file_test.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"testing"
diff --git a/cmd/ceremony/key.go b/cmd/ceremony/key.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto"
diff --git a/cmd/ceremony/key_test.go b/cmd/ceremony/key_test.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto"
diff --git a/cmd/ceremony/main.go b/cmd/ceremony/main.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"bytes"
@@ -14,7 +14,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/letsencrypt/boulder/cmd"
 	"github.com/letsencrypt/boulder/crl/crl_x509"
 	"github.com/letsencrypt/boulder/linter"
 	"github.com/letsencrypt/boulder/pkcs11helpers"
@@ -836,7 +835,3 @@ func main() {
 		log.Fatalf("unknown ceremony-type, must be one of: root, intermediate, ocsp-signer, crl-signer, key, ocsp-response")
 	}
 }
-
-func init() {
-	cmd.RegisterCommand("ceremony", main, nil)
-}
diff --git a/cmd/ceremony/main_test.go b/cmd/ceremony/main_test.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"strings"
diff --git a/cmd/ceremony/ocsp.go b/cmd/ceremony/ocsp.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto"
diff --git a/cmd/ceremony/ocsp_test.go b/cmd/ceremony/ocsp_test.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto/ecdsa"
diff --git a/cmd/ceremony/rsa.go b/cmd/ceremony/rsa.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto/rsa"
diff --git a/cmd/ceremony/rsa_test.go b/cmd/ceremony/rsa_test.go
@@ -1,4 +1,4 @@
-package notmain
+package main
 
 import (
 	"crypto"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package notmain`
	`1`	`+package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"crypto"`