Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for config env variables #8

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for config env variables #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92fff12
Add support for config env variables
Nov 10, 2018
a54e50a
Fixed conflict
Nov 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/GoS2S3/App.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var todayEpoch int64
func main() {

arguments := os.Args

for index, element := range arguments {
if element == "-help"{
// Put here some help explanation
Expand Down Expand Up @@ -59,13 +59,14 @@ func main() {
for index, element := range arguments {
if element == "-config" {
var configuration Configuration

configuration.LoadConfigFrom("application-config.json")
}
}

// refactor methods to use pointer to struct
loadSalesforceConfigurationFromFile(&configuration.Salesforce, &activeSalesforceConnection)
loadSalesforceConfigurationFromEnv(salesforceConnection)
loadAWSConfigurationFromFile(&configuration.Amazon)
// --------------------- END INITIALIZATION ---------------------

Expand Down
27 changes: 27 additions & 0 deletions src/GoS2S3/ConfLoader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,33 @@ import (
"os"
)

func loadSalesforceConfigurationFromEnv(salesforceConnection *salesforceUtil.SF_connection) {
targetUri := os.Getenv("SALESFORCE_TARGET_URI")
if targetUri != "" {
salesforceConnection.TargetURI = targetUri
}
username := os.Getenv("SALESFORCE_USERNAME")
if username != "" {
salesforceConnection.Username = username
}
password := os.Getenv("SALESFORCE_PASSWORD")
if password != "" {
salesforceConnection.Password = password
}
securityToken := os.Getenv("SALESFORCE_SECURITY_TOKEN")
if securityToken != "" {
salesforceConnection.SecurityToken = securityToken
}
clientSecret := os.Getenv("SALESFORCE_CLIENT_SECRET")
if clientSecret != "" {
salesforceConnection.ClientSecret = clientSecret
}
clientId := os.Getenv("SALESFORCE_CLIENT_ID")
if clientId != "" {
salesforceConnection.ClientId = clientId
}
}

func loadSalesforceConfigurationFromFile(configFile *SalesforceConfiguration, salesforceConnection *salesforceUtil.SF_connection) {
salesforceConnection.TargetURI = configFile.TargetURI
salesforceConnection.Username = configFile.Username
Expand Down