github/zot
1
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2026-06-15 20:07:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update image-spec and dist spec to 1.1.0 (#2255)

Browse Source 
BREAKING CHANGE: the dist spec version in the config files needs to be bumped to 1.1.0
in order for the config verification to pass without warnings.

Also fix 1 dependabot alert for helm.

Signed-off-by: Andrei Aaron <aaaron@luxoft.com>
This commit is contained in:
Andrei Aaron
2024-02-20 13:27:21 +02:00
committed by GitHub
parent 960686b957
commit 4e5db84cb1
74 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/routes.go
+1 -1
View File
@@ -1,5 +1,5 @@
// @title Open Container Initiative Distribution Specification
// @version v1.1.0-dev
// @version v1.1.0
// @description APIs for Open Container Initiative Distribution Specification
// @license.name Apache 2.0
pkg/cli/server/config_reloader_test.go
+9 -9
View File
@@ -37,7 +37,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@@ -95,7 +95,7 @@ func TestConfigReloader(t *testing.T) {
test.WaitTillServerReady(baseURL)
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@@ -168,7 +168,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": false,
@@ -211,7 +211,7 @@ func TestConfigReloader(t *testing.T) {
test.WaitTillServerReady(baseURL)
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@@ -274,7 +274,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@@ -329,7 +329,7 @@ func TestConfigReloader(t *testing.T) {
test.WaitTillServerReady(baseURL)
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@@ -406,7 +406,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@@ -451,7 +451,7 @@ func TestConfigReloader(t *testing.T) {
test.WaitTillServerReady(baseURL)
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@@ -521,7 +521,7 @@ func TestConfigReloader(t *testing.T) {
defer os.Remove(logFile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
pkg/cli/server/extensions_test.go
+7 -7
View File
@@ -1401,7 +1401,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@@ -1467,7 +1467,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@@ -1531,7 +1531,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@@ -1593,7 +1593,7 @@ func TestOverlappingSyncRetentionConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"gc": true,
@@ -1665,7 +1665,7 @@ func TestSyncWithRemoteStorageConfig(t *testing.T) {
defer os.Remove(tmpfile.Name()) // clean up
content := `{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"dedupe": false,
@@ -1729,7 +1729,7 @@ func TestSyncWithRemoteStorageConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"dedupe": false,
@@ -1796,7 +1796,7 @@ func TestSyncWithRemoteStorageConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s",
"subPaths":{
pkg/cli/server/root_test.go
+12 -12
View File
@@ -78,7 +78,7 @@ func TestServe(t *testing.T) {
// missing storage config should result in an error in Controller.Init()
content := []byte(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"http": {
"address":"127.0.0.1",
"port":"8080"
@@ -125,7 +125,7 @@ func TestVerify(t *testing.T) {
tmpfile, err := os.CreateTemp("", "zot-test*")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot"},
"log":{"level":"debug"}}`)
_, err = tmpfile.Write(content)
@@ -142,7 +142,7 @@ func TestVerify(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`
distspecversion: 1.1.0-dev
distspecversion: 1.1.0
http:
address: 127.0.0.1
port: 8080
@@ -556,7 +556,7 @@ storage:
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,
@@ -604,7 +604,7 @@ storage:
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "/tmp/zot",
"gc": true,
@@ -1105,7 +1105,7 @@ storage:
tmpfile, err := os.CreateTemp("", "zot-test*.json")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
"auth":{"openid":{"providers":{"oidc":{"issuer":"http://127.0.0.1:5556/dex"}}}}},
"log":{"level":"debug"}}`)
@@ -1122,7 +1122,7 @@ storage:
tmpfile, err := os.CreateTemp("", "zot-test*.json")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
"auth":{"openid":{"providers":{"github":{"clientid":"client_id"}}}}},
"log":{"level":"debug"}}`)
@@ -1139,7 +1139,7 @@ storage:
tmpfile, err := os.CreateTemp("", "zot-test*.json")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
"auth":{"openid":{"providers":{"unsupported":{"issuer":"http://127.0.0.1:5556/dex"}}}}},
"log":{"level":"debug"}}`)
@@ -1156,7 +1156,7 @@ storage:
tmpfile, err := os.CreateTemp("", "zot-test*.json")
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name()) // clean up
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
"auth":{"openid":{"providers":{"oidc":{"issuer":"http://127.0.0.1:5556/dex",
"clientid":"client_id","scopes":["openid"]}}}}},
@@ -1245,7 +1245,7 @@ func TestApiKeyConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name())
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
"auth":{"openid":{"providers":{"oidc":{"issuer":"http://127.0.0.1:5556/dex",
"clientid":"client_id","scopes":["openid"]}}}}},
@@ -1265,7 +1265,7 @@ func TestApiKeyConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name())
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot"},
"log":{"level":"debug"}}`)
@@ -1283,7 +1283,7 @@ func TestApiKeyConfig(t *testing.T) {
So(err, ShouldBeNil)
defer os.Remove(tmpfile.Name())
content := []byte(`{"distSpecVersion":"1.1.0-dev","storage":{"rootDirectory":"/tmp/zot"},
content := []byte(`{"distSpecVersion":"1.1.0","storage":{"rootDirectory":"/tmp/zot"},
"http":{"address":"127.0.0.1","port":"8080","realm":"zot",
"auth":{"htpasswd":{"path":"test/data/htpasswd"}}},
"log":{"level":"debug"}}`)
pkg/extensions/README_mgmt.md
+1 -1
View File
@@ -23,7 +23,7 @@ curl http://localhost:8080/v2/_zot/ext/mgmt | jq
```json
{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"binaryType": "-sync-search-scrub-metrics-lint-ui-mgmt",
"http": {
"auth": {
pkg/extensions/sync/sync_test.go
+3 -3
View File
@@ -1888,7 +1888,7 @@ func TestConfigReloader(t *testing.T) {
//nolint: dupl
Convey("Reload config without sync", func() {
content := fmt.Sprintf(`{"distSpecVersion": "1.1.0-dev", "storage": {"rootDirectory": "%s"},
content := fmt.Sprintf(`{"distSpecVersion": "1.1.0", "storage": {"rootDirectory": "%s"},
"http": {"address": "127.0.0.1", "port": "%s"},
"log": {"level": "debug", "output": "%s"}}`, destDir, destPort, logFile.Name())
@@ -1946,7 +1946,7 @@ func TestConfigReloader(t *testing.T) {
// reload config from extensions nil to sync
content = fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},
@@ -2006,7 +2006,7 @@ func TestConfigReloader(t *testing.T) {
//nolint: dupl
Convey("Reload bad sync config", func() {
content := fmt.Sprintf(`{
"distSpecVersion": "1.1.0-dev",
"distSpecVersion": "1.1.0",
"storage": {
"rootDirectory": "%s"
},