Rename release_name to release

cloudfoundry-incubator · Aug 3, 2018 · c834d98 · c834d98
1 parent b041363
commit c834d98
Show file tree

Hide file tree

Showing 35 changed files with 85 additions and 85 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -10,17 +10,17 @@ 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
 
 - name: to-be-colocated
   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
@@ -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
@@ -4,15 +4,15 @@ instance_groups:
   type: bosh-task
   jobs:
   - name: new_hostname
-    release_name: tor
+    release: tor
   run:
     flight-stage: pre-flight
     memory: 128
 - name: post-role
   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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,17 +17,17 @@ instance_groups:
   - headless
   jobs:
   - name: new_hostname
-    release_name: tor
+    release: tor
   - name: tor
-    release_name: tor
+    release: tor
   colocated_containers:
   - to-be-colocated
 
 - name: to-be-colocated
   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
@@ -20,17 +20,17 @@ instance_groups:
   - headless
   jobs:
   - name: new_hostname
-    release_name: tor
+    release: tor
   - name: tor
-    release_name: tor
+    release: tor
   colocated_containers:
   - to-be-colocated
 
 - name: to-be-colocated
   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
@@ -6,24 +6,24 @@ 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
 
 - name: to-be-colocated
   type: colocated-container
   jobs:
   - name: ntpd
-    release_name: ntp
+    release: ntp
   run:
     memory: 1
 
 - name: orphaned
   type: colocated-container
   jobs:
   - name: ntpd
-    release_name: ntp
+    release: ntp
   run:
     memory: 1