Closed douglas-reid closed 7 years ago
@douglas-reid: Adding do-not-merge/release-note-label-needed because the release note process has not been followed.
/hold
/lgtm
/lgtm cancel //PR changed after LGTM, removing LGTM. @douglas-reid @geeknoid
PTAL. Updated code to address linter issues. This required a small set of changes around error-handling, but I think that is OK given initial feedback.
Groovy.
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: geeknoid
The full list of commands accepted by this bot can be found here.
/test all [submit-queue is verifying that this PR is safe to merge]
Automatic merge from submit-queue.
Merging #1460 into master will decrease coverage by
0.08%
. The diff coverage is63.63%
.
@@ Coverage Diff @@
## master #1460 +/- ##
==========================================
- Coverage 84.66% 84.58% -0.09%
==========================================
Files 122 122
Lines 11922 11980 +58
==========================================
+ Hits 10094 10133 +39
- Misses 1632 1646 +14
- Partials 196 201 +5
Impacted Files | Coverage Δ | |
---|---|---|
pkg/api/grpcServer.go | 76.17% <62.5%> (-2%) |
:arrow_down: |
pkg/attribute/mutableBag.go | 89.71% <64.7%> (-1.71%) |
:arrow_down: |
adapter/stackdriver/metric/bufferedClient.go | 90% <0%> (-2.5%) |
:arrow_down: |
pkg/expr/func.go | 97.34% <0%> (-1.17%) |
:arrow_down: |
pkg/il/evaluator/evaluator.go | 81.67% <0%> (-1.11%) |
:arrow_down: |
pkg/il/compiler/compiler.go | 88.38% <0%> (+0.19%) |
:arrow_up: |
Continue to review full report at Codecov.
Legend - Click here to learn more
Δ = absolute <relative> (impact)
,ø = not affected
,? = missing data
Powered by Codecov. Last update 4eba741...94a9aad. Read the comment docs.
Prevent APAs from overriding attributes sent in the original request.
This adds a new method to
MutableBag
namedPreserveMerge
which takes in bags that possibly contain conflicts and does a merge in which original values are maintained and conflicts are silently dropped on the floor.This is in response to errors reported on the dev mailing list that stemmed from having multiple values for the attribute
destination.service
in the attribute bag that was used to create instances.Release note:
This change is