Replace carriage return when getting provider secrets for registry + E2E changes #652

kaovilai · 2022-04-29T01:14:45Z

kaovilai · 2022-04-29T02:12:55Z

tests/e2e/dpa_deployment_suite_test.go

@@ -499,13 +533,23 @@ var _ = Describe("Configuration testing for DPA Custom Resource", func() {
 					if installCase.DpaSpec.BackupLocations[0].Velero.Config != nil {
 						installCase.DpaSpec.BackupLocations[0].Velero.Config["credentialsFile"] = "bsl-cloud-credentials-aws/cloud"
 					}
+					if installCase.TestCarriageReturn {
+						installCase.DpaSpec.BackupLocations[0].Velero.Config["credentialsFile"] = "bsl-cloud-credentials-aws-with-carriage-return/cloud"


Using carriage return secret

kaovilai · 2022-04-29T02:13:01Z

tests/e2e/dpa_deployment_suite_test.go

+		Entry("Default velero CR, test carriage return", InstallCase{
+			Name:         "default-cr",
+			BRestoreType: RESTIC,
+			TestCarriageReturn: true,


Added a test for carriage return case

kaovilai · 2022-04-29T02:13:50Z

tests/e2e/utils/common_utils.go

@@ -37,3 +38,9 @@ func WriteFile(credFile string, data []byte) error {
 	err := ioutil.WriteFile(credFile, data, 0644)
 	return err
 }
+
+func ReplaceSecretDataNewLineWithCarriageReturn(data []byte) []byte {


New function to replace newline with carriage return in secret data.

kaovilai · 2022-04-29T02:14:08Z

tests/e2e/e2e_suite_test.go

@@ -103,6 +107,8 @@ var _ = BeforeSuite(func() {
 			cloudCreds := GetAzureCreds(cloudCredData)
 			err = CreateCredentialsSecret(cloudCreds, namespace, "bsl-cloud-credentials-azure")
 			Expect(err).NotTo(HaveOccurred())
+			err = CreateCredentialsSecret(utils.ReplaceSecretDataNewLineWithCarriageReturn(cloudCreds), namespace, "bsl-cloud-credentials-azure-with-carriage-return")


Create another secret to use to test carriage return case.

Co-authored-by: GitHub Co-pilot <[email protected]>

…into registryCanUseOtherSecretNameFor_credentialsFile

kaovilai · 2022-04-29T07:17:01Z

/retest

kaovilai · 2022-04-29T14:52:26Z

/retest

openshift-ci · 2022-04-29T16:22:12Z

@kaovilai: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

dymurray

LGTM, thanks for the tests

deepakraj1997 · 2022-05-02T14:17:40Z

pkg/credentials/credentials.go

@@ -33,7 +33,6 @@ var (
 			IsCloudProvider:    true,
 			SecretName:         "cloud-credentials",
 			MountPath:          "/credentials",
-			BslSecretName:      "bsl-cloud-credentials-aws",


Kinda followed the logic we had for the previous ones as I included this for the case of CI, now that we are pushing this for new feature, we expect the user to have created the secret name with key given in the credentialsFile right ?

I think user should be able to pick which secret is used. My change didn't break functionality so I think it's okay.

Prior to this PR, user was expected to have created a secret anyway but the name that they can use when specifying credentialsFile was hardcoded. This meant I couldn't use a different secret for the carriage return test case unless I overwrite the current secret with the fixed name.

This only affected the credentialFile config case which most customers won't be using. With this PR the secret name for registry is now flexible if they specified bsl secret with credentialsFile config.

we expect the user to have created the secret name with key given in the credentialsFile right?

Yes.

…E2E changes (openshift#652) * Replace carriage return when getting provider secrets for registry Co-authored-by: GitHub Co-pilot <[email protected]> * add tests * replaceCarriageReturn unit test * Registry credentials can use other secret names Co-authored-by: GitHub Co-pilot <[email protected]>

…n updateRegistrySecret (#679) * Replace carriage return when getting provider secrets for registry + E2E changes (#652) * Replace carriage return when getting provider secrets for registry Co-authored-by: GitHub Co-pilot <[email protected]> * add tests * replaceCarriageReturn unit test * Registry credentials can use other secret names Co-authored-by: GitHub Co-pilot <[email protected]> * Multi cloud E2E Updates (#568) * Adding changes from ci-multi-cloud branch * Updating flags in makefile * Updating flags in makefile * Updating flags in makefile * Update defaults * Fix helpers * Cleaning up makefile * Update makefile * Update kustomization * Cleaning up Makefile * Adding changes for AWS CredentialFile * Handling no default backuplocations * Removing comments * Adding config check in helpers * Fix AWS Test case * Fix basic review comments * genericTests... * Changing Credentials Mount Name for BSL when CredentialsFile key is used in Config - Fixes CI (#637) * Changing Credentials Mount Name for BSL for GCP * Fix DefaultPlugin for credentialsFile * E2E Tests: Fix azure templating name. (#573) * Fixing Azure to run locally * Aligning json * Handling Azure Parameters in CI Env using templates. (#582) * Adding azure parameters * Adding Openshift CI params * Update Test Suite and Helpers * Adding cred ref * Adding cred ref * Changing azure oadp cred dir to tmp * Fixing duplicate error * Removing OpenShift CI * Changing test instance name * Changing the AWS BSL Profile to default * Changing BslMountPath variable in registry controller * Replace carriage return when getting provider secrets for registry + E2E changes (#652) * Replace carriage return when getting provider secrets for registry Co-authored-by: GitHub Co-pilot <[email protected]> * add tests * replaceCarriageReturn unit test * Registry credentials can use other secret names Co-authored-by: GitHub Co-pilot <[email protected]> * fix missing err return for updateRegistrySecret function * go fmt * upgraded ginkgo on tests to ginkgo 2.0 (#560) Co-authored-by: Nitish Srivastava <[email protected]> Co-authored-by: GitHub Co-pilot <[email protected]> Co-authored-by: Deepak Raj D S <[email protected]> Co-authored-by: Shubham Pampattiwar <[email protected]> Co-authored-by: Maya Peretz <[email protected]>

kaovilai added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. ¯\_(ツ)_/¯ ¯\\\_(ツ)_/¯ labels Apr 29, 2022

openshift-ci bot requested review from shawn-hurley and sseago April 29, 2022 01:15

kaovilai removed request for sseago and shawn-hurley April 29, 2022 01:16

kaovilai mentioned this pull request Apr 29, 2022

Replace carriage return when getting provider secrets for registry #650

Closed

kaovilai force-pushed the registryCanUseOtherSecretNameFor_credentialsFile branch from a7788f6 to c3453f1 Compare April 29, 2022 01:57

kaovilai commented Apr 29, 2022

View reviewed changes

kaovilai added the testing label Apr 29, 2022

kaovilai and others added 5 commits April 29, 2022 01:00

Replace carriage return when getting provider secrets for registry

955eea2

Co-authored-by: GitHub Co-pilot <[email protected]>

add tests

29e3eec

replaceCarriageReturn unit test

dce9b99

Registry credentials can use other secret names

5a2bf0b

Merge branch 'just_registryCanUseOtherSecretNameFor_credentialsFile' …

7ea4fa4

…into registryCanUseOtherSecretNameFor_credentialsFile

kaovilai force-pushed the registryCanUseOtherSecretNameFor_credentialsFile branch from c3453f1 to 7ea4fa4 Compare April 29, 2022 05:17

kaovilai changed the title ~~[testing] #651 and #650 together~~ Replace carriage return when getting provider secrets for registry + E2E changes May 2, 2022

kaovilai requested review from deepakraj1997, shubham-pampattiwar and dymurray May 2, 2022 02:19

kaovilai mentioned this pull request May 2, 2022

Registry credentials can use different secret names when using config["credentialsFile"] #651

Closed

kaovilai removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels May 2, 2022

kaovilai added kind/bug Categorizes issue or PR as related to a bug. and removed ¯\_(ツ)_/¯ ¯\\\_(ツ)_/¯ labels May 2, 2022

dymurray approved these changes May 2, 2022

View reviewed changes

deepakraj1997 reviewed May 2, 2022

View reviewed changes

kaovilai merged commit a3eda71 into openshift:master May 3, 2022

kaovilai mentioned this pull request May 9, 2022

[OADP-463] cherrypicks 1.0 - carriage return + #678 missing err return updateRegistrySecret #679

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Replace carriage return when getting provider secrets for registry + E2E changes #652

Replace carriage return when getting provider secrets for registry + E2E changes #652

Uh oh!

kaovilai commented Apr 29, 2022 •

edited

Loading

Uh oh!

kaovilai Apr 29, 2022

Uh oh!

kaovilai Apr 29, 2022

Uh oh!

kaovilai Apr 29, 2022

Uh oh!

kaovilai Apr 29, 2022

Uh oh!

kaovilai commented Apr 29, 2022

Uh oh!

kaovilai commented Apr 29, 2022

Uh oh!

openshift-ci bot commented Apr 29, 2022

Uh oh!

dymurray left a comment

Uh oh!

deepakraj1997 May 2, 2022

Uh oh!

kaovilai May 2, 2022

Uh oh!

kaovilai May 2, 2022 •

edited

Loading

Uh oh!

kaovilai May 2, 2022

Uh oh!

Uh oh!

Replace carriage return when getting provider secrets for registry + E2E changes #652

Replace carriage return when getting provider secrets for registry + E2E changes #652

Uh oh!

Conversation

kaovilai commented Apr 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kaovilai Apr 29, 2022

Choose a reason for hiding this comment

Uh oh!

kaovilai Apr 29, 2022

Choose a reason for hiding this comment

Uh oh!

kaovilai Apr 29, 2022

Choose a reason for hiding this comment

Uh oh!

kaovilai Apr 29, 2022

Choose a reason for hiding this comment

Uh oh!

kaovilai commented Apr 29, 2022

Uh oh!

kaovilai commented Apr 29, 2022

Uh oh!

openshift-ci bot commented Apr 29, 2022

Uh oh!

dymurray left a comment

Choose a reason for hiding this comment

Uh oh!

deepakraj1997 May 2, 2022

Choose a reason for hiding this comment

Uh oh!

kaovilai May 2, 2022

Choose a reason for hiding this comment

Uh oh!

kaovilai May 2, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kaovilai May 2, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

kaovilai commented Apr 29, 2022 •

edited

Loading

kaovilai May 2, 2022 •

edited

Loading