feat: update The S3

Author: kemboi22

imageroot/actions/configure-module/10configure_environment_vars

@@ -13,22 +13,23 @@ import agent
 # If parsing fails, output everything to stderr
 data = json.load(sys.stdin)
 
-#This is specific to you module, so you need to change it accordingly.
+# This is specific to you module, so you need to change it accordingly.
 # Upper case to set environment variable and minor case to read from stdin
 
 # Email Settings
 # Add EMAIL SETTINGS
 rdb = agent.redis_connect(use_replica=True)
 smtp_settings = agent.get_smarthost_settings(rdb)
-ALLOWED_HOSTS = data.get('host')
-SMTP_HOST=smtp_settings['host']
-SMTP_PORT=smtp_settings['port']
-SMTP_USER=smtp_settings['username']
-SMTP_PASSWORD=smtp_settings['password']
-SMTP_ENCRYPTION=smtp_settings['encrypt_smtp']
-SMTP_TLSVERIFY='True' if smtp_settings['tls_verify'] else 'False'
-SMTP_SSLVERIFY='False' if smtp_settings['tls_verify'] else 'True'
-ALLOW_GOOGLE_SSO = data.get('allow_google_sso', False)
+ALLOWED_HOSTS = data.get("host")
+SMTP_HOST = smtp_settings["host"]
+SMTP_PORT = smtp_settings["port"]
+SMTP_USER = smtp_settings["username"]
+SMTP_PASSWORD = smtp_settings["password"]
+SMTP_ENCRYPTION = smtp_settings["encrypt_smtp"]
+SMTP_TLSVERIFY = "True" if smtp_settings["tls_verify"] else "False"
+SMTP_SSLVERIFY = "False" if smtp_settings["tls_verify"] else "True"
+ALLOW_GOOGLE_SSO = data.get("allow_google_sso", False)
+DEFAULT_EMAIL_FROM = SMTP_USER
 
 
 chief_config = {
@@ -40,15 +41,20 @@ chief_config = {
     "EMAIL_USE_SSL": not SMTP_ENCRYPTION,
     "ALLOWED_HOSTS": ALLOWED_HOSTS,
     "ALLOW_GOOGLE_SSO": ALLOW_GOOGLE_SSO,
-    "GOOGLE_SSO_CLIENT_ID": data.get('google_sso_client_id', ''),
-    "GOOGLE_SSO_SECRET": data.get('google_sso_secret', ''),
-    "SOCIALACCOUNT_PROVIDERS": json.dumps(data.get('socialaccount_providers', {})),
-    "SSO_AUTO_CREATE_USER": data.get('sso_auto_create_user', True),
-    "OIDC_ROLE_NEW_HIRE_PATTERN": data.get('oidc_role_new_hire_pattern', ''),
-    "OIDC_ROLE_ADMIN_PATTERN": data.get('oidc_role_admin_pattern', ''),
-    "OIDC_ROLE_MANAGER_PATTERN": data.get('oidc_role_manager_pattern', ''),
-    "OIDC_ROLE_PATH_IN_RETURN": data.get('oidc_role_path_in_return', 'groups'),
-    "ALLAUTH_PROVIDERS": data.get('allauth_providers', ''),
+    "GOOGLE_SSO_CLIENT_ID": data.get("google_sso_client_id", ""),
+    "GOOGLE_SSO_SECRET": data.get("google_sso_secret", ""),
+    "SOCIALACCOUNT_PROVIDERS": json.dumps(data.get("socialaccount_providers", {})),
+    "SSO_AUTO_CREATE_USER": data.get("sso_auto_create_user", True),
+    "OIDC_ROLE_NEW_HIRE_PATTERN": data.get("oidc_role_new_hire_pattern", ""),
+    "OIDC_ROLE_ADMIN_PATTERN": data.get("oidc_role_admin_pattern", ""),
+    "OIDC_ROLE_MANAGER_PATTERN": data.get("oidc_role_manager_pattern", ""),
+    "OIDC_ROLE_PATH_IN_RETURN": data.get("oidc_role_path_in_return", "groups"),
+    "ALLAUTH_PROVIDERS": data.get("allauth_providers", ""),
+    "AWS_S3_ENDPOINT_URL": data.get("aws_s3_endpoint_url", ""),
+    "AWS_ACCESS_KEY_ID": data.get("aws_access_key_id", ""),
+    "AWS_SECRET_ACCESS_KEY": data.get("aws_secret_access_key", ""),
+    "AWS_STORAGE_BUCKET_NAME": data.get("aws_storage_bucket_name", ""),
+    "AWS_DEFAULT_REGION": data.get("aws_default_region", ""),
 }
 
 agent.write_envfile("chief.env", chief_config)

ui/src/views/Settings.vue

@@ -164,6 +164,56 @@
                     ref="allauthProviders"
                   >
                   </cv-text-input>
+                  <cv-text-input
+                    :label="$t('settings.aws_s3_endpoint_url')"
+                    placeholder="https://s3.eu-west-1.amazonaws.com"
+                    v-model.trim="awsS3EndpointUrl"
+                    class="mg-bottom"
+                    :invalid-message="$t(error.aws_s3_endpoint_url)"
+                    :disabled="loading.getConfiguration || loading.configureModule"
+                    ref="awsS3EndpointUrl"
+                  >
+                  </cv-text-input>
+                  <cv-text-input
+                    :label="$t('settings.aws_access_key_id')"
+                    placeholder="AKIAXXXXXXXX"
+                    v-model.trim="awsAccessKeyId"
+                    class="mg-bottom"
+                    :invalid-message="$t(error.aws_access_key_id)"
+                    :disabled="loading.getConfiguration || loading.configureModule"
+                    ref="awsAccessKeyId"
+                  >
+                  </cv-text-input>
+                  <cv-text-input
+                    :label="$t('settings.aws_secret_access_key')"
+                    placeholder="XXXXXXXXXXXXX"
+                    v-model.trim="awsSecretAccessKey"
+                    class="mg-bottom"
+                    :invalid-message="$t(error.aws_secret_access_key)"
+                    :disabled="loading.getConfiguration || loading.configureModule"
+                    ref="awsSecretAccessKey"
+                  >
+                  </cv-text-input>
+                  <cv-text-input
+                    :label="$t('settings.aws_storage_bucket_name')"
+                    placeholder="bucket-name"
+                    v-model.trim="awsStorageBucketName"
+                    class="mg-bottom"
+                    :invalid-message="$t(error.aws_storage_bucket_name)"
+                    :disabled="loading.getConfiguration || loading.configureModule"
+                    ref="awsStorageBucketName"
+                  >
+                  </cv-text-input>
+                  <cv-text-input
+                    :label="$t('settings.aws_default_region')"
+                    placeholder="eu-west-1"
+                    v-model.trim="awsDefaultRegion"
+                    class="mg-bottom"
+                    :invalid-message="$t(error.aws_default_region)"
+                    :disabled="loading.getConfiguration || loading.configureModule"
+                    ref="awsDefaultRegion"
+                  >
+                  </cv-text-input>
                 </template>
               </cv-accordion-item>
             </cv-accordion>
@@ -232,6 +282,11 @@ export default {
       oidcRoleManagerPattern: "",
       oidcRolePathInReturn: "groups",
       allauthProviders: "",
+      awsS3EndpointUrl: "",
+      awsAccessKeyId: "",
+      awsSecretAccessKey: "",
+      awsStorageBucketName: "",
+      awsDefaultRegion: "",
       loading: {
         getConfiguration: false,
         configureModule: false,
@@ -251,6 +306,11 @@ export default {
         oidc_role_manager_pattern: "",
         oidc_role_path_in_return: "",
         allauth_providers: "",
+        aws_s3_endpoint_url: "",
+        aws_access_key_id: "",
+        aws_secret_access_key: "",
+        aws_storage_bucket_name: "",
+        aws_default_region: "",
       },
     };
   },
@@ -327,6 +387,11 @@ export default {
       this.oidcRoleManagerPattern = config.oidc_role_manager_pattern;
       this.oidcRolePathInReturn = config.oidc_role_path_in_return;
       this.allauthProviders = config.allauth_providers;
+      this.awsS3EndpointUrl = config.aws_s3_endpoint_url;
+      this.awsAccessKeyId = config.aws_access_key_id;
+      this.awsSecretAccessKey = config.aws_secret_access_key;
+      this.awsStorageBucketName = config.aws_storage_bucket_name;
+      this.awsDefaultRegion = config.aws_default_region;
 
       this.loading.getConfiguration = false;
       this.focusElement("host");
@@ -405,6 +470,11 @@ export default {
             oidc_role_manager_pattern: this.oidcRoleManagerPattern,
             oidc_role_path_in_return: this.oidcRolePathInReturn,
             allauth_providers: this.allauthProviders,
+            aws_s3_endpoint_url: this.awsS3EndpointUrl,
+            aws_access_key_id: this.awsAccessKeyId,
+            aws_secret_access_key: this.awsSecretAccessKey,
+            aws_storage_bucket_name: this.awsStorageBucketName,
+            aws_default_region: this.awsDefaultRegion,
           },
           extra: {
             title: this.$t("settings.instance_configuration", {