Move the schema/ package to the toplevel

Today, we have *three* Go modules in this repository:

- /
- schema/
- mantle/

And as of recently, both the toplevel / and mantle/ vendor the schema/.
This causes "vendor amplification", where a vendored dependency
of schema/ gets *triplicated*.

Now that gangplank/ is out of the picture, it makes sense to move
the bits from schema/ into the toplevel module.

This really helps make operating on coreos-assembler stuff
feel like a "first class" operation.

Also, we no longer have two copies of the schema file!

Author: cgwalters

.github/workflows/lints.yml

@@ -36,9 +36,3 @@ jobs:
           version: v1.46.2
           working-directory: mantle
           args: --timeout=5m
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
-        with:
-          version: v1.46.2
-          working-directory: schema
-          args: --timeout=5m

Makefile

@@ -23,7 +23,7 @@ tests_checked:=$(patsubst tests/%,tests/.%.shellchecked,${tests})
 cwd:=$(shell find . -maxdepth 1 -type f -executable -print)
 cwd_checked:=$(patsubst ./%,.%.shellchecked,${cwd})
 GOARCH:=$(shell uname -m)
-export COSA_META_SCHEMA:=$(shell pwd)/src/v1.json
+export COSA_META_SCHEMA:=$(shell pwd)/schema/v1.json
 ifeq ($(GOARCH),x86_64)
         GOARCH="amd64"
 else ifeq ($(GOARCH),aarch64)
@@ -86,22 +86,19 @@ schema:
 	$(MAKE) -C schema
 
 # To update the coreos-assembler schema:
-# Edit src/v1.json
-# $ cp src/v1.json schema/
+# Edit schema/v1.json
 # $ make schema
 # $ (cd mantle && go mod vendor)
 .PHONY: schema-check
-schema-check: DIGEST = $(shell sha256sum src/v1.json | awk '{print $$1}')
+schema-check: DIGEST = $(shell sha256sum schema/v1.json | awk '{print $$1}')
 schema-check:
-	# Are the JSON Schema copies synced with each other?
-	diff -u src/v1.json schema/v1.json
 	# Is the generated Go code synced with the schema?
-	grep -q "$(DIGEST)" schema/cosa/cosa_v1.go
-	grep -q "$(DIGEST)" schema/cosa/schema_doc.go
+	grep -q "$(DIGEST)" pkg/builds/cosa_v1.go
+	grep -q "$(DIGEST)" pkg/builds/schema_doc.go
 	# Are the vendored copies of the generated code synced with the
 	# canonical ones?
-	diff -u mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go schema/cosa/cosa_v1.go
-	diff -u mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go schema/cosa/schema_doc.go
+	diff -u mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/cosa_v1.go pkg/builds/cosa_v1.go
+	diff -u mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/schema_doc.go pkg/builds/schema_doc.go
 
 install:
 	install -d $(DESTDIR)$(PREFIX)/lib/coreos-assembler
@@ -111,6 +108,7 @@ install:
 	cp -df -t $(DESTDIR)$(PREFIX)/lib/coreos-assembler/ci $$(find ci/ -maxdepth 1 -type f)
 	install -d $(DESTDIR)$(PREFIX)/lib/coreos-assembler/cosalib
 	install -D -t $(DESTDIR)$(PREFIX)/lib/coreos-assembler/cosalib $$(find src/cosalib/ -maxdepth 1 -type f)
+	install -t $(DESTDIR)$(PREFIX)/lib/coreos-assembler schema/v1.json
 	install -d $(DESTDIR)$(PREFIX)/bin
 	install bin/coreos-assembler $(DESTDIR)$(PREFIX)/bin/
 	ln -sf ../lib/coreos-assembler/cp-reflink $(DESTDIR)$(PREFIX)/bin/

cmd/build-extensions-container.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os/exec"
 
-	"github.com/coreos/coreos-assembler-schema/cosa"
 	"github.com/coreos/coreos-assembler/internal/pkg/cosash"
+	cosa "github.com/coreos/coreos-assembler/pkg/builds"
 
 	"crypto/sha256"
 	"encoding/json"

go.mod

@@ -5,18 +5,15 @@ go 1.17
 require github.com/spf13/cobra v1.5.0
 
 require (
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/pkg/errors v0.9.1
+	github.com/sirupsen/logrus v1.9.0
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0
 	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
 )
 
 require (
-	github.com/coreos/coreos-assembler-schema v0.0.0-00010101000000-000000000000
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 )
-
-replace github.com/coreos/coreos-assembler-schema => ./schema

mantle/cmd/kola/kola.go

@@ -31,7 +31,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
-	"github.com/coreos/coreos-assembler-schema/cosa"
+	cosa "github.com/coreos/coreos-assembler/pkg/builds"
 	"github.com/coreos/mantle/cli"
 	"github.com/coreos/mantle/fcos"
 	"github.com/coreos/mantle/harness/reporters"

mantle/go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/aliyun/aliyun-oss-go-sdk v2.0.3+incompatible
 	github.com/aws/aws-sdk-go v1.34.28
 	github.com/coreos/butane v0.15.0
-	github.com/coreos/coreos-assembler-schema v0.0.0-00010101000000-000000000000
+	github.com/coreos/coreos-assembler v0.14.0
 	github.com/coreos/go-semver v0.3.0
 	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
 	github.com/coreos/go-systemd/v22 v22.0.0
@@ -85,6 +85,6 @@ require (
 )
 
 replace (
-	github.com/coreos/coreos-assembler-schema => ../schema
+	github.com/coreos/coreos-assembler => ../
 	google.golang.org/cloud => cloud.google.com/go v0.0.0-20190220171618-cbb15e60dc6d
 )

mantle/kola/tests/rhcos/upgrade.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/coreos-assembler-schema/cosa"
+	cosa "github.com/coreos/coreos-assembler/pkg/builds"
 	"github.com/coreos/mantle/kola"
 	"github.com/coreos/mantle/kola/cluster"
 	"github.com/coreos/mantle/kola/register"

mantle/util/distros.go

@@ -19,7 +19,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/coreos/coreos-assembler-schema/cosa"
+	"github.com/coreos/coreos-assembler/pkg/builds"
 )
 
 // TargetDistroFromName returns the distribution given
@@ -34,7 +34,7 @@ func TargetDistroFromName(artifact string) string {
 }
 
 // TargetDistro returns the distribution of a cosa build
-func TargetDistro(build *cosa.Build) (string, error) {
+func TargetDistro(build *builds.Build) (string, error) {
 	switch build.Name {
 	case "rhcos":
 		return "rhcos", nil

mantle/util/repo.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/coreos/coreos-assembler-schema/cosa"
+	cosa "github.com/coreos/coreos-assembler/pkg/builds"
 )
 
 const (

mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cosa
+package builds
 
 import (
 	"encoding/json"

schema/vendor/github.com/xeipuuv/gojsonschema/LICENSE-APACHE-2.0.txt renamed to mantle/vendor/github.com/coreos/coreos-assembler/LICENSE

@@ -1,4 +1,4 @@
-package cosa
+package builds
 
 import (
 	"bytes"

mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/build.go renamed to mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/build.go

@@ -1,4 +1,4 @@
-package cosa
+package builds
 
 import (
 	"io/ioutil"

schema/cosa/builds.go renamed to mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/builds.go

@@ -1,4 +1,4 @@
-package cosa
+package builds
 
 // generated by 'make schema'
 // source hash: 144450d458f89f637ca487d353af3dfd60096ddbf3179da8e2b42b2bd2d0a6eb

vendor/github.com/coreos/coreos-assembler-schema/cosa/cosa_v1.go renamed to mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/cosa_v1.go

@@ -1,4 +1,4 @@
-package cosa
+package builds
 
 import (
 	"encoding/json"

vendor/github.com/coreos/coreos-assembler-schema/cosa/schema.go renamed to mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/schema.go

@@ -2,7 +2,7 @@
 // Source hash: 144450d458f89f637ca487d353af3dfd60096ddbf3179da8e2b42b2bd2d0a6eb
 // DO NOT EDIT
 
-package cosa
+package builds
 
 var generatedSchemaJSON = `{
   "definitions": {

mantle/vendor/github.com/coreos/coreos-assembler-schema/cosa/schema_doc.go renamed to mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/schema_doc.go

@@ -1,4 +1,4 @@
-package cosa
+package builds
 
 import (
 	"bytes"