make consts camelCase (#153)

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,
+			credentials.AWSAccessKeyID:     aws.AccessKey,
 			"bucket":                       bucket,
-			credentials.AWS_SECRET_ACCESS_KEY: aws.SecretKey,
+			credentials.AWSSecretAccessKey: aws.SecretKey,
-			credentials.AWS_SESSION_TOKEN:     aws.SessionToken,
+			credentials.AWSSessionToken:    aws.SessionToken,
-			credentials.CORSO_PASSWORD:        corso.CorsoPassword,
+			credentials.CorsoPassword:      corso.CorsoPassword,
 		})
 }

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.CorsoCITests,
-		ctesting.CORSO_GRAPH_CONNECTOR_TESTS,
+		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[credentials.TenantID],
-		evs["CLIENT_ID"],
+		evs[credentials.ClientID],
-		evs["CLIENT_SECRET"])
+		evs[credentials.ClientSecret])
 	suite.NoError(err)
 }
 

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.CorsoCITests,
-		ctesting.CORSO_KOPIA_WRAPPER_TESTS,
+		ctesting.CorsoKopiaWrapperTests,
 	); err != nil {
 		t.Skip()
 	}

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 {
+	if err := ctesting.RunOnAny(ctesting.CorsoCITests); err != nil {
-		t.Skip()
+		t.Skip(err)
 	}
 	suite.Run(t, new(BackupOpIntegrationSuite))
 }

src/internal/testing/integration_runners.go

@@ -10,10 +10,10 @@ import (
 )
 
 const (
-	CORSO_CI_TESTS              = "CORSO_CI_TESTS"
+	CorsoCITests             = "CORSO_CI_TESTS"
-	CORSO_GRAPH_CONNECTOR_TESTS = "CORSO_GRAPH_CONNECTOR_TESTS"
+	CorsoGraphConnectorTests = "CORSO_GRAPH_CONNECTOR_TESTS"
-	CORSO_REPOSITORY_TESTS      = "CORSO_REPOSITORY_TESTS"
+	CorsoRepositoryTests     = "CORSO_REPOSITORY_TESTS"
-	CORSO_KOPIA_WRAPPER_TESTS   = "CORSO_KOPIA_WRAPPER_TESTS"
+	CorsoKopiaWrapperTests   = "CORSO_KOPIA_WRAPPER_TESTS"
 )
 
 // RunOnAny takes in a list of env variable names and returns

src/internal/testing/storage.go

@@ -14,9 +14,9 @@ import (
 // variables with S3.
 func CheckS3EnvVars() error {
 	s3Envs := []string{
-		credentials.AWS_ACCESS_KEY_ID,
+		credentials.AWSAccessKeyID,
-		credentials.AWS_SECRET_ACCESS_KEY,
+		credentials.AWSSecretAccessKey,
-		credentials.AWS_SESSION_TOKEN,
+		credentials.AWSSessionToken,
 	}
 	for _, env := range s3Envs {
 		if os.Getenv(env) == "" {

src/pkg/credentials/aws.go

@@ -6,9 +6,9 @@ import (
 
 // envvar consts
 const (
-	AWS_ACCESS_KEY_ID     = "AWS_ACCESS_KEY_ID"
+	AWSAccessKeyID     = "AWS_ACCESS_KEY_ID"
-	AWS_SECRET_ACCESS_KEY = "AWS_SECRET_ACCESS_KEY"
+	AWSSecretAccessKey = "AWS_SECRET_ACCESS_KEY"
-	AWS_SESSION_TOKEN     = "AWS_SESSION_TOKEN"
+	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)
+	accessKey := os.Getenv(AWSAccessKeyID)
-	if ovr, ok := override[AWS_ACCESS_KEY_ID]; ok {
+	if ovr, ok := override[AWSAccessKeyID]; ok {
 		accessKey = ovr
 	}
-	secretKey := os.Getenv(AWS_SECRET_ACCESS_KEY)
+	secretKey := os.Getenv(AWSSecretAccessKey)
-	sessToken := os.Getenv(AWS_SESSION_TOKEN)
+	sessToken := os.Getenv(AWSSessionToken)
 
 	// todo (rkeeprs): read from either corso config file or env vars.
 	// https://github.com/alcionai/corso/issues/120

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

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"),
+		ClientID:     os.Getenv(ClientID),
-		ClientSecret: os.Getenv("CLIENT_SECRET"),
+		ClientSecret: os.Getenv(ClientSecret),
-		TenantID:     os.Getenv("TENANT_ID"),
+		TenantID:     os.Getenv(TenantID),
 	}
 }

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.CorsoCITests,
-		ctesting.CORSO_REPOSITORY_TESTS,
+		ctesting.CorsoRepositoryTests,
 	); err != nil {
 		t.Skip(err)
 	}

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
 }

src/pkg/storage/s3.go

@@ -52,9 +52,9 @@ func (s Storage) S3Config() (S3Config, error) {
 
 func (c S3Config) validate() error {
 	check := map[string]string{
-		credentials.AWS_ACCESS_KEY_ID:     c.AccessKey,
+		credentials.AWSAccessKeyID:     c.AccessKey,
-		credentials.AWS_SECRET_ACCESS_KEY: c.SecretKey,
+		credentials.AWSSecretAccessKey: c.SecretKey,
-		credentials.AWS_SESSION_TOKEN:     c.SessionToken,
+		credentials.AWSSessionToken:    c.SessionToken,
 		"bucket":                       c.Bucket,
 	}
 	for k, v := range check {