Add TeamCity metadata to that of an Instance Template#29
Merged
undimmable merged 3 commits intoOct 15, 2019
Merged
Conversation
updated properties log to use the base class for using toString() removed metadata details from log in case of sensitive info
Contributor
Author
|
Here are some testing logs from the metadata capture: |
Contributor
Author
|
@dimyriy @dmitry-treskunov have you had a chance to take a look at the changes? I've been running this live for a couple of weeks now with no issues, and I'd like to weigh the possibility of pulling this to the master. |
undimmable
suggested changes
Oct 9, 2019
Contributor
undimmable
left a comment
There was a problem hiding this comment.
@mohsenrezaeithe, thank you for contributing! The pull request looks good to be merged into master overall except the comment about logging.
Contributor
Author
|
@dimyriy thanks for reviewing! Good feedback, log details are removed. |
Contributor
|
Thank you for contributing! |
This file contains hidden or 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
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.
This fixes https://youtrack.jetbrains.com/issue/TW-61898
Prior to the change the
getInstanceBuilderwas overwriting the Instance Template'sCustom metadatawith thesetMetadataaction.This change pulls the configured Instance Template's information from GCP and adds the existing metadata to the custom TeamCity server ones before setting it for the new instance. In addition, a new method,
getInstanceBuilder, also avoids overwriting theAvailability policiesin the newly created instance as well (values are inherited from the Instance Template).All changes are tested in a staging environment with simulated workload.