Merge pull request #49 from ycombinator/deploy-spec

Adjusting deploy spec
elastic · Sep 18, 2020 · a193a34 · a193a34
2 parents d669841 + 3262240
commit a193a34
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 7 deletions.
diff --git a/code/go/internal/spec/statik.go b/code/go/internal/spec/statik.go
diff --git a/...nternal/validator/test/packages/bad_deploy_variants/_dev/deploy/docker/docker-compose.yml b/...nternal/validator/test/packages/bad_deploy_variants/_dev/deploy/docker/docker-compose.yml
diff --git a/code/go/internal/validator/test/packages/deploy_docker/_dev/deploy/docker/docker-compose.yml b/code/go/internal/validator/test/packages/deploy_docker/_dev/deploy/docker/docker-compose.yml
diff --git a/code/go/internal/validator/test/packages/deploy_docker/_dev/deploy/variants.yml b/code/go/internal/validator/test/packages/deploy_docker/_dev/deploy/variants.yml
@@ -0,0 +1,5 @@
+variants:
+  foo:
+    BAR: baz
+    QUX: 17
+default: foo
diff --git a/code/go/internal/validator/test/packages/deploy_docker/dataset/foo/fields/fields.yml b/code/go/internal/validator/test/packages/deploy_docker/dataset/foo/fields/fields.yml
@@ -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
diff --git a/code/go/internal/validator/test/packages/deploy_docker/dataset/foo/manifest.yml b/code/go/internal/validator/test/packages/deploy_docker/dataset/foo/manifest.yml
@@ -0,0 +1 @@
+title: Nginx access logs
diff --git a/code/go/internal/validator/test/packages/deploy_docker/docs/.empty b/code/go/internal/validator/test/packages/deploy_docker/docs/.empty
diff --git a/code/go/internal/validator/test/packages/deploy_docker/manifest.yml b/code/go/internal/validator/test/packages/deploy_docker/manifest.yml
@@ -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
diff --git a/code/go/pkg/validator/validator_test.go b/code/go/pkg/validator/validator_test.go
@@ -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{

diff --git a/versions/1/_dev/deploy/docker/spec.yml b/versions/1/_dev/deploy/docker/spec.yml
@@ -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
diff --git a/versions/1/_dev/deploy/spec.yml b/versions/1/_dev/deploy/spec.yml
@@ -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"