chore: update score specification (#46)

Signed-off-by: Ben Meier <ben.meier@humanitec.com>

Makefile

@@ -6,13 +6,6 @@ MAKEFLAGS += --no-builtin-rules
 default:
 	# Please provide a valid make target
 
-## Update score schema
-.PHONY: update-schema
-update-schema:
-	rm -fv schema/files/score-v1b1.json.modified
-	C=$(shell git rev-parse HEAD); git subtree pull --prefix schema/files git@github.com:score-spec/schema.git main --squash -m "chore: updated score specification"; \
-		if git rev-parse HEAD | grep -v $$C; then git commit --amend -s --no-edit; fi
-
 ## Generate types
 .PHONY: generate
 generate:

README.md

@@ -69,13 +69,9 @@ func main() {
 
 ## Upgrading the schema version
 
-When the Score JSON schema is updated in <https://github.com/score-spec/schema>, this repo should be updated to match.
+When the Score JSON schema is updated in <https://github.com/score-spec/spec>, this repo should be updated to match.
 
-First update the subtree:
-
-```sh
-make update-schema
-```
+First copy the new `score-v1b1.json` and `samples/` files from the spec repo, into [schema/files](schema/files).
 
 Then regenerate the defined types:
 

schema/files/samples/score-full.yaml

@@ -70,6 +70,6 @@ resources:
         data: here
   resource-two2:
     type: Resource-Two
-  resource-three:
+  resource.three:
     type: Type-Three
     id: shared-type-three

schema/files/score-v1b1.json

@@ -144,11 +144,11 @@
           "pattern": "^[A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9]$"
         },
         "id": {
-          "description": "An optional external Resource identifier. When two resources share the same type, class, and id, they are considered the same resource when used across related Workloads. The id must be a valid RFC1123 Label Name of up to 63 characters, including a-z, 0-9, '-' but may not start or end with '-'.",
+          "description": "An optional Resource identifier. The id may be up to 63 characters, including one or more labels of a-z, 0-9, '-' not starting or ending with '-' separated by '.'. When two resources share the same type, class, and id, they are considered the same resource when used across related Workloads.",
           "type": "string",
           "minLength": 2,
           "maxLength": 63,
-          "pattern": "^[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$"
+          "pattern": "^[a-z0-9]+(?:-+[a-z0-9]+)*(?:\\.[a-z0-9]+(?:-+[a-z0-9]+)*)*$"
         },
         "metadata": {
           "description": "The metadata for the Resource.",