Handle displaying parameters when secrets are not available. #2355
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
openshift-ci-robot
added
the
size/XL
spadgett
reviewed
Oct 23, 2017
|
|
||
| if (!$scope.allowParametersReveal) { | ||
| _.each(_.keys(_.get($scope.parameterSchema, 'properties')), function (key) { | ||
| $scope.parameterData[key] = '*****'; |
There was a problem hiding this comment.
I think we should be able to just fill in the parameter data from the status parameters below and just remove this if block. Are you seeing parameters in the schema, but not in status?
There was a problem hiding this comment.
Disregard my comment here. Thinking about this more, I think this behavior is better.
| if ($scope.allowParametersReveal) { | ||
| // Set default values for those items that are not specifically set, secrets will override | ||
| _.each(_.keys(_.get($scope.parameterSchema, 'properties')), function (key) { | ||
| $scope.parameterData[key] = $scope.parameterSchema.properties[key].default; |
There was a problem hiding this comment.
I think the defaults are only for prefiling the create form. A missing value isn't necessarily treated as a default.
| _.each(_.get($scope.serviceInstance, 'spec.parametersFrom'), function (parametersSource) { | ||
| secretWatchers.push(DataService.watchObject("secrets", _.get(parametersSource, 'secretKeyRef.name'), $scope.projectContext, function (secret) { | ||
| try { | ||
| _.extend($scope.parameterData, JSON.parse(SecretsService.decodeSecretData(secret.data)[parametersSource.secretKeyRef.key])); | ||
| var secretData = JSON.parse(SecretsService.decodeSecretData(secret.data)[parametersSource.secretKeyRef.key]); | ||
| // TODO: ONly include fields from the secret that are part of the schema |
Bump catalog version to 0.0.58
jeff-phillips-18
force-pushed
the
parameters
branch
from
2ae3b45
to
9f0c28b
Compare
dtaylor113
approved these changes
Oct 24, 2017
|
/lgtm |
|
Needs #2367 to fix the dist problem |
|
/retest |
|
Automatic merge from submit-queue. |
This was referenced Oct 24, 2017
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.
Bump catalog version to 0.0.58