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

Adjusting deploy spec #49

Merged
merged 3 commits into from
Sep 18, 2020
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
2 changes: 1 addition & 1 deletion code/go/internal/spec/statik.go

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
variants:
foo:
BAR: baz
QUX: 17
default: foo
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- name: source
title: Source
group: 2
type: group
fields:
- name: geo.city_name
level: core
type: keyword
description: City name.
ignore_above: 1024
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
title: Nginx access logs
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
format_version: 1.0.4
name: bad_deploy_variants
title: Bad Deploy Variants
description: This package contains a bad _dev/deploy folder.
version: 0.1.2
release: beta
owner:
github: elastic/foobar
3 changes: 2 additions & 1 deletion code/go/pkg/validator/validator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ func TestValidate(t *testing.T) {
invalidPkgFilePath string
expectedErrContains []string
}{
"good": {},
"good": {},
"deploy_docker": {},
"bad_deploy_variants": {
"_dev/deploy/variants.yml",
[]string{
Expand Down
8 changes: 8 additions & 0 deletions versions/1/_dev/deploy/docker/spec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
spec:
additionalContents: true
contents:
- description: Docker Compose configuration file for deploying package's integration service(s)
type: file
name: "docker-compose.yml"
contentMediaType: "application/x-yaml"
required: true
10 changes: 5 additions & 5 deletions versions/1/_dev/deploy/spec.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
spec:
additionalContents: false
contents:
- description: Docker Compose configuration file for deploying package's integration service(s)
type: file
name: "docker-compose.yml"
contentMediaType: "application/x-yaml"
required: false
- description: Folder containing deployment files for a Docker-based service deployment
type: folder
name: docker
$ref: "./docker/spec.yml"
required: true # to be adjusted when we add other deployment models
- description: Configuration file describing variations available for deployment
type: file
name: "variants.yml"
Expand Down