Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit de4e7d0

Browse files
author
Jean-Christophe Sirot
committed
Bump cnab-go and duffle dependencies. Reflect Bundle struct modifcations (mandatory schema version, JSON schema validation) in the code and tests
Signed-off-by: Jean-Christophe Sirot <jean-christophe.sirot@docker.com>
1 parent f224aa0 commit de4e7d0

94 files changed

Lines changed: 24737 additions & 583 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Gopkg.lock‎

Lines changed: 50 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@ required = ["github.com/wadey/gocovmerge"]
4242

4343
[[override]]
4444
name = "github.com/deislabs/duffle"
45-
branch = "master"
45+
branch = "sync-cnab-go-dep"
46+
source = "https://github.com/jcsirot/duffle.git"
47+
48+
[[override]]
49+
name = "github.com/deislabs/cnab-go"
50+
branch = "fix-nil-pointer-default-value"
51+
source = "https://github.com/jcsirot/cnab-go.git"
4652

4753
[[constraint]]
4854
name = "github.com/sirupsen/logrus"

‎e2e/testdata/bundle-with-tag.json.golden‎

Lines changed: 87 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"schemaVersion": "v1.0.0-WD",
23
"name": "simple",
34
"version": "1.1.0-beta1",
45
"description": "new fancy webapp with microservices",
@@ -45,98 +46,119 @@
4546
"io.cnab.status": {}
4647
},
4748
"parameters": {
49+
"fields": {
50+
"api_host": {
51+
"definition": "api_host",
52+
"destination": {
53+
"env": "docker_param1"
54+
}
55+
},
56+
"com.docker.app.kubernetes-namespace": {
57+
"definition": "com.docker.app.kubernetes-namespace",
58+
"applyTo": [
59+
"install",
60+
"upgrade",
61+
"uninstall",
62+
"io.cnab.status"
63+
],
64+
"destination": {
65+
"env": "DOCKER_KUBERNETES_NAMESPACE"
66+
}
67+
},
68+
"com.docker.app.orchestrator": {
69+
"definition": "com.docker.app.orchestrator",
70+
"applyTo": [
71+
"install",
72+
"upgrade",
73+
"uninstall",
74+
"io.cnab.status"
75+
],
76+
"destination": {
77+
"env": "DOCKER_STACK_ORCHESTRATOR"
78+
}
79+
},
80+
"com.docker.app.render-format": {
81+
"definition": "com.docker.app.render-format",
82+
"applyTo": [
83+
"com.docker.app.render"
84+
],
85+
"destination": {
86+
"env": "DOCKER_RENDER_FORMAT"
87+
}
88+
},
89+
"com.docker.app.share-registry-creds": {
90+
"definition": "com.docker.app.share-registry-creds",
91+
"destination": {
92+
"env": "DOCKER_SHARE_REGISTRY_CREDS"
93+
}
94+
},
95+
"static_subdir": {
96+
"definition": "static_subdir",
97+
"destination": {
98+
"env": "docker_param2"
99+
}
100+
},
101+
"web_port": {
102+
"definition": "web_port",
103+
"destination": {
104+
"env": "docker_param3"
105+
}
106+
}
107+
}
108+
},
109+
"credentials": {
110+
"com.docker.app.registry-creds": {
111+
"path": "/cnab/app/registry-creds.json"
112+
},
113+
"docker.context": {
114+
"path": "/cnab/app/context.dockercontext"
115+
}
116+
},
117+
"definitions": {
48118
"api_host": {
49-
"type": "string",
50119
"default": "example.com",
51-
"destination": {
52-
"env": "docker_param1"
53-
}
120+
"type": "string"
54121
},
55122
"com.docker.app.kubernetes-namespace": {
56-
"type": "string",
57123
"default": "",
58-
"metadata": {
59-
"description": "Namespace in which to deploy"
60-
},
61-
"destination": {
62-
"env": "DOCKER_KUBERNETES_NAMESPACE"
63-
},
64-
"apply-to": [
65-
"install",
66-
"upgrade",
67-
"uninstall",
68-
"io.cnab.status"
69-
]
124+
"description": "Namespace in which to deploy",
125+
"title": "Namespace",
126+
"type": "string"
70127
},
71128
"com.docker.app.orchestrator": {
72-
"type": "string",
73129
"default": "",
74-
"allowedValues": [
130+
"description": "Orchestrator on which to deploy",
131+
"enum": [
75132
"",
76133
"swarm",
77134
"kubernetes"
78135
],
79-
"metadata": {
80-
"description": "Orchestrator on which to deploy"
81-
},
82-
"destination": {
83-
"env": "DOCKER_STACK_ORCHESTRATOR"
84-
},
85-
"apply-to": [
86-
"install",
87-
"upgrade",
88-
"uninstall",
89-
"io.cnab.status"
90-
]
136+
"title": "Orchestrator",
137+
"type": "string"
91138
},
92139
"com.docker.app.render-format": {
93-
"type": "string",
94140
"default": "yaml",
95-
"allowedValues": [
141+
"description": "Output format for the render command",
142+
"enum": [
96143
"yaml",
97144
"json"
98145
],
99-
"metadata": {
100-
"description": "Output format for the render command"
101-
},
102-
"destination": {
103-
"env": "DOCKER_RENDER_FORMAT"
104-
},
105-
"apply-to": [
106-
"com.docker.app.render"
107-
]
146+
"title": "Render format",
147+
"type": "string"
108148
},
109149
"com.docker.app.share-registry-creds": {
110-
"type": "bool",
111150
"default": false,
112-
"metadata": {
113-
"description": "Share registry credentials with the invocation image"
114-
},
115-
"destination": {
116-
"env": "DOCKER_SHARE_REGISTRY_CREDS"
117-
}
151+
"description": "Share registry credentials with the invocation image",
152+
"title": "Share registry credentials",
153+
"type": "boolean"
118154
},
119155
"static_subdir": {
120-
"type": "string",
121156
"default": "data/static",
122-
"destination": {
123-
"env": "docker_param2"
124-
}
157+
"type": "string"
125158
},
126159
"web_port": {
127-
"type": "string",
128160
"default": "8082",
129-
"destination": {
130-
"env": "docker_param3"
131-
}
132-
}
133-
},
134-
"credentials": {
135-
"com.docker.app.registry-creds": {
136-
"path": "/cnab/app/registry-creds.json"
137-
},
138-
"docker.context": {
139-
"path": "/cnab/app/context.dockercontext"
161+
"type": "string"
140162
}
141163
}
142164
}

‎e2e/testdata/cnab-with-docker-status/bundle.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"schemaVersion": "v1.0.0-WD",
23
"name": "cnab-with-docker-status",
34
"version": "0.1.0",
45
"invocationImages": [

‎e2e/testdata/cnab-with-standard-status/bundle.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"schemaVersion": "v1.0.0-WD",
23
"name": "cnab-with-standard-status",
34
"version": "0.1.0",
45
"invocationImages": [
@@ -12,4 +13,4 @@
1213
"modifies": false
1314
}
1415
}
15-
}
16+
}

‎e2e/testdata/cnab-without-status/bundle.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
2+
"schemaVersion": "v1.0.0-WD",
23
"name": "cnab-without-status",
34
"version": "0.1.0",
45
"invocationImages": [
56
{
6-
"imageType": "docker",
7-
"image": "e2e/cnab-without-status:v0.1.0"
7+
"imageType": "docker",
8+
"image": "e2e/cnab-without-status:v0.1.0"
89
}
910
]
10-
}
11+
}

0 commit comments

Comments
 (0)