fix: removed references to old dist-spec (#1128)

Signed-off-by: Ana-Roberta Lisca <ana.kagome@yahoo.com>
2023-01-31 19:35:33 +02:00 · 2023-01-31 19:35:33 +02:00 · 976ccfcf0d
commit 976ccfcf0d
parent 1b618f305e
48 changed files with 94 additions and 54 deletions
--- a/examples/config-all-remote.json
+++ b/examples/config-all-remote.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "dedupe": true,
        "remoteCache": true,
--- a/examples/config-allextensions.json
+++ b/examples/config-allextensions.json
@ -1,5 +1,5 @@
 {
-	"distSpecVersion": "1.0.1-dev",
+	"distSpecVersion": "1.1.0-dev",
 	"storage": {
 		"rootDirectory": "/tmp/zot"
 	},
--- a/examples/config-anonymous-authz.json
+++ b/examples/config-anonymous-authz.json
@ -1,5 +1,5 @@
 {
-  "distSpecVersion": "1.0.1-dev",
+  "distSpecVersion": "1.1.0-dev",
  "storage": {
    "rootDirectory": "/tmp/zot"
  },
--- a/examples/config-bearer-auth.json
+++ b/examples/config-bearer-auth.json
@ -1,5 +1,5 @@
 {
-  "distSpecVersion": "1.0.1-dev",
+  "distSpecVersion": "1.1.0-dev",
  "storage": {
    "rootDirectory": "/tmp/zot"
  },
--- a/examples/config-bench.json
+++ b/examples/config-bench.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot"
    },
--- a/examples/config-boltdb.json
+++ b/examples/config-boltdb.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot",
        "dedupe": true,
--- a/examples/config-commit.json
+++ b/examples/config-commit.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot",
        "commit": true
--- a/examples/config-conformance.json
+++ b/examples/config-conformance.json
@ -1,5 +1,5 @@
 {
-  "distSpecVersion": "1.0.1-dev",
+  "distSpecVersion": "1.1.0-dev",
  "storage": {
    "rootDirectory": "/tmp/zot",
    "gc": false,
--- a/examples/config-cve.json
+++ b/examples/config-cve.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot"
    },
--- a/examples/config-dynamodb.json
+++ b/examples/config-dynamodb.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot",
        "dedupe": true,
--- a/examples/config-example.json
+++ b/examples/config-example.json
@ -1,5 +1,5 @@
 {
-  "distSpecVersion": "1.0.1-dev",
+  "distSpecVersion": "1.1.0-dev",
  "storage": {
    "rootDirectory": "/tmp/zot"
  },
--- a/examples/config-example.yaml
+++ b/examples/config-example.yaml
@ -1,4 +1,4 @@
-distspecversion: 1.0.1-dev
+distspecversion: 1.1.0-dev
 http:
  address: 127.0.0.1
  auth:
--- a/examples/config-gc-periodic.json
+++ b/examples/config-gc-periodic.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot",
        "gc": true,
--- a/examples/config-gc.json
+++ b/examples/config-gc.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot",
        "gc": true,
--- a/examples/config-lint.json
+++ b/examples/config-lint.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot"
    },
--- a/examples/config-metrics.json
+++ b/examples/config-metrics.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot"
    },
--- a/examples/config-minimal.json
+++ b/examples/config-minimal.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot"
    },
--- a/examples/config-multiple-cve.json
+++ b/examples/config-multiple-cve.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot",
        "dedupe": true,
--- a/examples/config-multiple.json
+++ b/examples/config-multiple.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot",
        "dedupe": true,
--- a/examples/config-policy.json
+++ b/examples/config-policy.json
@ -1,5 +1,5 @@
 {
-  "distSpecVersion": "1.0.1-dev",
+  "distSpecVersion": "1.1.0-dev",
  "storage": {
    "rootDirectory": "/tmp/zot"
  },
--- a/examples/config-ratelimit.json
+++ b/examples/config-ratelimit.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot"
    },
--- a/examples/config-s3.json
+++ b/examples/config-s3.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot",
        "dedupe": true,
--- a/examples/config-scrub.json
+++ b/examples/config-scrub.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot"
    },
--- a/examples/config-search.json
+++ b/examples/config-search.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1-dev",
+    "distSpecVersion": "1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot"
    },
--- a/examples/config-sync-localhost.json
+++ b/examples/config-sync-localhost.json
@ -1,5 +1,5 @@
 {
-    "distspecversion":"1.0.1-dev",
+    "distspecversion":"1.1.0-dev",
    "storage": {
        "rootDirectory": "/tmp/zot_to_sync",
        "dedupe": false,
--- a/examples/config-sync.json
+++ b/examples/config-sync.json
@ -1,5 +1,5 @@
 {
-	"distSpecVersion": "1.0.1-dev",
+	"distSpecVersion": "1.1.0-dev",
 	"storage": {
 		"rootDirectory": "/tmp/zot"
 	},
--- a/examples/config-test.json
+++ b/examples/config-test.json
@ -1,5 +1,5 @@
 {
-  "distSpecVersion": "1.0.1-dev",
+  "distSpecVersion": "1.1.0-dev",
  "storage": {
    "rootDirectory": "/tmp/zot"
  },
--- a/examples/config-tls.json
+++ b/examples/config-tls.json
@ -1,5 +1,5 @@
 {
-  "distSpecVersion": "1.0.1-dev",
+  "distSpecVersion": "1.1.0-dev",
  "storage": {
    "rootDirectory": "/tmp/zot"
  },
--- a/examples/metrics/old-config.json
+++ b/examples/metrics/old-config.json
@ -0,0 +1,40 @@
+{
+    "configs": [
+      {
+        "_name": "zot5000",
+        "showspinner": true,
+        "url": "https://aci-zot.cisco.com:5000",
+        "verify-tls": true
+      },
+      {
+        "_name": "zot5050",
+        "showspinner": true,
+        "url": "https://aci-zot.cisco.com:5050",
+        "verify-tls": true
+      },
+      {
+        "_name": "cdockerhub",
+        "showspinner": true,
+        "url": "https://dockerhub.cisco.com:5000/",
+        "verify-tls": true
+      },
+      {
+        "_name": "local",
+        "showspinner": false,
+        "url": "http://127.0.0.1:8080/",
+        "verify-tls": false
+      },
+      {
+        "_name": "zothub",
+        "showspinner": true,
+        "url": "https://zothub.io/",
+        "verify-tls": true
+      },
+      {
+        "_name": "local2",
+        "showspinner": true,
+        "url": "http://172.31.132.115:5000",
+        "verify-tls": true
+      }
+    ]
+  }
--- a/go.mod
+++ b/go.mod
@ -56,7 +56,7 @@ require (
 	github.com/containers/image/v5 v5.23.0
 	github.com/gobwas/glob v0.2.3
 	github.com/notaryproject/notation-go v0.12.0-beta.1
-	github.com/opencontainers/distribution-spec/specs-go v0.0.0-20220620172159-4ab4752c3b86
+	github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25
 	github.com/sigstore/cosign v1.13.1
 	github.com/swaggo/http-swagger v1.3.3
 )
--- a/go.sum
+++ b/go.sum
@ -1675,8 +1675,8 @@ github.com/onsi/gomega v1.20.2 h1:8uQq0zMgLEfa0vRrrBgaJF2gyW9Da9BmfGV+OyUzfkY=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/open-policy-agent/opa v0.45.0 h1:P5nuhVRtR+e58fk3CMMbiqr6ZFyWQPNOC3otsorGsFs=
 github.com/open-policy-agent/opa v0.45.0/go.mod h1:/OnsYljNEWJ6DXeFOOnoGn8CvwZGMUS4iRqzYdJvmBI=
-github.com/opencontainers/distribution-spec/specs-go v0.0.0-20220620172159-4ab4752c3b86 h1:Oumw+lPnO8qNLTY2mrqPJZMoGExLi/0h/DdikoLTXVU=
-github.com/opencontainers/distribution-spec/specs-go v0.0.0-20220620172159-4ab4752c3b86/go.mod h1:aA4vdXRS8E1TG7pLZOz85InHi3BiPdErh8IpJN6E0x4=
+github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25 h1:DpApB9YKcjGF1Lc8FmEAD5Xa1LRhVftJGgpe3+47Vc0=
+github.com/opencontainers/distribution-spec/specs-go v0.0.0-20230117141039-067a0f5b0e25/go.mod h1:uLvbyisMXc6uWXBmKrPegq9igec91coS/kGM2sHL660=
 github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
--- a/pkg/api/routes.go
+++ b/pkg/api/routes.go
@ -1,5 +1,5 @@
 // @title Open Container Initiative Distribution Specification
-// @version v0.1.0-dev
+// @version v1.1.0-dev
 // @description APIs for Open Container Initiative Distribution Specification

 // @license.name Apache 2.0
--- a/pkg/cli/config_reloader_test.go
+++ b/pkg/cli/config_reloader_test.go
@ -42,7 +42,7 @@ func TestConfigReloader(t *testing.T) {
 		defer os.Remove(logFile.Name()) // clean up

 		content := fmt.Sprintf(`{
-			"distSpecVersion": "0.1.0-dev",
+			"distSpecVersion": "1.1.0-dev",
 			"storage": {
 			  "rootDirectory": "/tmp/zot"
 			},
@ -98,7 +98,7 @@ func TestConfigReloader(t *testing.T) {
 		test.WaitTillServerReady(baseURL)

 		content = fmt.Sprintf(`{
-			"distSpecVersion": "0.1.0-dev",
+			"distSpecVersion": "1.1.0-dev",
 			"storage": {
 			  "rootDirectory": "/tmp/zot"
 			},
@ -167,7 +167,7 @@ func TestConfigReloader(t *testing.T) {
 		defer os.Remove(logFile.Name()) // clean up

 		content := fmt.Sprintf(`{
-				"distSpecVersion": "0.1.0-dev",
+				"distSpecVersion": "1.1.0-dev",
 				"storage": {
 					"rootDirectory": "/tmp/zot"
 				},
@ -222,7 +222,7 @@ func TestConfigReloader(t *testing.T) {
 		test.WaitTillServerReady(baseURL)

 		content = fmt.Sprintf(`{
-			"distSpecVersion": "0.1.0-dev",
+			"distSpecVersion": "1.1.0-dev",
 			"storage": {
 				"rootDirectory": "/tmp/zot"
 			},
@ -297,7 +297,7 @@ func TestConfigReloader(t *testing.T) {
 		defer os.Remove(logFile.Name()) // clean up

 		content := fmt.Sprintf(`{
-				"distSpecVersion": "0.1.0-dev",
+				"distSpecVersion": "1.1.0-dev",
 				"storage": {
 					"rootDirectory": "/tmp/zot"
 				},
--- a/pkg/extensions/sync/sync_test.go
+++ b/pkg/extensions/sync/sync_test.go
@ -767,7 +767,7 @@ func TestConfigReloader(t *testing.T) {

 		defer dcm.StopServer()

-		content := fmt.Sprintf(`{"distSpecVersion": "0.1.0-dev", "storage": {"rootDirectory": "%s"},
+		content := fmt.Sprintf(`{"distSpecVersion": "1.1.0-dev", "storage": {"rootDirectory": "%s"},
 		"http": {"address": "127.0.0.1", "port": "%s"},
 		"log": {"level": "debug", "output": "%s"}}`, destDir, destPort, logFile.Name())

--- a/swagger/docs.go
+++ b/swagger/docs.go
@ -824,7 +824,7 @@ type swaggerInfo struct {

 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = swaggerInfo{
-	Version:     "v0.1.0-dev",
+	Version:     "v1.1.0-dev",
 	Host:        "",
 	BasePath:    "",
 	Schemes:     []string{},
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@ -12,7 +12,7 @@
            "name": "Apache 2.0",
            "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
        },
-        "version": "v0.1.0-dev"
+        "version": "v1.1.0-dev"
    },
    "paths": {
        "/oras/artifacts/v1/{name": {
--- a/swagger/swagger.yaml
+++ b/swagger/swagger.yaml
@ -29,7 +29,7 @@ info:
    name: Apache 2.0
    url: http://www.apache.org/licenses/LICENSE-2.0.html
  title: Open Container Initiative Distribution Specification
-  version: v0.1.0-dev
+  version: v1.1.0-dev
 paths:
  /oras/artifacts/v1/{name:
    get:
--- a/test/blackbox/annotations.bats
+++ b/test/blackbox/annotations.bats
@ -15,7 +15,7 @@ function setup_file() {
    mkdir -p ${oci_data_dir}
    cat > ${zot_config_file}<<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_root_dir}"
    },
--- a/test/blackbox/anonymous_policy.bats
+++ b/test/blackbox/anonymous_policy.bats
@ -18,7 +18,7 @@ function setup_file() {
    echo 'test:$2a$10$EIIoeCnvsIDAJeDL4T1sEOnL2fWOvsq7ACZbs3RT40BBBXg.Ih7V.' >> ${htpasswordFile}
    cat > ${zot_config_file}<<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_root_dir}"
    },
--- a/test/blackbox/cloud-only.bats
+++ b/test/blackbox/cloud-only.bats
@ -16,7 +16,7 @@ function setup() {

    cat > ${zot_config_file}<<EOF
 {
-	"distSpecVersion": "1.0.1-dev",
+	"distSpecVersion": "1.1.0-dev",
 	"storage": {
        "rootDirectory": "${zot_root_dir}",
        "dedupe": true,
--- a/test/blackbox/cve.bats
+++ b/test/blackbox/cve.bats
@ -15,7 +15,7 @@ function setup_file() {
    mkdir -p ${zot_root_dir}
    cat >${zot_config_file} <<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_root_dir}"
    },
--- a/test/blackbox/detect_manifest_collision.bats
+++ b/test/blackbox/detect_manifest_collision.bats
@ -18,7 +18,7 @@ function setup_file() {
    echo 'test:$2a$10$EIIoeCnvsIDAJeDL4T1sEOnL2fWOvsq7ACZbs3RT40BBBXg.Ih7V.' >> ${htpasswordFile}
    cat > ${zot_config_file}<<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_root_dir}"
    },
--- a/test/blackbox/metrics.bats
+++ b/test/blackbox/metrics.bats
@ -19,7 +19,7 @@ function setup_file() {
    touch ${zot_log_file}
    cat >${zot_config_file} <<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_root_dir}"
    },
--- a/test/blackbox/pushpull.bats
+++ b/test/blackbox/pushpull.bats
@ -15,7 +15,7 @@ function setup_file() {
    mkdir -p ${oci_data_dir}
    cat > ${zot_config_file}<<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_root_dir}"
    },
--- a/test/blackbox/scrub.bats
+++ b/test/blackbox/scrub.bats
@ -21,7 +21,7 @@ function setup() {
    touch ${ZOT_LOG_FILE}
    cat >${ZOT_CONFIG_FILE} <<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${ZOT_ROOT_DIR}"
    },
--- a/test/blackbox/sync.bats
+++ b/test/blackbox/sync.bats
@ -26,7 +26,7 @@ function setup_file() {

    cat >${zot_sync_per_config_file} <<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_sync_per_root_dir}"
    },
@ -61,7 +61,7 @@ EOF

    cat >${zot_sync_ondemand_config_file} <<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_sync_ondemand_root_dir}"
    },
@ -94,7 +94,7 @@ EOF
 EOF
    cat >${zot_minimal_config_file} <<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_minimal_root_dir}"
    },
--- a/test/blackbox/sync_docker.bats
+++ b/test/blackbox/sync_docker.bats
@ -14,7 +14,7 @@ function setup_file() {

    cat >${zot_sync_ondemand_config_file} <<EOF
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "${zot_root_dir}"
    },
--- a/test/cluster/config-minio.json
+++ b/test/cluster/config-minio.json
@ -1,5 +1,5 @@
 {
-    "distSpecVersion": "1.0.1",
+    "distSpecVersion": "1.1.0",
    "storage": {
        "rootDirectory": "/tmp/zot",
        "gc": false,