diff --git a/docs/docs/cli/corso.md b/docs/docs/cli/corso.md index df5896419..76b7365ed 100644 --- a/docs/docs/cli/corso.md +++ b/docs/docs/cli/corso.md @@ -25,4 +25,4 @@ corso [flags] * [corso repo](corso_repo.md) - Manage your repositories * [corso restore](corso_restore.md) - Restore your service data -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_backup.md b/docs/docs/cli/corso_backup.md index 92461f008..e136e46b5 100644 --- a/docs/docs/cli/corso_backup.md +++ b/docs/docs/cli/corso_backup.md @@ -30,4 +30,4 @@ corso backup [flags] * [corso backup details](corso_backup_details.md) - Shows the details of a backup for a service * [corso backup list](corso_backup_list.md) - List the history of backups for a service -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_backup_create.md b/docs/docs/cli/corso_backup_create.md index 8065069ca..a26afc286 100644 --- a/docs/docs/cli/corso_backup_create.md +++ b/docs/docs/cli/corso_backup_create.md @@ -24,4 +24,4 @@ corso backup create [flags] * [corso backup](corso_backup.md) - Backup your service data * [corso backup create exchange](corso_backup_create_exchange.md) - Backup M365 Exchange service data -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_backup_create_exchange.md b/docs/docs/cli/corso_backup_create_exchange.md index 01f9cb2d2..f8e771585 100644 --- a/docs/docs/cli/corso_backup_create_exchange.md +++ b/docs/docs/cli/corso_backup_create_exchange.md @@ -26,4 +26,4 @@ corso backup create exchange [flags] * [corso backup create](corso_backup_create.md) - Backup an M365 Service -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_backup_details.md b/docs/docs/cli/corso_backup_details.md index cb6564a93..9ef593eda 100644 --- a/docs/docs/cli/corso_backup_details.md +++ b/docs/docs/cli/corso_backup_details.md @@ -24,4 +24,4 @@ corso backup details [flags] * [corso backup](corso_backup.md) - Backup your service data * [corso backup details exchange](corso_backup_details_exchange.md) - Shows the details of a M365 Exchange service backup -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_backup_details_exchange.md b/docs/docs/cli/corso_backup_details_exchange.md index 241f4ac5c..5d9d1c6e6 100644 --- a/docs/docs/cli/corso_backup_details_exchange.md +++ b/docs/docs/cli/corso_backup_details_exchange.md @@ -31,4 +31,4 @@ corso backup details exchange [flags] * [corso backup details](corso_backup_details.md) - Shows the details of a backup for a service -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_backup_list.md b/docs/docs/cli/corso_backup_list.md index 2e7851c9a..576463954 100644 --- a/docs/docs/cli/corso_backup_list.md +++ b/docs/docs/cli/corso_backup_list.md @@ -24,4 +24,4 @@ corso backup list [flags] * [corso backup](corso_backup.md) - Backup your service data * [corso backup list exchange](corso_backup_list_exchange.md) - List the history of M365 Exchange service backups -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_backup_list_exchange.md b/docs/docs/cli/corso_backup_list_exchange.md index 277253f89..65ed64b08 100644 --- a/docs/docs/cli/corso_backup_list_exchange.md +++ b/docs/docs/cli/corso_backup_list_exchange.md @@ -23,4 +23,4 @@ corso backup list exchange [flags] * [corso backup list](corso_backup_list.md) - List the history of backups for a service -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_repo.md b/docs/docs/cli/corso_repo.md index 653603173..4acbdb208 100644 --- a/docs/docs/cli/corso_repo.md +++ b/docs/docs/cli/corso_repo.md @@ -29,4 +29,4 @@ corso repo [flags] * [corso repo connect](corso_repo_connect.md) - Connect to a repository. * [corso repo init](corso_repo_init.md) - Initialize a repository. -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_repo_connect.md b/docs/docs/cli/corso_repo_connect.md index a4eb38362..2c9d2f6cc 100644 --- a/docs/docs/cli/corso_repo_connect.md +++ b/docs/docs/cli/corso_repo_connect.md @@ -28,4 +28,4 @@ corso repo connect [flags] * [corso repo](corso_repo.md) - Manage your repositories * [corso repo connect s3](corso_repo_connect_s3.md) - Connect to a S3 repository -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_repo_connect_s3.md b/docs/docs/cli/corso_repo_connect_s3.md index ed10a4d58..abae7edf7 100644 --- a/docs/docs/cli/corso_repo_connect_s3.md +++ b/docs/docs/cli/corso_repo_connect_s3.md @@ -31,4 +31,4 @@ corso repo connect s3 [flags] * [corso repo connect](corso_repo_connect.md) - Connect to a repository. -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_repo_init.md b/docs/docs/cli/corso_repo_init.md index 3fa254d8d..2f4ee1aaf 100644 --- a/docs/docs/cli/corso_repo_init.md +++ b/docs/docs/cli/corso_repo_init.md @@ -28,4 +28,4 @@ corso repo init [flags] * [corso repo](corso_repo.md) - Manage your repositories * [corso repo init s3](corso_repo_init_s3.md) - Initialize a S3 repository -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_repo_init_s3.md b/docs/docs/cli/corso_repo_init_s3.md index 5a349a46d..44dbb3c70 100644 --- a/docs/docs/cli/corso_repo_init_s3.md +++ b/docs/docs/cli/corso_repo_init_s3.md @@ -31,4 +31,4 @@ corso repo init s3 [flags] * [corso repo init](corso_repo_init.md) - Initialize a repository. -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_restore.md b/docs/docs/cli/corso_restore.md index c5e7ee7e3..81a510a55 100644 --- a/docs/docs/cli/corso_restore.md +++ b/docs/docs/cli/corso_restore.md @@ -28,4 +28,4 @@ corso restore [flags] * [corso](corso.md) - Protect your Microsoft 365 data. * [corso restore exchange](corso_restore_exchange.md) - Restore M365 Exchange service data -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/docs/docs/cli/corso_restore_exchange.md b/docs/docs/cli/corso_restore_exchange.md index d79af2e8a..69435381c 100644 --- a/docs/docs/cli/corso_restore_exchange.md +++ b/docs/docs/cli/corso_restore_exchange.md @@ -31,4 +31,4 @@ corso restore exchange [flags] * [corso restore](corso_restore.md) - Restore your service data -###### Auto generated by spf13/cobra on 5-Aug-2022 +###### Auto generated by spf13/cobra on 11-Aug-2022 diff --git a/src/cli/config/config_test.go b/src/cli/config/config_test.go index 9ecf3d974..7103ea426 100644 --- a/src/cli/config/config_test.go +++ b/src/cli/config/config_test.go @@ -194,12 +194,9 @@ func TestConfigIntegrationSuite(t *testing.T) { } func (suite *ConfigIntegrationSuite) SetupSuite() { - _, err := tester.GetRequiredEnvVars( - append( - tester.AWSStorageCredEnvs, - tester.M365AcctCredEnvs..., - )..., - ) + _, err := tester.GetRequiredEnvSls( + tester.AWSStorageCredEnvs, + tester.M365AcctCredEnvs) require.NoError(suite.T(), err) } diff --git a/src/cli/repo/s3_integration_test.go b/src/cli/repo/s3_integration_test.go index eeea2c35d..7a9303fa1 100644 --- a/src/cli/repo/s3_integration_test.go +++ b/src/cli/repo/s3_integration_test.go @@ -32,12 +32,9 @@ func TestS3IntegrationSuite(t *testing.T) { } func (suite *S3IntegrationSuite) SetupSuite() { - _, err := tester.GetRequiredEnvVars( - append( - tester.AWSStorageCredEnvs, - tester.M365AcctCredEnvs..., - )..., - ) + _, err := tester.GetRequiredEnvSls( + tester.AWSStorageCredEnvs, + tester.M365AcctCredEnvs) require.NoError(suite.T(), err) } diff --git a/src/internal/operations/backup_test.go b/src/internal/operations/backup_test.go index 6cac6a641..9c3fcba41 100644 --- a/src/internal/operations/backup_test.go +++ b/src/internal/operations/backup_test.go @@ -85,12 +85,9 @@ func TestBackupOpIntegrationSuite(t *testing.T) { } func (suite *BackupOpIntegrationSuite) SetupSuite() { - _, err := tester.GetRequiredEnvVars( - append( - tester.AWSStorageCredEnvs, - tester.M365AcctCredEnvs..., - )..., - ) + _, err := tester.GetRequiredEnvSls( + tester.AWSStorageCredEnvs, + tester.M365AcctCredEnvs) require.NoError(suite.T(), err) } diff --git a/src/internal/tester/envvars.go b/src/internal/tester/envvars.go index 4bec7c7ba..fe8adc858 100644 --- a/src/internal/tester/envvars.go +++ b/src/internal/tester/envvars.go @@ -19,3 +19,20 @@ func GetRequiredEnvVars(evs ...string) (map[string]string, error) { } return vals, nil } + +// GetRequiredEnvSls retrieves the provided env vars from the os. +// Retrieved values are populated into the resulting map. +// If any of the env values are zero length, returns an error. +func GetRequiredEnvSls(evs ...[]string) (map[string]string, error) { + vals := map[string]string{} + for _, ev := range evs { + r, err := GetRequiredEnvVars(ev...) + if err != nil { + return nil, err + } + for k, v := range r { + vals[k] = v + } + } + return vals, nil +} diff --git a/src/pkg/repository/repository_test.go b/src/pkg/repository/repository_test.go index b78d5f873..fbe051443 100644 --- a/src/pkg/repository/repository_test.go +++ b/src/pkg/repository/repository_test.go @@ -102,12 +102,9 @@ func TestRepositoryIntegrationSuite(t *testing.T) { // ensure all required env values are populated func (suite *RepositoryIntegrationSuite) SetupSuite() { - _, err := tester.GetRequiredEnvVars( - append( - tester.AWSStorageCredEnvs, - tester.M365AcctCredEnvs..., - )..., - ) + _, err := tester.GetRequiredEnvSls( + tester.AWSStorageCredEnvs, + tester.M365AcctCredEnvs) require.NoError(suite.T(), err) }