Update RDS postgres restore command #1118
Merged
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
Add function to fetch RDS DB EngineVersion
akankshakumari393
requested review from
viveksinghggits,
PrasadG193 and
pavannd1
PrasadG193
reviewed
Oct 18, 2021
pkg/function/restore_rds_snapshot.go
Outdated
| return nil, errors.Wrapf(err, "Couldn't find DBInstance Version") | ||
| } | ||
| // Add Constraints | ||
| constraints, err := version.NewConstraint(">= 13.0") |
There was a problem hiding this comment.
Lets declare version as const
Co-authored-by: Prasad Ghangal <prasad.ghangal@gmail.com>
PrasadG193
reviewed
Oct 18, 2021
pkg/function/restore_rds_snapshot.go
Outdated
| return nil, errors.Wrapf(err, "Couldn't add constraint to DBInstance Version") | ||
| } | ||
| // Verify Constraints | ||
| if !constraints.Check(v1) { |
There was a problem hiding this comment.
is it same as v1 >= RDSPostgresDBInstanceEngineVersion?
There was a problem hiding this comment.
@PrasadG193 Since we have used !constraints.Check(v1) . It will be same as v1 < RDSPostgresDBInstanceEngineVersion which is if v1 < 13.0. Let me reverse the constraint used in line number 201 and update the If condition to make it more readable.
pkg/function/utils.go
Outdated
| } | ||
|
|
||
| if (len(dbInstance.DBInstances) == 0) || (dbInstance.DBInstances[0].EngineVersion == nil) { | ||
| return "", errors.Errorf("Received nil engine version") |
There was a problem hiding this comment.
should we change this to
DB instance's Engine version is nil
pkg/function/utils.go
Outdated
| @@ -208,6 +208,20 @@ func findRDSEndpoint(ctx context.Context, rdsCli *rds.RDS, instanceID string) (s | |||
| return *dbInstance.DBInstances[0].Endpoint.Address, nil | |||
| } | |||
|
|
|||
| // findRDSDBEngineVersion returns the database engine version | |||
| func findRDSDBEngineVersion(ctx context.Context, rdsCli *rds.RDS, instanceID string) (string, error) { | |||
There was a problem hiding this comment.
Suggested change
| func findRDSDBEngineVersion(ctx context.Context, rdsCli *rds.RDS, instanceID string) (string, error) { | |
| func rdsDBEngineVersion(ctx context.Context, rdsCli *rds.RDS, instanceID string) (string, error) { |
viveksinghggits
approved these changes
Oct 18, 2021
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.
Change Overview
This PR updates RDS Postgres restore command to replace
LOCALEwithLC_COLLATEfor the RDS Postgres DB Instance engine version less than13.0.Pull request type
Please check the type of change your PR introduces:
Issues
Test Plan
go test -v -check.f=RDSFunctionsTest.TestPrepareCommand