Merge pull request #84 from grafana/83-registry-schema-improvements

registry schema improvements
grafana · Oct 1, 2024 · 045249a · 045249a
2 parents a53dd8b + a502b21
commit 045249a
Show file tree

Hide file tree

Showing 57 changed files with 580 additions and 214 deletions.
diff --git a/README.md b/README.md
@@ -89,7 +89,7 @@ Registry generated from the source above.
       "name": "xk6-dashboard",
       "owner": "grafana",
       "public": true,
-      "stars": 330,
+      "stars": 343,
       "timestamp": 1719907965,
       "topics": [
         "xk6",
@@ -161,8 +161,8 @@ Registry generated from the source above.
       "name": "xk6-sql",
       "owner": "grafana",
       "public": true,
-      "stars": 107,
-      "timestamp": 1725628398,
+      "stars": 110,
+      "timestamp": 1725979901,
       "topics": [
         "k6",
         "sql",
@@ -172,6 +172,7 @@ Registry generated from the source above.
     },
     "tier": "official",
     "versions": [
+      "v0.4.1",
       "v0.4.0",
       "v0.3.0",
       "v0.2.1",
@@ -205,8 +206,8 @@ Registry generated from the source above.
       "name": "xk6-disruptor",
       "owner": "grafana",
       "public": true,
-      "stars": 91,
-      "timestamp": 1725571356,
+      "stars": 93,
+      "timestamp": 1727763654,
       "topics": [
         "chaos-engineering",
         "fault-injection",
@@ -264,7 +265,7 @@ Registry generated from the source above.
       "name": "xk6-faker",
       "owner": "grafana",
       "public": true,
-      "stars": 50,
+      "stars": 55,
       "timestamp": 1725533453,
       "topics": [
         "xk6"
@@ -307,7 +308,7 @@ Registry generated from the source above.
       "name": "xk6-banner",
       "owner": "szkiba",
       "public": true,
-      "timestamp": 1724312566,
+      "timestamp": 1725896396,
       "topics": [
         "xk6"
       ],
@@ -329,6 +330,7 @@ Registry generated from the source above.
     "module": "go.k6.io/k6",
     "products": [
       "cloud",
+      "synthetic",
       "oss"
     ],
     "repo": {
@@ -352,6 +354,7 @@ Registry generated from the source above.
     },
     "tier": "official",
     "versions": [
+      "v0.54.0",
       "v0.53.0",
       "v0.52.0",
       "v0.51.0",
@@ -614,7 +617,9 @@ docs/example-api
 │   ├── cloud-catalog.json
 │   ├── cloud.json
 │   ├── oss-catalog.json
-│   └── oss.json
+│   ├── oss.json
+│   ├── synthetic-catalog.json
+│   └── synthetic.json
 └── tier
     ├── community-catalog.json
     ├── community.json

diff --git a/cmd/load.go b/cmd/load.go
@@ -25,6 +25,7 @@ func k6AsExtension() k6registry.Extension {
 		Tier:        k6registry.TierOfficial,
 		Products: []k6registry.Product{
 			k6registry.ProductCloud,
+			k6registry.ProductSynthetic,
 			k6registry.ProductOSS,
 		},
 		Imports: []string{k6ImportPath},

diff --git a/cmd/origin.go b/cmd/origin.go
@@ -67,6 +67,10 @@ func fromOrigin(ext *k6registry.Extension, origin map[string]k6registry.Extensio
 		ext.Repo = oext.Repo
 	}
 
+	if !ext.Cgo {
+		ext.Cgo = oext.Cgo
+	}
+
 	if len(ext.Versions) == 0 {
 		ext.Versions = oext.Versions
 	}

diff --git a/docs/example-api.txt b/docs/example-api.txt
@@ -52,7 +52,9 @@ docs/example-api
 │   ├── cloud-catalog.json
 │   ├── cloud.json
 │   ├── oss-catalog.json
-│   └── oss.json
+│   ├── oss.json
+│   ├── synthetic-catalog.json
+│   └── synthetic.json
 └── tier
     ├── community-catalog.json
     ├── community.json

diff --git a/docs/example-api/catalog.json b/docs/example-api/catalog.json
@@ -24,7 +24,7 @@
       "name": "xk6-dashboard",
       "owner": "grafana",
       "public": true,
-      "stars": 330,
+      "stars": 343,
       "timestamp": 1719907965,
       "topics": [
         "xk6",
@@ -82,6 +82,7 @@
     "module": "go.k6.io/k6",
     "products": [
       "cloud",
+      "synthetic",
       "oss"
     ],
     "repo": {
@@ -105,6 +106,7 @@
     },
     "tier": "official",
     "versions": [
+      "v0.54.0",
       "v0.53.0",
       "v0.52.0",
       "v0.51.0",
@@ -221,7 +223,7 @@
       "name": "xk6-banner",
       "owner": "szkiba",
       "public": true,
-      "timestamp": 1724312566,
+      "timestamp": 1725896396,
       "topics": [
         "xk6"
       ],
@@ -256,8 +258,8 @@
       "name": "xk6-disruptor",
       "owner": "grafana",
       "public": true,
-      "stars": 91,
-      "timestamp": 1725571356,
+      "stars": 93,
+      "timestamp": 1727763654,
       "topics": [
         "chaos-engineering",
         "fault-injection",
@@ -315,7 +317,7 @@
       "name": "xk6-faker",
       "owner": "grafana",
       "public": true,
-      "stars": 50,
+      "stars": 55,
       "timestamp": 1725533453,
       "topics": [
         "xk6"
@@ -359,8 +361,8 @@
       "name": "xk6-sql",
       "owner": "grafana",
       "public": true,
-      "stars": 107,
-      "timestamp": 1725628398,
+      "stars": 110,
+      "timestamp": 1725979901,
       "topics": [
         "k6",
         "sql",
@@ -370,6 +372,7 @@
     },
     "tier": "official",
     "versions": [
+      "v0.4.1",
       "v0.4.0",
       "v0.3.0",
       "v0.2.1",
@@ -379,4 +382,4 @@
       "v0.0.1"
     ]
   }
-}
+}
diff --git a/docs/example-api/category/authentication.json b/docs/example-api/category/authentication.json
@@ -1 +1 @@
-[]
+[]
diff --git a/docs/example-api/category/browser.json b/docs/example-api/category/browser.json
@@ -1 +1 @@
-[]
+[]
diff --git a/docs/example-api/category/data.json b/docs/example-api/category/data.json
@@ -24,8 +24,8 @@
       "name": "xk6-sql",
       "owner": "grafana",
       "public": true,
-      "stars": 107,
-      "timestamp": 1725628398,
+      "stars": 110,
+      "timestamp": 1725979901,
       "topics": [
         "k6",
         "sql",
@@ -35,6 +35,7 @@
     },
     "tier": "official",
     "versions": [
+      "v0.4.1",
       "v0.4.0",
       "v0.3.0",
       "v0.2.1",
@@ -68,7 +69,7 @@
       "name": "xk6-faker",
       "owner": "grafana",
       "public": true,
-      "stars": 50,
+      "stars": 55,
       "timestamp": 1725533453,
       "topics": [
         "xk6"
@@ -87,4 +88,4 @@
       "v0.1.0"
     ]
   }
-]
+]
diff --git a/docs/example-api/category/kubernetes.json b/docs/example-api/category/kubernetes.json
@@ -23,8 +23,8 @@
       "name": "xk6-disruptor",
       "owner": "grafana",
       "public": true,
-      "stars": 91,
-      "timestamp": 1725571356,
+      "stars": 93,
+      "timestamp": 1727763654,
       "topics": [
         "chaos-engineering",
         "fault-injection",
@@ -58,4 +58,4 @@
       "v0.1.0"
     ]
   }
-]
+]
diff --git a/docs/example-api/category/messaging.json b/docs/example-api/category/messaging.json
@@ -1 +1 @@
-[]
+[]
diff --git a/docs/example-api/category/misc.json b/docs/example-api/category/misc.json
@@ -23,7 +23,7 @@
       "name": "xk6-banner",
       "owner": "szkiba",
       "public": true,
-      "timestamp": 1724312566,
+      "timestamp": 1725896396,
       "topics": [
         "xk6"
       ],
@@ -45,6 +45,7 @@
     "module": "go.k6.io/k6",
     "products": [
       "cloud",
+      "synthetic",
       "oss"
     ],
     "repo": {
@@ -68,6 +69,7 @@
     },
     "tier": "official",
     "versions": [
+      "v0.54.0",
       "v0.53.0",
       "v0.52.0",
       "v0.51.0",
@@ -160,4 +162,4 @@
       "v0.0.1"
     ]
   }
-]
+]
diff --git a/docs/example-api/category/observability.json b/docs/example-api/category/observability.json
@@ -24,7 +24,7 @@
       "name": "xk6-dashboard",
       "owner": "grafana",
       "public": true,
-      "stars": 330,
+      "stars": 343,
       "timestamp": 1719907965,
       "topics": [
         "xk6",
@@ -71,4 +71,4 @@
       "v0.1.0"
     ]
   }
-]
+]
diff --git a/docs/example-api/category/protocol.json b/docs/example-api/category/protocol.json
@@ -1 +1 @@
-[]
+[]
diff --git a/docs/example-api/category/reporting.json b/docs/example-api/category/reporting.json
@@ -24,7 +24,7 @@
       "name": "xk6-dashboard",
       "owner": "grafana",
       "public": true,
-      "stars": 330,
+      "stars": 343,
       "timestamp": 1719907965,
       "topics": [
         "xk6",
@@ -71,4 +71,4 @@
       "v0.1.0"
     ]
   }
-]
+]
diff --git a/docs/example-api/grade/A.json b/docs/example-api/grade/A.json
@@ -24,8 +24,8 @@
       "name": "xk6-sql",
       "owner": "grafana",
       "public": true,
-      "stars": 107,
-      "timestamp": 1725628398,
+      "stars": 110,
+      "timestamp": 1725979901,
       "topics": [
         "k6",
         "sql",
@@ -35,6 +35,7 @@
     },
     "tier": "official",
     "versions": [
+      "v0.4.1",
       "v0.4.0",
       "v0.3.0",
       "v0.2.1",
@@ -68,7 +69,7 @@
       "name": "xk6-faker",
       "owner": "grafana",
       "public": true,
-      "stars": 50,
+      "stars": 55,
       "timestamp": 1725533453,
       "topics": [
         "xk6"
@@ -111,7 +112,7 @@
       "name": "xk6-banner",
       "owner": "szkiba",
       "public": true,
-      "timestamp": 1724312566,
+      "timestamp": 1725896396,
       "topics": [
         "xk6"
       ],
@@ -122,4 +123,4 @@
       "v0.1.0"
     ]
   }
-]
+]
diff --git a/docs/example-api/grade/B.json b/docs/example-api/grade/B.json
@@ -1 +1 @@
-[]
+[]