encoding/jsonschema: fix x-kubernetes-group-version-kind

It turns out that the `group` field should also be considered
when determining the value of the `apiVersion` field,
so we get versions like `apps/v1` as well as versions like plain
`v1`.

Signed-off-by: Roger Peppe <[email protected]>
Change-Id: Iec4026e6935528a03c7e0f0a0b973d9f2f0fae4d
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1214817
Reviewed-by: Daniel Martí <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
Unity-Result: CUE porcuepine <[email protected]>

Author: rogpeppe

encoding/jsonschema/constraints_object.go

@@ -57,25 +57,31 @@ func constraintGroupVersionKind(key string, n cue.Value, s *state) {
 		// TODO implement support for multiple items
 		return
 	}
+	var group, version string
 	s.processMap(items[0], func(key string, n cue.Value) {
 		if strings.HasPrefix(key, "x-") {
 			// TODO are x- extension properties actually allowed in this context?
 			return
 		}
 		switch key {
 		case "group":
-			return
+			group, _ = s.strValue(n)
 		case "kind":
 			s.k8sResourceKind, _ = s.strValue(n)
 		case "version":
-			s.k8sAPIVersion, _ = s.strValue(n)
+			version, _ = s.strValue(n)
 		default:
 			s.errf(n, "unknown field %q in x-kubernetes-group-version-kind item", key)
 		}
 	})
-	if s.k8sResourceKind == "" || s.k8sAPIVersion == "" {
+	if s.k8sResourceKind == "" || version == "" {
 		s.errf(n, "x-kubernetes-group-version-kind needs both kind and version fields")
 	}
+	if group == "" {
+		s.k8sAPIVersion = version
+	} else {
+		s.k8sAPIVersion = group + "/" + version
+	}
 }
 
 func constraintAdditionalProperties(key string, n cue.Value, s *state) {

encoding/jsonschema/testdata/txtar/k8s_group_kind_version.txtar

@@ -1,5 +1,5 @@
-Note: the schema.json file here is derived from the
-file api/openapi-spec/v3/api_openapi.json in
+Note: the schema.json file here has components
+derived from the api/openapi-spec/v3 directory
 the Kubernetes repository.
 
 #version: k8sAPI
@@ -8,6 +8,24 @@ the Kubernetes repository.
 {
   "components": {
     "schemas": {
+      "io.k8s.api.apps.v1.Deployment": {
+        "properties": {
+          "apiVersion": {
+            "type": "string"
+          },
+          "kind": {
+            "type": "string"
+          }
+        },
+        "type": "object",
+        "x-kubernetes-group-version-kind": [
+          {
+            "group": "apps",
+            "kind": "Deployment",
+            "version": "v1"
+          }
+        ]
+      },
       "io.k8s.apimachinery.pkg.apis.meta.v1.APIVersions": {
         "properties": {
           "apiVersion": {
@@ -84,6 +102,11 @@ the Kubernetes repository.
   "paths": {}
 }
 -- out/decode/extract --
+_#defs: "/components/schemas/io.k8s.api.apps.v1.Deployment": {
+	apiVersion: "apps/v1"
+	kind:       "Deployment"
+}
+
 _#defs: "/components/schemas/io.k8s.apimachinery.pkg.apis.meta.v1.APIVersions": {
 	apiVersion: "v1"
 	kind:       "APIVersions"