Add iam region to aws client

paviliondev · Sep 17, 2024 · 9ff1f00 · 9ff1f00
1 parent 20988cd
commit 9ff1f00
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
@@ -5,6 +5,7 @@ en:
     subscription_server_subscriptions: "List of supported subscriptions. resource:product_slug:provider:product_id:domain_limit e.g. discourse-custom-wizard:business:stripe:prod_Jyy6B9gyTJUURi:1"
     subscription_server_iam_access_key: IAM Administrator Access Key
     subscription_server_iam_secret_access_key: IAM Administrator Secret Access Key
+    subscription_server_iam_region: IAM region
 
   user_api_key:
     scopes:

diff --git a/config/settings.yml b/config/settings.yml
@@ -7,4 +7,5 @@ plugins:
     type: list
     default: ''
   subscription_server_iam_access_key: ''
-  subscription_server_iam_secret_access_key: ''
+  subscription_server_iam_secret_access_key: ''
+  subscription_server_iam_region: 'us-east-1'
diff --git a/lib/subscription_server/aws.rb b/lib/subscription_server/aws.rb
@@ -199,6 +199,7 @@ def init_iam_client
     def default_options
       check_missing_options
       {
+        region: SiteSetting.subscription_server_iam_region,
         access_key_id: SiteSetting.subscription_server_iam_access_key,
         secret_access_key: SiteSetting.subscription_server_iam_secret_access_key
       }
@@ -207,6 +208,7 @@ def default_options
     def check_missing_options
       raise SettingMissing.new("iam_access_key_id") if SiteSetting.subscription_server_iam_access_key.blank?
       raise SettingMissing.new("iam_secret_access_key") if SiteSetting.subscription_server_iam_secret_access_key.blank?
+      raise SettingMissing.new("iam_region") if SiteSetting.subscription_server_iam_region.blank?
     end
   end
 end