1497819 - Broker should not rely on image field of APB yaml #433
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shawn-hurley
requested changes
Sep 14, 2017
pkg/broker/broker.go
Outdated
| imageName := strings.Replace(spec.Image, ":", "-", -1) | ||
| spec.FQName = strings.Replace(fmt.Sprintf("%v-%v", registryName, imageName), | ||
| spec.FQName = strings.Replace( | ||
| fmt.Sprintf("%v-%v", registryName, spec.FQName), |
There was a problem hiding this comment.
I worry that the FQName could have . in it. If it does, this has caused issues with the service catalog in the past and might be worth replacing here.
pkg/apb/types.go
Outdated
| @@ -62,7 +62,7 @@ type Plan struct { | |||
| type Spec struct { | |||
| ID string `json:"id"` | |||
| FQName string `json:"name" yaml:"name"` | |||
| Image string `json:"image"` | |||
| Image string `json:"image,omitempty"` | |||
There was a problem hiding this comment.
I don't understand the need for this change. I don't think it will hurt but don't know why we need it.
I could see you doing yaml:"-" so that we never take anything for the APB spec.
There was a problem hiding this comment.
you are correct. I don't believe I fully understand yet what the rules and side-effects are for struct tags. I couldn't find anything that detailed yaml:"-" or the json/yaml struct tags in general, if there is anything you could point me to that would be helpful.
djzager
force-pushed
the
remove-image
branch
3 times, most recently
from
fc5a34e
to
a12fd9d
Compare
shawn-hurley
approved these changes
Sep 25, 2017
rthallisey
approved these changes
Sep 28, 2017
|
Since this is a feature, do we want to wait on merging this until we branch? |
rthallisey
added
do-not-merge
djzager
changed the title
djzager
changed the title
jmrodri
changed the title
|
@djzager commit should be "bug # - commit message". Renamed the PR. |
The purpose of this change is to make it so that the full path to each image is used when executing APBs instead of relying on what is stated in the APB yaml. - Update the Spec to make Image optional (for when we remove it from APB yaml) - Update the registry adapters to store the full path to the image when unmarshalling the APB yaml -> APB spec before we store it into `etcd` - Update the broker to have simpler format for `FQName`
Update apb struct to not pull image from apb yaml. Also, update broker to use regex replace.
djzager
removed
the
do-not-merge
|
I believe this is ready now. |
jianzhangbjz
pushed a commit
to jianzhangbjz/ansible-service-broker
that referenced
this pull request
May 17, 2018
…shift#433) * Bug 1497819 - Broker should not rely on image field of APB yaml The purpose of this change is to make it so that the full path to each image is used when executing APBs instead of relying on what is stated in the APB yaml. - Update the Spec to make Image optional (for when we remove it from APB yaml) - Update the registry adapters to store the full path to the image when unmarshalling the APB yaml -> APB spec before we store it into `etcd` - Update the broker to have simpler format for `FQName` * Do not read image from apb.yaml Update apb struct to not pull image from apb yaml. Also, update broker to use regex replace. * Change serviceclass names to match new FQName format
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The purpose of this change is to make it so that the full path to each
image is used when executing APBs instead of relying on what is stated
in the APB yaml.
yaml)
unmarshalling the APB yaml -> APB spec before we store it into
etcdFQNameImplements #431
Fixes #288
Bug 1497819