From 21bf1d8b397237638fdc2f9c92593490c9c9057b Mon Sep 17 00:00:00 2001 From: Keepers <104464746+ryanfkeepers@users.noreply.github.com> Date: Tue, 7 Jun 2022 11:44:14 -0600 Subject: [PATCH] make consts camelCase (#153) --- src/cli/repo/s3.go | 12 ++++++------ src/internal/connector/graph_connector_test.go | 13 +++++++------ src/internal/kopia/kopia_test.go | 4 ++-- src/internal/operations/backup_test.go | 6 +++--- src/internal/testing/integration_runners.go | 8 ++++---- src/internal/testing/storage.go | 6 +++--- src/pkg/credentials/aws.go | 14 +++++++------- src/pkg/credentials/corso.go | 4 ++-- src/pkg/credentials/m365.go | 13 ++++++++++--- src/pkg/repository/repository_test.go | 4 ++-- src/pkg/storage/common.go | 2 +- src/pkg/storage/s3.go | 8 ++++---- 12 files changed, 51 insertions(+), 43 deletions(-) diff --git a/src/cli/repo/s3.go b/src/cli/repo/s3.go index 7a08a1db9..f763d5bc5 100644 --- a/src/cli/repo/s3.go +++ b/src/cli/repo/s3.go @@ -133,7 +133,7 @@ func connectS3Cmd(cmd *cobra.Command, args []string) error { // helper for aggregating aws connection details. func makeS3Config() (storage.S3Config, storage.CommonConfig, error) { - aws := credentials.GetAWS(map[string]string{credentials.AWS_ACCESS_KEY_ID: accessKey}) + aws := credentials.GetAWS(map[string]string{credentials.AWSAccessKeyID: accessKey}) corso := credentials.GetCorso() return storage.S3Config{ AWS: aws, @@ -145,10 +145,10 @@ func makeS3Config() (storage.S3Config, storage.CommonConfig, error) { Corso: corso, }, utils.RequireProps(map[string]string{ - credentials.AWS_ACCESS_KEY_ID: aws.AccessKey, - "bucket": bucket, - credentials.AWS_SECRET_ACCESS_KEY: aws.SecretKey, - credentials.AWS_SESSION_TOKEN: aws.SessionToken, - credentials.CORSO_PASSWORD: corso.CorsoPassword, + credentials.AWSAccessKeyID: aws.AccessKey, + "bucket": bucket, + credentials.AWSSecretAccessKey: aws.SecretKey, + credentials.AWSSessionToken: aws.SessionToken, + credentials.CorsoPassword: corso.CorsoPassword, }) } diff --git a/src/internal/connector/graph_connector_test.go b/src/internal/connector/graph_connector_test.go index d5d79bbfb..9db30f04b 100644 --- a/src/internal/connector/graph_connector_test.go +++ b/src/internal/connector/graph_connector_test.go @@ -8,6 +8,7 @@ import ( graph "github.com/alcionai/corso/internal/connector" ctesting "github.com/alcionai/corso/internal/testing" + "github.com/alcionai/corso/pkg/credentials" ) type GraphConnectorIntegrationSuite struct { @@ -17,8 +18,8 @@ type GraphConnectorIntegrationSuite struct { func TestGraphConnectorSuite(t *testing.T) { if err := ctesting.RunOnAny( - ctesting.CORSO_CI_TESTS, - ctesting.CORSO_GRAPH_CONNECTOR_TESTS, + ctesting.CorsoCITests, + ctesting.CorsoGraphConnectorTests, ); err != nil { t.Skip(err) } @@ -31,14 +32,14 @@ func TestGraphConnectorSuite(t *testing.T) { } func (suite *GraphConnectorIntegrationSuite) SetupSuite() { - evs, err := ctesting.GetRequiredEnvVars("TENANT_ID", "CLIENT_ID", "CLIENT_SECRET") + evs, err := ctesting.GetRequiredEnvVars(credentials.TenantID, credentials.ClientID, credentials.ClientSecret) if err != nil { suite.T().Fatal(err) } suite.connector, err = graph.NewGraphConnector( - evs["TENANT_ID"], - evs["CLIENT_ID"], - evs["CLIENT_SECRET"]) + evs[credentials.TenantID], + evs[credentials.ClientID], + evs[credentials.ClientSecret]) suite.NoError(err) } diff --git a/src/internal/kopia/kopia_test.go b/src/internal/kopia/kopia_test.go index 6d54b7809..f682d66ea 100644 --- a/src/internal/kopia/kopia_test.go +++ b/src/internal/kopia/kopia_test.go @@ -51,8 +51,8 @@ type KopiaIntegrationSuite struct { func TestKopiaIntegrationSuite(t *testing.T) { if err := ctesting.RunOnAny( - ctesting.CORSO_CI_TESTS, - ctesting.CORSO_KOPIA_WRAPPER_TESTS, + ctesting.CorsoCITests, + ctesting.CorsoKopiaWrapperTests, ); err != nil { t.Skip() } diff --git a/src/internal/operations/backup_test.go b/src/internal/operations/backup_test.go index 8f91075b1..3ea416816 100644 --- a/src/internal/operations/backup_test.go +++ b/src/internal/operations/backup_test.go @@ -2,7 +2,6 @@ package operations_test import ( "context" - "os" "testing" "github.com/stretchr/testify/assert" @@ -10,6 +9,7 @@ import ( "github.com/alcionai/corso/internal/kopia" "github.com/alcionai/corso/internal/operations" + ctesting "github.com/alcionai/corso/internal/testing" ) type BackupOpIntegrationSuite struct { @@ -17,8 +17,8 @@ type BackupOpIntegrationSuite struct { } func TestBackupOpIntegrationSuite(t *testing.T) { - if len(os.Getenv("CORSO_INTEGRATION_TESTS")) == 0 { - t.Skip() + if err := ctesting.RunOnAny(ctesting.CorsoCITests); err != nil { + t.Skip(err) } suite.Run(t, new(BackupOpIntegrationSuite)) } diff --git a/src/internal/testing/integration_runners.go b/src/internal/testing/integration_runners.go index 099e7808d..90a5bcc61 100644 --- a/src/internal/testing/integration_runners.go +++ b/src/internal/testing/integration_runners.go @@ -10,10 +10,10 @@ import ( ) const ( - CORSO_CI_TESTS = "CORSO_CI_TESTS" - CORSO_GRAPH_CONNECTOR_TESTS = "CORSO_GRAPH_CONNECTOR_TESTS" - CORSO_REPOSITORY_TESTS = "CORSO_REPOSITORY_TESTS" - CORSO_KOPIA_WRAPPER_TESTS = "CORSO_KOPIA_WRAPPER_TESTS" + CorsoCITests = "CORSO_CI_TESTS" + CorsoGraphConnectorTests = "CORSO_GRAPH_CONNECTOR_TESTS" + CorsoRepositoryTests = "CORSO_REPOSITORY_TESTS" + CorsoKopiaWrapperTests = "CORSO_KOPIA_WRAPPER_TESTS" ) // RunOnAny takes in a list of env variable names and returns diff --git a/src/internal/testing/storage.go b/src/internal/testing/storage.go index eeab5ad76..1219ff667 100644 --- a/src/internal/testing/storage.go +++ b/src/internal/testing/storage.go @@ -14,9 +14,9 @@ import ( // variables with S3. func CheckS3EnvVars() error { s3Envs := []string{ - credentials.AWS_ACCESS_KEY_ID, - credentials.AWS_SECRET_ACCESS_KEY, - credentials.AWS_SESSION_TOKEN, + credentials.AWSAccessKeyID, + credentials.AWSSecretAccessKey, + credentials.AWSSessionToken, } for _, env := range s3Envs { if os.Getenv(env) == "" { diff --git a/src/pkg/credentials/aws.go b/src/pkg/credentials/aws.go index e774de70e..6aa861c11 100644 --- a/src/pkg/credentials/aws.go +++ b/src/pkg/credentials/aws.go @@ -6,9 +6,9 @@ import ( // envvar consts const ( - AWS_ACCESS_KEY_ID = "AWS_ACCESS_KEY_ID" - AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY" - AWS_SESSION_TOKEN = "AWS_SESSION_TOKEN" + AWSAccessKeyID = "AWS_ACCESS_KEY_ID" + AWSSecretAccessKey = "AWS_SECRET_ACCESS_KEY" + AWSSessionToken = "AWS_SESSION_TOKEN" ) // AWS aggregates aws credentials from flag and env_var values. @@ -20,12 +20,12 @@ type AWS struct { // GetAWS is a helper for aggregating aws secrets and credentials. func GetAWS(override map[string]string) AWS { - accessKey := os.Getenv(AWS_ACCESS_KEY_ID) - if ovr, ok := override[AWS_ACCESS_KEY_ID]; ok { + accessKey := os.Getenv(AWSAccessKeyID) + if ovr, ok := override[AWSAccessKeyID]; ok { accessKey = ovr } - secretKey := os.Getenv(AWS_SECRET_ACCESS_KEY) - sessToken := os.Getenv(AWS_SESSION_TOKEN) + secretKey := os.Getenv(AWSSecretAccessKey) + sessToken := os.Getenv(AWSSessionToken) // todo (rkeeprs): read from either corso config file or env vars. // https://github.com/alcionai/corso/issues/120 diff --git a/src/pkg/credentials/corso.go b/src/pkg/credentials/corso.go index bc76bfb92..87a2cb393 100644 --- a/src/pkg/credentials/corso.go +++ b/src/pkg/credentials/corso.go @@ -4,7 +4,7 @@ import "os" // envvar consts const ( - CORSO_PASSWORD = "CORSO_PASSWORD" + CorsoPassword = "CORSO_PASSWORD" ) // Corso aggregates corso credentials from flag and env_var values. @@ -16,7 +16,7 @@ type Corso struct { func GetCorso() Corso { // todo (rkeeprs): read from either corso config file or env vars. // https://github.com/alcionai/corso/issues/120 - corsoPasswd := os.Getenv(CORSO_PASSWORD) + corsoPasswd := os.Getenv(CorsoPassword) return Corso{ CorsoPassword: corsoPasswd, } diff --git a/src/pkg/credentials/m365.go b/src/pkg/credentials/m365.go index 64219c0e9..c3425b79d 100644 --- a/src/pkg/credentials/m365.go +++ b/src/pkg/credentials/m365.go @@ -2,6 +2,13 @@ package credentials import "os" +// envvar consts +const ( + ClientID = "CLIENT_ID" + ClientSecret = "CLIENT_SECRET" + TenantID = "TENANT_ID" +) + // M365 aggregates m365 credentials from flag and env_var values. type M365 struct { ClientID string @@ -14,8 +21,8 @@ func GetM365() M365 { // todo (rkeeprs): read from either corso config file or env vars. // https://github.com/alcionai/corso/issues/120 return M365{ - ClientID: os.Getenv("CLIENT_ID"), - ClientSecret: os.Getenv("CLIENT_SECRET"), - TenantID: os.Getenv("TENANT_ID"), + ClientID: os.Getenv(ClientID), + ClientSecret: os.Getenv(ClientSecret), + TenantID: os.Getenv(TenantID), } } diff --git a/src/pkg/repository/repository_test.go b/src/pkg/repository/repository_test.go index e90bb8bce..7a8065598 100644 --- a/src/pkg/repository/repository_test.go +++ b/src/pkg/repository/repository_test.go @@ -89,8 +89,8 @@ type RepositoryIntegrationSuite struct { func TestRepositoryIntegrationSuite(t *testing.T) { if err := ctesting.RunOnAny( - ctesting.CORSO_CI_TESTS, - ctesting.CORSO_REPOSITORY_TESTS, + ctesting.CorsoCITests, + ctesting.CorsoRepositoryTests, ); err != nil { t.Skip(err) } diff --git a/src/pkg/storage/common.go b/src/pkg/storage/common.go index 1fa2fb91d..fdc3320bc 100644 --- a/src/pkg/storage/common.go +++ b/src/pkg/storage/common.go @@ -34,7 +34,7 @@ func (s Storage) CommonConfig() (CommonConfig, error) { // ensures all required properties are present func (c CommonConfig) validate() error { if len(c.CorsoPassword) == 0 { - return errors.Wrap(errMissingRequired, credentials.CORSO_PASSWORD) + return errors.Wrap(errMissingRequired, credentials.CorsoPassword) } return nil } diff --git a/src/pkg/storage/s3.go b/src/pkg/storage/s3.go index 845f6e7e2..e6f3f4e30 100644 --- a/src/pkg/storage/s3.go +++ b/src/pkg/storage/s3.go @@ -52,10 +52,10 @@ func (s Storage) S3Config() (S3Config, error) { func (c S3Config) validate() error { check := map[string]string{ - credentials.AWS_ACCESS_KEY_ID: c.AccessKey, - credentials.AWS_SECRET_ACCESS_KEY: c.SecretKey, - credentials.AWS_SESSION_TOKEN: c.SessionToken, - "bucket": c.Bucket, + credentials.AWSAccessKeyID: c.AccessKey, + credentials.AWSSecretAccessKey: c.SecretKey, + credentials.AWSSessionToken: c.SessionToken, + "bucket": c.Bucket, } for k, v := range check { if len(v) == 0 {