Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

registry schema improvements #84

Merged
merged 5 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -307,7 +308,7 @@ Registry generated from the source above.
"name": "xk6-banner",
"owner": "szkiba",
"public": true,
"timestamp": 1724312566,
"timestamp": 1725896396,
"topics": [
"xk6"
],
Expand All @@ -329,6 +330,7 @@ Registry generated from the source above.
"module": "go.k6.io/k6",
"products": [
"cloud",
"synthetic",
"oss"
],
"repo": {
Expand All @@ -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",
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions cmd/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ func k6AsExtension() k6registry.Extension {
Tier: k6registry.TierOfficial,
Products: []k6registry.Product{
k6registry.ProductCloud,
k6registry.ProductSynthetic,
k6registry.ProductOSS,
},
Imports: []string{k6ImportPath},
Expand Down
4 changes: 4 additions & 0 deletions cmd/origin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 3 additions & 1 deletion docs/example-api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 11 additions & 8 deletions docs/example-api/catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"name": "xk6-dashboard",
"owner": "grafana",
"public": true,
"stars": 330,
"stars": 343,
"timestamp": 1719907965,
"topics": [
"xk6",
Expand Down Expand Up @@ -82,6 +82,7 @@
"module": "go.k6.io/k6",
"products": [
"cloud",
"synthetic",
"oss"
],
"repo": {
Expand All @@ -105,6 +106,7 @@
},
"tier": "official",
"versions": [
"v0.54.0",
"v0.53.0",
"v0.52.0",
"v0.51.0",
Expand Down Expand Up @@ -221,7 +223,7 @@
"name": "xk6-banner",
"owner": "szkiba",
"public": true,
"timestamp": 1724312566,
"timestamp": 1725896396,
"topics": [
"xk6"
],
Expand Down Expand Up @@ -256,8 +258,8 @@
"name": "xk6-disruptor",
"owner": "grafana",
"public": true,
"stars": 91,
"timestamp": 1725571356,
"stars": 93,
"timestamp": 1727763654,
"topics": [
"chaos-engineering",
"fault-injection",
Expand Down Expand Up @@ -315,7 +317,7 @@
"name": "xk6-faker",
"owner": "grafana",
"public": true,
"stars": 50,
"stars": 55,
"timestamp": 1725533453,
"topics": [
"xk6"
Expand Down Expand Up @@ -359,8 +361,8 @@
"name": "xk6-sql",
"owner": "grafana",
"public": true,
"stars": 107,
"timestamp": 1725628398,
"stars": 110,
"timestamp": 1725979901,
"topics": [
"k6",
"sql",
Expand All @@ -370,6 +372,7 @@
},
"tier": "official",
"versions": [
"v0.4.1",
"v0.4.0",
"v0.3.0",
"v0.2.1",
Expand All @@ -379,4 +382,4 @@
"v0.0.1"
]
}
}
}
2 changes: 1 addition & 1 deletion docs/example-api/category/authentication.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
2 changes: 1 addition & 1 deletion docs/example-api/category/browser.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
9 changes: 5 additions & 4 deletions docs/example-api/category/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"name": "xk6-sql",
"owner": "grafana",
"public": true,
"stars": 107,
"timestamp": 1725628398,
"stars": 110,
"timestamp": 1725979901,
"topics": [
"k6",
"sql",
Expand All @@ -35,6 +35,7 @@
},
"tier": "official",
"versions": [
"v0.4.1",
"v0.4.0",
"v0.3.0",
"v0.2.1",
Expand Down Expand Up @@ -68,7 +69,7 @@
"name": "xk6-faker",
"owner": "grafana",
"public": true,
"stars": 50,
"stars": 55,
"timestamp": 1725533453,
"topics": [
"xk6"
Expand All @@ -87,4 +88,4 @@
"v0.1.0"
]
}
]
]
6 changes: 3 additions & 3 deletions docs/example-api/category/kubernetes.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"name": "xk6-disruptor",
"owner": "grafana",
"public": true,
"stars": 91,
"timestamp": 1725571356,
"stars": 93,
"timestamp": 1727763654,
"topics": [
"chaos-engineering",
"fault-injection",
Expand Down Expand Up @@ -58,4 +58,4 @@
"v0.1.0"
]
}
]
]
2 changes: 1 addition & 1 deletion docs/example-api/category/messaging.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
6 changes: 4 additions & 2 deletions docs/example-api/category/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"name": "xk6-banner",
"owner": "szkiba",
"public": true,
"timestamp": 1724312566,
"timestamp": 1725896396,
"topics": [
"xk6"
],
Expand All @@ -45,6 +45,7 @@
"module": "go.k6.io/k6",
"products": [
"cloud",
"synthetic",
"oss"
],
"repo": {
Expand All @@ -68,6 +69,7 @@
},
"tier": "official",
"versions": [
"v0.54.0",
"v0.53.0",
"v0.52.0",
"v0.51.0",
Expand Down Expand Up @@ -160,4 +162,4 @@
"v0.0.1"
]
}
]
]
4 changes: 2 additions & 2 deletions docs/example-api/category/observability.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"name": "xk6-dashboard",
"owner": "grafana",
"public": true,
"stars": 330,
"stars": 343,
"timestamp": 1719907965,
"topics": [
"xk6",
Expand Down Expand Up @@ -71,4 +71,4 @@
"v0.1.0"
]
}
]
]
2 changes: 1 addition & 1 deletion docs/example-api/category/protocol.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
4 changes: 2 additions & 2 deletions docs/example-api/category/reporting.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"name": "xk6-dashboard",
"owner": "grafana",
"public": true,
"stars": 330,
"stars": 343,
"timestamp": 1719907965,
"topics": [
"xk6",
Expand Down Expand Up @@ -71,4 +71,4 @@
"v0.1.0"
]
}
]
]
11 changes: 6 additions & 5 deletions docs/example-api/grade/A.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"name": "xk6-sql",
"owner": "grafana",
"public": true,
"stars": 107,
"timestamp": 1725628398,
"stars": 110,
"timestamp": 1725979901,
"topics": [
"k6",
"sql",
Expand All @@ -35,6 +35,7 @@
},
"tier": "official",
"versions": [
"v0.4.1",
"v0.4.0",
"v0.3.0",
"v0.2.1",
Expand Down Expand Up @@ -68,7 +69,7 @@
"name": "xk6-faker",
"owner": "grafana",
"public": true,
"stars": 50,
"stars": 55,
"timestamp": 1725533453,
"topics": [
"xk6"
Expand Down Expand Up @@ -111,7 +112,7 @@
"name": "xk6-banner",
"owner": "szkiba",
"public": true,
"timestamp": 1724312566,
"timestamp": 1725896396,
"topics": [
"xk6"
],
Expand All @@ -122,4 +123,4 @@
"v0.1.0"
]
}
]
]
2 changes: 1 addition & 1 deletion docs/example-api/grade/B.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[]
[]
Loading
Loading