fix update of maintenance window #43
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| ack_generate_info: | ||
| build_date: "2021-07-16T19:55:47Z" | ||
| build_hash: 7832e9aa4a48565302cd440f4cdf2267f04adfed | ||
| go_version: go1.15.2 darwin/amd64 | ||
| version: v0.5.0 | ||
| api_directory_checksum: 04701e412e7e4597466c1d56571be2c5de2b1e27 | ||
| api_version: v1alpha1 | ||
| aws_sdk_go_version: "" | ||
| generator_config_info: | ||
| file_checksum: 821cc69bbfdafc0bb1302bb609f7b92774448303 | ||
| original_file_name: generator.yaml | ||
| last_modification: | ||
| reason: API generation | ||
| timestamp: 2021-07-16 19:55:56.542005 +0000 UTC |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"). You may | ||
| // not use this file except in compliance with the License. A copy of the | ||
| // License is located at | ||
| // | ||
| // http://aws.amazon.com/apache2.0/ | ||
| // | ||
| // or in the "license" file accompanying this file. This file is distributed | ||
| // on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| // express or implied. See the License for the specific language governing | ||
| // permissions and limitations under the License. | ||
|
|
||
| package common | ||
|
|
||
| import ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" | ||
|
|
||
| // remove the Difference corresponding to the given subject from the delta struct | ||
| //TODO: ideally this would have a common implementation in compare/delta.go | ||
| func RemoveFromDelta( | ||
| delta *ackcompare.Delta, | ||
| subject string, | ||
| ) { | ||
| // copy slice | ||
| differences := delta.Differences | ||
|
|
||
| // identify index of Difference to remove | ||
| //TODO: this could require a stricter Path.Equals down the road | ||
| var i *int = nil | ||
| for j, diff := range differences { | ||
| if diff.Path.Contains(subject) { | ||
| i = &j | ||
| break | ||
| } | ||
| } | ||
|
|
||
| // if found, create a new slice and replace the original | ||
| if i != nil { | ||
| differences = append(differences[:*i], differences[*i+1:]...) | ||
| delta.Differences = differences | ||
| } | ||
| } | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -942,57 +942,3 @@ func provideCacheClusterSecurityGroups(IDs ...string) []*svcsdk.SecurityGroupMem | |
| } | ||
| return securityGroups | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"). You may | ||
| // not use this file except in compliance with the License. A copy of the | ||
| // License is located at | ||
| // | ||
| // http://aws.amazon.com/apache2.0/ | ||
| // | ||
| // or in the "license" file accompanying this file. This file is distributed | ||
| // on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| // express or implied. See the License for the specific language governing | ||
| // permissions and limitations under the License. | ||
|
|
||
| package replication_group | ||
|
|
||
| import ( | ||
| "strings" | ||
| "regexp" | ||
|
|
||
| ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare" | ||
|
|
||
| "github.com/aws-controllers-k8s/elasticache-controller/pkg/common" | ||
| ) | ||
|
|
||
| // remove non-meaningful differences from delta | ||
| func filterDelta( | ||
| delta *ackcompare.Delta, | ||
| desired *resource, | ||
| latest *resource, | ||
| ) { | ||
|
Comment on lines
+26
to
+30
Contributor
There was a problem hiding this comment. Nice. Not related to this PR but mentioning it here due to its context: I think this is where Server defaults can be handled: Remove differences from delta when corresponding spec field is nil if last applied spec also had that field nil.
Contributor
Author
There was a problem hiding this comment. Yep this should enable us to (at least temporarily) handle defaults before the framework-level solution is ready |
||
|
|
||
| if delta.DifferentAt("Spec.EngineVersion") { | ||
| if desired.ko.Spec.EngineVersion != nil && latest.ko.Spec.EngineVersion != nil { | ||
| if engineVersionsMatch(*desired.ko.Spec.EngineVersion, *latest.ko.Spec.EngineVersion) { | ||
| common.RemoveFromDelta(delta, "Spec.EngineVersion") | ||
| } | ||
| } | ||
| // TODO: handle the case of a nil difference (especially when desired EV is nil) | ||
| } | ||
| } | ||
|
|
||
| // returns true if desired and latest engine versions match and false otherwise | ||
| // precondition: both desiredEV and latestEV are non-nil | ||
| // this handles the case where only the major EV is specified, e.g. "6.x" (or similar), but the latest | ||
| // version shows the minor version, e.g. "6.0.5" | ||
| func engineVersionsMatch( | ||
| desiredEV string, | ||
| latestEV string, | ||
| ) bool { | ||
| if desiredEV == latestEV { | ||
| return true | ||
| } | ||
|
|
||
| // if the last character of desiredEV is "x", only check for a major version match | ||
| last := len(desiredEV) - 1 | ||
| if desiredEV[last:] == "x" { | ||
| // cut off the "x" and replace all occurrences of '.' with '\.' (as '.' is a special regex character) | ||
| desired := strings.Replace(desiredEV[:last], ".", "\\.", -1) | ||
| r, _ := regexp.Compile(desired + ".*") | ||
| return r.MatchString(latestEV) | ||
| } | ||
|
|
||
| return false | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"). You may | ||
| // not use this file except in compliance with the License. A copy of the | ||
| // License is located at | ||
| // | ||
| // http://aws.amazon.com/apache2.0/ | ||
| // | ||
| // or in the "license" file accompanying this file. This file is distributed | ||
| // on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| // express or implied. See the License for the specific language governing | ||
| // permissions and limitations under the License. | ||
|
|
||
| package replication_group | ||
|
|
||
| import "testing" | ||
| import "github.com/stretchr/testify/require" | ||
|
|
||
| func TestEngineVersionsMatch(t *testing.T) { | ||
| require := require.New(t) | ||
|
|
||
| require.True(engineVersionsMatch("6.x", "6.0.5")) | ||
| require.False(engineVersionsMatch("13.x", "6.0.6")) | ||
| require.True(engineVersionsMatch("5.0.3", "5.0.3")) | ||
| require.False(engineVersionsMatch("5.0.3", "5.0.4")) | ||
| } |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: This method may return boolean indicating if there was a removal.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ACK, not sure how we would use that return value but we can add it on later if there is a use for it