AWS KMS credentials and tiny .env files improvements

ylem-co · Sep 23, 2024 · fbb983c · fbb983c
1 parent caa99a4
commit fbb983c
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 24 deletions.
diff --git a/.env.common b/.env.common
@@ -25,9 +25,17 @@ YLEM_UPDATE_CONNECTIONS_URL=http://ylem_users:7333/private/organization/{uuid}/u
 
 # To enable sending SMS from Notification task,
 # you need to create your own Twilio account and place its credentials here
-# More information: https://docs.datamin.io/integrations/library-of-integrations/twilio.-sms
+# More information: https://docs.ylem.co/integrations/library-of-integrations/twilio.-sms
 YLEM_INTEGRATIONS_TWILIO_NUMBER_FROM=
 YLEM_INTEGRATIONS_TWILIO_ACCOUNT_SID=
 YLEM_INTEGRATIONS_TWILIO_AUTH_TOKEN=
 
 YLEM_LOG_LEVEL=trace
+
+# To enable encrypting and decrypting your organization, user and integration data with AWS KMS,
+# you need to place your AWS credentials here
+# More information: https://docs.ylem.co/open-source-edition/configuring-integrations-with-.env-variables#using-aws-kms-to-encrypt-decrypt-data
+AWS_KMS_KEY_ID=
+AWS_REGION=
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
diff --git a/backend/integrations/.env b/backend/integrations/.env
@@ -2,29 +2,24 @@ INTEGRATIONS_DATABASE_NAME=integrations
 
 INTEGRATIONS_RETRIEVE_ORGANIZATION_DATA_KEY_URL=http://ylem_users:7333/private/organization/{uuid}/data-key
 
-INTEGRATIONS_SLACK_CLIENT_ID=
-INTEGRATIONS_SLACK_CLIENT_SECRET=
-INTEGRATIONS_SLACK_AFTER_AUTHORIZATION_REDIRECT_URL=http://127.0.0.1:3000/slack-authorizations/{uuid}/?justConnected
-
 INTEGRATIONS_EMAIL_CONFIRMATION_LINK=http://ylem_integrations:7337/email/confirm
 INTEGRATIONS_EMAIL_AFTER_CONFIRMATION_REDIRECT_URL=https://google.com/
 
+INTEGRATIONS_SLACK_CLIENT_ID=
+INTEGRATIONS_SLACK_CLIENT_SECRET=
+INTEGRATIONS_SLACK_AFTER_AUTHORIZATION_REDIRECT_URL=http://127.0.0.1:7330/slack-authorizations/{uuid}/?justConnected
+
 INTEGRATIONS_JIRA_OAUTH_CLIENT_ID=
 INTEGRATIONS_JIRA_OAUTH_CLIENT_SECRET=
-INTEGRATIONS_JIRA_AFTER_AUTHORIZATION_REDIRECT_URL=http://127.0.0.1:3000/jira-authorizations/{uuid}/?justConnected
+INTEGRATIONS_JIRA_AFTER_AUTHORIZATION_REDIRECT_URL=http://127.0.0.1:7330/jira-authorizations/{uuid}/?justConnected
 INTEGRATIONS_JIRA_OAUTH_REDIRECT_URI=https://ylem_integrations:7337/jira/authorize
 
 INTEGRATIONS_HUBSPOT_OAUTH_CLIENT_ID=
 INTEGRATIONS_HUBSPOT_OAUTH_CLIENT_SECRET=
-INTEGRATIONS_HUBSPOT_AFTER_AUTHORIZATION_REDIRECT_URL=http://127.0.0.1:3000/hubspot-authorizations/{uuid}/?justConnected
+INTEGRATIONS_HUBSPOT_AFTER_AUTHORIZATION_REDIRECT_URL=http://127.0.0.1:7330/hubspot-authorizations/{uuid}/?justConnected
 INTEGRATIONS_HUBSPOT_OAUTH_REDIRECT_URI=https://ylem_integrations:7337/hubspot/authorize
 
-INTEGRATIONS_AWS_ACCESS_KEY_ID=
-INTEGRATIONS_AWS_SECRET_ACCESS_KEY=
-INTEGRATIONS_AWS_REGION=
-INTEGRATIONS_AWS_KMS_KEY_ID=
-
 INTEGRATIONS_SALESFORCE_OAUTH_CLIENT_ID=
 INTEGRATIONS_SALESFORCE_OAUTH_CLIENT_SECRET=
-INTEGRATIONS_SALESFORCE_OAUTH_REDIRECT_URI=
-INTEGRATIONS_SALESFORCE_AFTER_AUTHORIZATION_REDIRECT_URL=http://127.0.0.1:3000/salesforce-authorizations/{uuid}/?justConnected
+INTEGRATIONS_SALESFORCE_AFTER_AUTHORIZATION_REDIRECT_URL=http://127.0.0.1:7330/salesforce-authorizations/{uuid}/?justConnected
+INTEGRATIONS_SALESFORCE_OAUTH_REDIRECT_URI=https://ylem_integrations:7337/salesforce/authorize
diff --git a/backend/integrations/config/config.go b/backend/integrations/config/config.go
@@ -79,7 +79,7 @@ type salesforce struct {
 }
 
 type aws struct {
-	KmsKeyId    string `split_words:"true"`
+	KmsKeyId    string `split_words:"true" envconfig:"AWS_KMS_KEY_ID"`
 }
 
 type ssh struct {

diff --git a/backend/users/.env b/backend/users/.env
@@ -1,13 +1,8 @@
 USERS_DATABASE_NAME=users
 
-USERS_AWS_KMS_KEY_ID=
-USERS_AWS_REGION=
-USERS_AWS_ACCESS_KEY_ID=
-USERS_AWS_SECRET_ACCESS_KEY=
-
 # If you want to enable user authentication in Ylem's UI through Google, 
 # you need to configure the following parameters
-# More information https://docs.datamin.io/open-source-edition/configuring-integrations-with-.env-variables#user-authentication-with-google
+# More information https://docs.ylem.co/open-source-edition/configuring-integrations-with-.env-variables#user-authentication-with-google
 USERS_GOOGLE_CLIENT_ID=
 USERS_GOOGLE_CLIENT_SECRET=
 USERS_GOOGLE_CALLBACK_URL=http://%%YOUR_DOMAIN_IS_HERE%%/auth/google/callback
diff --git a/backend/users/config/config.go b/backend/users/config/config.go
@@ -39,7 +39,7 @@ type config struct {
 		YlemPipelinesBaseUrl    string `envconfig:"YLEM_PIPELINES_BASE_URL"`
 	}
 	Aws struct {
-		KmsKeyId string `split_words:"true" envconfig:"USERS_AWS_KMS_KEY_ID"`
+		KmsKeyId string `split_words:"true" envconfig:"AWS_KMS_KEY_ID"`
 	}
 	Google struct {
 		ClientId     string `split_words:"true" envconfig:"USERS_GOOGLE_CLIENT_ID"`

diff --git a/processor/taskrunner/.env b/processor/taskrunner/.env
@@ -1,7 +1,7 @@
 TASK_RUNNER_LISTEN=0.0.0.0:7335
 TASK_RUNNER_GOPYK_BASE_URL=http://ylem_python_processor:7338/eval
 
-# To enable Tableau integration, install https://github.com/datamin-io/tableau-http-wrapper
+# To enable Tableau integration, install https://github.com/ylem-co/tableau-http-wrapper
 # And place its URL here
 # By default it assumes that it is running on the port 7890 on your host machine
 TASK_RUNNER_TABLEAU_HTTP_WRAPPER_BASE_URL=http://host.docker.internal:7890
@@ -14,6 +14,6 @@ TASK_RUNNER_AWS_REGION=
 
 # To enable ChatGPT integration, create its API secret key
 # And place it here
-# More information: https://docs.datamin.io/pipelines/tasks-ip/gpt
+# More information: https://docs.ylem.co/pipelines/tasks-ip/gpt
 TASK_RUNNER_OPENAI_GPT_KEY=
 TASK_RUNNER_OPENAI_MODEL=gpt-4o-mini