diff --git a/docs/configuration.md b/docs/configuration.md index 6a9ab5b9..da114083 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -33,7 +33,7 @@ instance_groups: - name: nats # The name of the instance group jobs: # BOSH jobs this group will have - name: nats - release_name: nats # The name of the BOSH release this is from + release: nats # The name of the BOSH release this is from tags: - indexed # Mark this group as indexed (load-balanced) => StatefulSet run: # Runtime configuration @@ -159,7 +159,7 @@ instance_groups: - name: mysql jobs: - name: mysql - release_name: cf-mysql + release: cf-mysql provides: mysql: {} processes: diff --git a/model/roles.go b/model/roles.go index 45d77b80..ba09f20a 100644 --- a/model/roles.go +++ b/model/roles.go @@ -65,8 +65,8 @@ type RoleManifest struct { // JobReference represents a job in the context of a role type JobReference struct { *Job `yaml:"-"` // The resolved job - Name string `yaml:"name"` // The name of the job - ReleaseName string `yaml:"release_name"` // The release the job comes from + Name string `yaml:"name"` // The name of the job + ReleaseName string `yaml:"release"` // The release the job comes from ExportedProviders map[string]jobProvidesInfo `yaml:"provides"` ResolvedConsumers map[string]jobConsumesInfo `yaml:"consumes"` } diff --git a/test-assets/role-manifests/app/hashmat.yml b/test-assets/role-manifests/app/hashmat.yml index 1b7f01fd..65fb7b2c 100644 --- a/test-assets/role-manifests/app/hashmat.yml +++ b/test-assets/role-manifests/app/hashmat.yml @@ -6,7 +6,7 @@ instance_groups: foo: x jobs: - name: hashmat - release_name: tor + release: tor configuration: variables: - name: FOO diff --git a/test-assets/role-manifests/app/roles-to-build.yml b/test-assets/role-manifests/app/roles-to-build.yml index 48deddb4..f5ead823 100644 --- a/test-assets/role-manifests/app/roles-to-build.yml +++ b/test-assets/role-manifests/app/roles-to-build.yml @@ -6,13 +6,13 @@ instance_groups: foo: x jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor diff --git a/test-assets/role-manifests/app/tor-validation-issues.yml b/test-assets/role-manifests/app/tor-validation-issues.yml index bf305282..165ccf87 100644 --- a/test-assets/role-manifests/app/tor-validation-issues.yml +++ b/test-assets/role-manifests/app/tor-validation-issues.yml @@ -6,9 +6,9 @@ instance_groups: foo: x jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor configuration: templates: properties.tor.bogus: BOGUS @@ -18,7 +18,7 @@ instance_groups: foo: x jobs: - name: tor - release_name: tor + release: tor configuration: variables: - name: BAR diff --git a/test-assets/role-manifests/app/tor-validation-ok.yml b/test-assets/role-manifests/app/tor-validation-ok.yml index a9dc5002..9ff6c535 100644 --- a/test-assets/role-manifests/app/tor-validation-ok.yml +++ b/test-assets/role-manifests/app/tor-validation-ok.yml @@ -15,16 +15,16 @@ instance_groups: foo: x jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor configuration: variables: - name: BAR diff --git a/test-assets/role-manifests/builder/tor-good.yml b/test-assets/role-manifests/builder/tor-good.yml index bd7b8704..5ea1e6e3 100644 --- a/test-assets/role-manifests/builder/tor-good.yml +++ b/test-assets/role-manifests/builder/tor-good.yml @@ -14,16 +14,16 @@ instance_groups: foo: x jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor configuration: variables: - name: BAR diff --git a/test-assets/role-manifests/compilator/tor-good.yml b/test-assets/role-manifests/compilator/tor-good.yml index f1903e03..f64b1d60 100644 --- a/test-assets/role-manifests/compilator/tor-good.yml +++ b/test-assets/role-manifests/compilator/tor-good.yml @@ -5,13 +5,13 @@ instance_groups: foo: x jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor diff --git a/test-assets/role-manifests/kube/colocated-containers-with-stateful-set-and-empty-dir.yml b/test-assets/role-manifests/kube/colocated-containers-with-stateful-set-and-empty-dir.yml index ae056310..d69ba0dc 100644 --- a/test-assets/role-manifests/kube/colocated-containers-with-stateful-set-and-empty-dir.yml +++ b/test-assets/role-manifests/kube/colocated-containers-with-stateful-set-and-empty-dir.yml @@ -3,7 +3,7 @@ instance_groups: - name: myrole jobs: - name: tor - release_name: tor + release: tor run: capabilities: - something @@ -28,7 +28,7 @@ instance_groups: type: colocated-container jobs: - name: tor - release_name: tor + release: tor run: capabilities: - something diff --git a/test-assets/role-manifests/kube/colocated-containers.yml b/test-assets/role-manifests/kube/colocated-containers.yml index d09fb1e1..78bc43ab 100644 --- a/test-assets/role-manifests/kube/colocated-containers.yml +++ b/test-assets/role-manifests/kube/colocated-containers.yml @@ -10,9 +10,9 @@ instance_groups: tag: shared-data jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor colocated_containers: - to-be-colocated @@ -20,7 +20,7 @@ instance_groups: type: colocated-container jobs: - name: ntpd - release_name: ntp + release: ntp run: memory: 1 volumes: diff --git a/test-assets/role-manifests/kube/job-with-annotation.yml b/test-assets/role-manifests/kube/job-with-annotation.yml index 72790a20..c99e5448 100644 --- a/test-assets/role-manifests/kube/job-with-annotation.yml +++ b/test-assets/role-manifests/kube/job-with-annotation.yml @@ -4,7 +4,7 @@ instance_groups: type: bosh-task jobs: - name: new_hostname - release_name: tor + release: tor run: flight-stage: post-flight memory: 128 diff --git a/test-assets/role-manifests/kube/jobs.yml b/test-assets/role-manifests/kube/jobs.yml index fbd8fc82..9017f76a 100644 --- a/test-assets/role-manifests/kube/jobs.yml +++ b/test-assets/role-manifests/kube/jobs.yml @@ -4,7 +4,7 @@ instance_groups: type: bosh-task jobs: - name: new_hostname - release_name: tor + release: tor run: flight-stage: pre-flight memory: 128 @@ -12,7 +12,7 @@ instance_groups: type: bosh-task jobs: - name: tor - release_name: tor + release: tor run: flight-stage: post-flight memory: 256 diff --git a/test-assets/role-manifests/kube/pods.yml b/test-assets/role-manifests/kube/pods.yml index d32c5994..34cf1119 100644 --- a/test-assets/role-manifests/kube/pods.yml +++ b/test-assets/role-manifests/kube/pods.yml @@ -5,7 +5,7 @@ instance_groups: tags: [stop-on-failure] jobs: - name: new_hostname - release_name: tor + release: tor run: flight-stage: pre-flight memory: 128 @@ -19,7 +19,7 @@ instance_groups: tags: [stop-on-failure] jobs: - name: tor - release_name: tor + release: tor run: flight-stage: post-flight memory: 256 diff --git a/test-assets/role-manifests/kube/volumes-with-annotation.yml b/test-assets/role-manifests/kube/volumes-with-annotation.yml index 8ec3d68c..9d1157ad 100644 --- a/test-assets/role-manifests/kube/volumes-with-annotation.yml +++ b/test-assets/role-manifests/kube/volumes-with-annotation.yml @@ -3,7 +3,7 @@ instance_groups: - name: myrole jobs: - name: tor - release_name: tor + release: tor run: capabilities: - something diff --git a/test-assets/role-manifests/kube/volumes.yml b/test-assets/role-manifests/kube/volumes.yml index 9f6af3db..6243b083 100644 --- a/test-assets/role-manifests/kube/volumes.yml +++ b/test-assets/role-manifests/kube/volumes.yml @@ -3,7 +3,7 @@ instance_groups: - name: myrole jobs: - name: tor - release_name: tor + release: tor run: capabilities: - something diff --git a/test-assets/role-manifests/model/bad-cv-type-internal.yml b/test-assets/role-manifests/model/bad-cv-type-internal.yml index 174a1183..8f124444 100644 --- a/test-assets/role-manifests/model/bad-cv-type-internal.yml +++ b/test-assets/role-manifests/model/bad-cv-type-internal.yml @@ -6,7 +6,7 @@ instance_groups: foo: x jobs: - name: new_hostname - release_name: tor + release: tor configuration: variables: - name: BAR diff --git a/test-assets/role-manifests/model/bad-cv-type.yml b/test-assets/role-manifests/model/bad-cv-type.yml index 6f347a5f..82ef16c1 100644 --- a/test-assets/role-manifests/model/bad-cv-type.yml +++ b/test-assets/role-manifests/model/bad-cv-type.yml @@ -15,16 +15,16 @@ instance_groups: foo: x jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor configuration: variables: - name: BAR diff --git a/test-assets/role-manifests/model/bosh-run-env.yml b/test-assets/role-manifests/model/bosh-run-env.yml index 2aaedf68..25acf4b0 100644 --- a/test-assets/role-manifests/model/bosh-run-env.yml +++ b/test-assets/role-manifests/model/bosh-run-env.yml @@ -9,6 +9,6 @@ instance_groups: - FOO jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor diff --git a/test-assets/role-manifests/model/bosh-run-missing.yml b/test-assets/role-manifests/model/bosh-run-missing.yml index 776c9250..ec2bdef7 100644 --- a/test-assets/role-manifests/model/bosh-run-missing.yml +++ b/test-assets/role-manifests/model/bosh-run-missing.yml @@ -3,16 +3,16 @@ instance_groups: - name: myrole jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor configuration: variables: - name: BAR diff --git a/test-assets/role-manifests/model/colocated-containers-with-clustered-tag.yml b/test-assets/role-manifests/model/colocated-containers-with-clustered-tag.yml index a55ef8af..1fb99f38 100644 --- a/test-assets/role-manifests/model/colocated-containers-with-clustered-tag.yml +++ b/test-assets/role-manifests/model/colocated-containers-with-clustered-tag.yml @@ -10,9 +10,9 @@ instance_groups: tag: shared-data jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor colocated_containers: - to-be-colocated @@ -21,7 +21,7 @@ instance_groups: tags: [headless] jobs: - name: ntpd - release_name: ntp + release: ntp run: memory: 1 volumes: diff --git a/test-assets/role-manifests/model/colocated-containers-with-missing-role.yml b/test-assets/role-manifests/model/colocated-containers-with-missing-role.yml index e3ef52a2..a339313b 100644 --- a/test-assets/role-manifests/model/colocated-containers-with-missing-role.yml +++ b/test-assets/role-manifests/model/colocated-containers-with-missing-role.yml @@ -6,8 +6,8 @@ instance_groups: memory: 1 jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor colocated_containers: - to-be-colocated-typo diff --git a/test-assets/role-manifests/model/colocated-containers-with-no-port-collision.yml b/test-assets/role-manifests/model/colocated-containers-with-no-port-collision.yml index 3588523d..89da8264 100644 --- a/test-assets/role-manifests/model/colocated-containers-with-no-port-collision.yml +++ b/test-assets/role-manifests/model/colocated-containers-with-no-port-collision.yml @@ -17,9 +17,9 @@ instance_groups: - headless jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor colocated_containers: - to-be-colocated @@ -27,7 +27,7 @@ instance_groups: type: colocated-container jobs: - name: ntpd - release_name: ntp + release: ntp run: memory: 1 exposed-ports: diff --git a/test-assets/role-manifests/model/colocated-containers-with-port-collision.yml b/test-assets/role-manifests/model/colocated-containers-with-port-collision.yml index 3c4f5fc2..f8c5b10e 100644 --- a/test-assets/role-manifests/model/colocated-containers-with-port-collision.yml +++ b/test-assets/role-manifests/model/colocated-containers-with-port-collision.yml @@ -20,9 +20,9 @@ instance_groups: - headless jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor colocated_containers: - to-be-colocated @@ -30,7 +30,7 @@ instance_groups: type: colocated-container jobs: - name: ntpd - release_name: ntp + release: ntp run: memory: 1 exposed-ports: diff --git a/test-assets/role-manifests/model/colocated-containers-with-unused-role.yml b/test-assets/role-manifests/model/colocated-containers-with-unused-role.yml index 39e7900a..9b98cf9c 100644 --- a/test-assets/role-manifests/model/colocated-containers-with-unused-role.yml +++ b/test-assets/role-manifests/model/colocated-containers-with-unused-role.yml @@ -6,9 +6,9 @@ instance_groups: memory: 1 jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor colocated_containers: - to-be-colocated @@ -16,7 +16,7 @@ instance_groups: type: colocated-container jobs: - name: ntpd - release_name: ntp + release: ntp run: memory: 1 @@ -24,6 +24,6 @@ instance_groups: type: colocated-container jobs: - name: ntpd - release_name: ntp + release: ntp run: memory: 1 diff --git a/test-assets/role-manifests/model/colocated-containers-with-volume-share-issues.yml b/test-assets/role-manifests/model/colocated-containers-with-volume-share-issues.yml index c0ab57be..50e4d593 100644 --- a/test-assets/role-manifests/model/colocated-containers-with-volume-share-issues.yml +++ b/test-assets/role-manifests/model/colocated-containers-with-volume-share-issues.yml @@ -19,9 +19,9 @@ instance_groups: tag: mount-share jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor colocated_containers: - to-be-colocated @@ -29,7 +29,7 @@ instance_groups: type: colocated-container jobs: - name: ntpd - release_name: ntp + release: ntp run: memory: 1 volumes: diff --git a/test-assets/role-manifests/model/colocated-containers.yml b/test-assets/role-manifests/model/colocated-containers.yml index d09fb1e1..78bc43ab 100644 --- a/test-assets/role-manifests/model/colocated-containers.yml +++ b/test-assets/role-manifests/model/colocated-containers.yml @@ -10,9 +10,9 @@ instance_groups: tag: shared-data jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor colocated_containers: - to-be-colocated @@ -20,7 +20,7 @@ instance_groups: type: colocated-container jobs: - name: ntpd - release_name: ntp + release: ntp run: memory: 1 volumes: diff --git a/test-assets/role-manifests/model/multiple-bad.yml b/test-assets/role-manifests/model/multiple-bad.yml index 09ae0635..f5611b57 100644 --- a/test-assets/role-manifests/model/multiple-bad.yml +++ b/test-assets/role-manifests/model/multiple-bad.yml @@ -6,13 +6,13 @@ instance_groups: memory: 1 jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: ntpd - release_name: ntp + release: ntp - name: foorole type: bosh-task jobs: - name: ntpd - release_name: foo + release: foo diff --git a/test-assets/role-manifests/model/multiple-good.yml b/test-assets/role-manifests/model/multiple-good.yml index 1e1a7c3a..082b1a8b 100644 --- a/test-assets/role-manifests/model/multiple-good.yml +++ b/test-assets/role-manifests/model/multiple-good.yml @@ -6,15 +6,15 @@ instance_groups: memory: 1 jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: ntpd - release_name: ntp + release: ntp - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor diff --git a/test-assets/role-manifests/model/non-bosh-roles.yml b/test-assets/role-manifests/model/non-bosh-roles.yml index 5bad5542..84015ad2 100644 --- a/test-assets/role-manifests/model/non-bosh-roles.yml +++ b/test-assets/role-manifests/model/non-bosh-roles.yml @@ -6,16 +6,16 @@ instance_groups: memory: 1 jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor - name: dockerrole type: docker fookey: somevalue diff --git a/test-assets/role-manifests/model/templates-non.yml b/test-assets/role-manifests/model/templates-non.yml index dd2b1992..555ffa25 100644 --- a/test-assets/role-manifests/model/templates-non.yml +++ b/test-assets/role-manifests/model/templates-non.yml @@ -14,16 +14,16 @@ instance_groups: foo: x jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor configuration: variables: - name: BAR diff --git a/test-assets/role-manifests/model/tor-bad.yml b/test-assets/role-manifests/model/tor-bad.yml index 1b2e57cc..7ebb62a7 100644 --- a/test-assets/role-manifests/model/tor-bad.yml +++ b/test-assets/role-manifests/model/tor-bad.yml @@ -5,12 +5,12 @@ instance_groups: memory: 1 jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole run: memory: 1 jobs: - name: foo # This job should not exist - release_name: tor + release: tor diff --git a/test-assets/role-manifests/model/tor-good.yml b/test-assets/role-manifests/model/tor-good.yml index 65fdcca1..5d235a03 100644 --- a/test-assets/role-manifests/model/tor-good.yml +++ b/test-assets/role-manifests/model/tor-good.yml @@ -14,13 +14,13 @@ instance_groups: foo: x jobs: - name: new_hostname - release_name: tor + release: tor - name: tor - release_name: tor + release: tor - name: foorole type: bosh-task run: foo: x jobs: - name: tor - release_name: tor + release: tor diff --git a/test-assets/role-manifests/model/variable-expansion.yml b/test-assets/role-manifests/model/variable-expansion.yml index cc3bf6c1..ccbfc174 100644 --- a/test-assets/role-manifests/model/variable-expansion.yml +++ b/test-assets/role-manifests/model/variable-expansion.yml @@ -7,7 +7,7 @@ instance_groups: foo: x jobs: - name: tor - release_name: tor + release: tor configuration: variables: - name: BAR diff --git a/test-assets/role-manifests/model/variables-without-decl.yml b/test-assets/role-manifests/model/variables-without-decl.yml index cb1f7f70..0e006ac7 100644 --- a/test-assets/role-manifests/model/variables-without-decl.yml +++ b/test-assets/role-manifests/model/variables-without-decl.yml @@ -6,7 +6,7 @@ instance_groups: foo: x jobs: - name: tor - release_name: tor + release: tor configuration: variables: - name: BAR diff --git a/test-assets/role-manifests/model/variables-without-usage.yml b/test-assets/role-manifests/model/variables-without-usage.yml index 7451bdc4..067fff9e 100644 --- a/test-assets/role-manifests/model/variables-without-usage.yml +++ b/test-assets/role-manifests/model/variables-without-usage.yml @@ -4,7 +4,7 @@ instance_groups: - name: myrole jobs: - name: tor - release_name: tor + release: tor run: {} configuration: variables: