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.

Sign up for GitHub

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

Marketplace remove hash from manifest #864

Merged
merged 3 commits into from
Apr 19, 2019
Merged

Marketplace remove hash from manifest #864

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
198b711
Remove hash from manifest (because it's in manifest.definition)
NicolasMahe Apr 17, 2019
6684d3e
Merge branch 'dev' into ss/marketplace-remove-hash-manifest
antho1404 Apr 19, 2019
17d62bb
Merge branch 'dev' into ss/marketplace-remove-hash-manifest
NicolasMahe Apr 19, 2019
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
1 change: 0 additions & 1 deletion commands/marketplace_publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ func (c *marketplacePublishCmd) runE(cmd *cobra.Command, args []string) error {
pretty.Progress("Publishing service on the marketplace...", func() {
if tx, err = c.e.PreparePublishServiceVersion(provider.MarketplaceManifestServiceData{
Definition: c.service.Definition,
Hash: c.service.Definition.Hash,
HashVersion: marketplaceServiceHashVersion,
Readme: readme,
Deployment: deployment,
Expand Down
1 change: 0 additions & 1 deletion commands/provider/marketplace_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ type MarketplaceDeployedSource struct {
type MarketplaceManifestServiceData struct {
Definition *definition.Service `json:"definition"`
Readme string `json:"readme,omitempty"`
Hash string `json:"hash"`
HashVersion string `json:"hashVersion"`
Deployment MarketplaceDeployedSource `json:"deployment"`
}
Expand Down
8 changes: 1 addition & 7 deletions systemservices/marketplace/mesg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,7 @@ tasks:
type: String
service: &manifestServiceData
type: Object
object:
hash:
name: ""
description: ""
type: String
object:
krhubert marked this conversation as resolved.
Show resolved Hide resolved
hashVersion:
name: ""
description: ""
Expand Down Expand Up @@ -167,8 +163,6 @@ tasks:
service:
type: Object
object:
hash:
type: String
hashVersion:
type: String
deployment:
Expand Down
3 changes: 1 addition & 2 deletions systemservices/marketplace/src/types/manifest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
export interface Manifest {
version: '1'
service: {
hash: string
hashVersion: '1'
deployment: {
type: 'ipfs'|'http'|'https'
source: string
}
definition: any,
definition: any, // TODO: add ts definition or json schema validation
readme?: string
}
}
4 changes: 0 additions & 4 deletions systemservices/marketplace/src/types/schema/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
],
"type": "object"
},
"hash": {
"type": "string"
},
"hashVersion": {
"enum": [
"1"
Expand All @@ -41,7 +38,6 @@
"required": [
"definition",
"deployment",
"hash",
"hashVersion"
],
"type": "object"
Expand Down