larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up env var tester func for multiple slices (#508)

Browse Source
This commit is contained in:
Keepers 2022-08-11 18:08:00 -06:00 committed by GitHub
parent af86107c86
commit 0cb11e0cc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/docs/cli/corso.md
View File

@ -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

2
docs/docs/cli/corso_backup.md
View File

@ -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

2
docs/docs/cli/corso_backup_create.md
View File

@ -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

2
docs/docs/cli/corso_backup_create_exchange.md
View File

@ -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

2
docs/docs/cli/corso_backup_details.md
View File

@ -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

2
docs/docs/cli/corso_backup_details_exchange.md
View File

@ -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

2
docs/docs/cli/corso_backup_list.md
View File

@ -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

2
docs/docs/cli/corso_backup_list_exchange.md
View File

@ -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

2
docs/docs/cli/corso_repo.md
View File

@ -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

2
docs/docs/cli/corso_repo_connect.md
View File

@ -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

2
docs/docs/cli/corso_repo_connect_s3.md
View File

@ -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

2
docs/docs/cli/corso_repo_init.md
View File

@ -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

2
docs/docs/cli/corso_repo_init_s3.md
View File

@ -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

2
docs/docs/cli/corso_restore.md
View File

@ -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

2
docs/docs/cli/corso_restore_exchange.md
View File

@ -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

9
src/cli/config/config_test.go
View File

@ -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)
}

9
src/cli/repo/s3_integration_test.go
View File

@ -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)
}

9
src/internal/operations/backup_test.go
View File

@ -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)
}

17
src/internal/tester/envvars.go
View File

@ -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
}

9
src/pkg/repository/repository_test.go
View File

@ -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)
}