Refactoring of code, renaming env variables name

utils/s3.go

@@ -19,9 +19,9 @@ import (
 // CreateSession creates a new AWS session
 func CreateSession() (*session.Session, error) {
 
-	endPoint := os.Getenv("S3_ENDPOINT")
-	accessKey := os.Getenv("ACCESS_KEY")
-	secretKey := os.Getenv("SECRET_KEY")
+	endPoint := GetEnvVariable("AWS_S3_ENDPOINT", "S3_ENDPOINT")
+	accessKey := GetEnvVariable("AWS_ACCESS_KEY", "ACCESS_KEY")
+	secretKey := GetEnvVariable("AWS_SECRET_KEY", "SECRET_KEY")
 	region := os.Getenv("AWS_REGION")
 	awsDisableSsl, err := strconv.ParseBool(os.Getenv("AWS_DISABLE_SSL"))
 	if err != nil {

utils/utils.go

@@ -178,6 +178,15 @@ func SetEnv(key, value string) {
 		return
 	}
 }
-
+func GetEnvVariable(envName, oldEnvName string) string {
+	value := os.Getenv(envName)
+	if value == "" {
+		value = os.Getenv(oldEnvName)
+		if value != "" {
+			fmt.Printf("%s is deprecated, please use %s instead!\n", oldEnvName, envName)
+		}
+	}
+	return value
+}
 func ShowHistory() {
 }