pulumi-alicloud 3.69.0a1733375908__py3-none-any.whl → 3.70.0__py3-none-any.whl

pulumi_alicloud/arms/outputs.py

@@ -22,6 +22,7 @@ __all__ = [
     'DispatchRuleLabelMatchExpressionGridLabelMatchExpressionGroupLabelMatchExpression',
     'DispatchRuleNotifyRule',
     'DispatchRuleNotifyRuleNotifyObject',
+    'DispatchRuleNotifyTemplate',
     'PrometheusAlertRuleAnnotation',
     'PrometheusAlertRuleLabel',
     'SyntheticTaskAvailableAssertion',
@@ -41,6 +42,7 @@ __all__ = [
     'SyntheticTaskMonitorConfWebsite',
     'GetAlertContactGroupsGroupResult',
     'GetAlertContactsContactResult',
+    'GetAlertRobotsRobotResult',
     'GetDispatchRulesRuleResult',
     'GetDispatchRulesRuleGroupRuleResult',
     'GetDispatchRulesRuleLabelMatchExpressionGridResult',
@@ -48,6 +50,7 @@ __all__ = [
     'GetDispatchRulesRuleLabelMatchExpressionGridLabelMatchExpressionGroupLabelMatchExpressionResult',
     'GetDispatchRulesRuleNotifyRuleResult',
     'GetDispatchRulesRuleNotifyRuleNotifyObjectResult',
+    'GetDispatchRulesRuleNotifyTemplateResult',
     'GetIntegrationExportersIntegrationExporterResult',
     'GetPrometheisPrometheiResult',
     'GetPrometheusAlertRulesRuleResult',
@@ -284,8 +287,12 @@ class DispatchRuleNotifyRule(dict):
         suggest = None
         if key == "notifyChannels":
             suggest = "notify_channels"
+        elif key == "notifyEndTime":
+            suggest = "notify_end_time"
         elif key == "notifyObjects":
             suggest = "notify_objects"
+        elif key == "notifyStartTime":
+            suggest = "notify_start_time"
 
         if suggest:
             pulumi.log.warn(f"Key '{key}' not found in DispatchRuleNotifyRule. Access the value via the '{suggest}' property getter instead.")
@@ -300,13 +307,19 @@ class DispatchRuleNotifyRule(dict):
 
     def __init__(__self__, *,
                  notify_channels: Sequence[str],
-                 notify_objects: Sequence['outputs.DispatchRuleNotifyRuleNotifyObject']):
+                 notify_end_time: str,
+                 notify_objects: Sequence['outputs.DispatchRuleNotifyRuleNotifyObject'],
+                 notify_start_time: str):
         """
         :param Sequence[str] notify_channels: The notification method. Valid values: dingTalk, sms, webhook, email, and wechat.
+        :param str notify_end_time: End time of notification.
         :param Sequence['DispatchRuleNotifyRuleNotifyObjectArgs'] notify_objects: Sets the notification object. See `notify_objects` below.
+        :param str notify_start_time: Start time of notification.
         """
         pulumi.set(__self__, "notify_channels", notify_channels)
+        pulumi.set(__self__, "notify_end_time", notify_end_time)
         pulumi.set(__self__, "notify_objects", notify_objects)
+        pulumi.set(__self__, "notify_start_time", notify_start_time)
 
     @property
     @pulumi.getter(name="notifyChannels")
@@ -316,6 +329,14 @@ class DispatchRuleNotifyRule(dict):
         """
         return pulumi.get(self, "notify_channels")
 
+    @property
+    @pulumi.getter(name="notifyEndTime")
+    def notify_end_time(self) -> str:
+        """
+        End time of notification.
+        """
+        return pulumi.get(self, "notify_end_time")
+
     @property
     @pulumi.getter(name="notifyObjects")
     def notify_objects(self) -> Sequence['outputs.DispatchRuleNotifyRuleNotifyObject']:
@@ -324,6 +345,14 @@ class DispatchRuleNotifyRule(dict):
         """
         return pulumi.get(self, "notify_objects")
 
+    @property
+    @pulumi.getter(name="notifyStartTime")
+    def notify_start_time(self) -> str:
+        """
+        Start time of notification.
+        """
+        return pulumi.get(self, "notify_start_time")
+
 
 @pulumi.output_type
 class DispatchRuleNotifyRuleNotifyObject(dict):
@@ -353,7 +382,7 @@ class DispatchRuleNotifyRuleNotifyObject(dict):
         """
         :param str name: The name of the contact or contact group.
         :param str notify_object_id: The ID of the contact or contact group.
-        :param str notify_type: The type of the alert contact. Valid values: ARMS_CONTACT: contact. ARMS_CONTACT_GROUP: contact group.
+        :param str notify_type: The type of the alert contact. Valid values: ARMS_ROBOT: robot. ARMS_CONTACT: contact. ARMS_CONTACT_GROUP: contact group.
         """
         pulumi.set(__self__, "name", name)
         pulumi.set(__self__, "notify_object_id", notify_object_id)
@@ -379,11 +408,150 @@ class DispatchRuleNotifyRuleNotifyObject(dict):
     @pulumi.getter(name="notifyType")
     def notify_type(self) -> str:
         """
-        The type of the alert contact. Valid values: ARMS_CONTACT: contact. ARMS_CONTACT_GROUP: contact group.
+        The type of the alert contact. Valid values: ARMS_ROBOT: robot. ARMS_CONTACT: contact. ARMS_CONTACT_GROUP: contact group.
         """
         return pulumi.get(self, "notify_type")
 
 
+@pulumi.output_type
+class DispatchRuleNotifyTemplate(dict):
+    @staticmethod
+    def __key_warning(key: str):
+        suggest = None
+        if key == "emailContent":
+            suggest = "email_content"
+        elif key == "emailRecoverContent":
+            suggest = "email_recover_content"
+        elif key == "emailRecoverTitle":
+            suggest = "email_recover_title"
+        elif key == "emailTitle":
+            suggest = "email_title"
+        elif key == "robotContent":
+            suggest = "robot_content"
+        elif key == "smsContent":
+            suggest = "sms_content"
+        elif key == "smsRecoverContent":
+            suggest = "sms_recover_content"
+        elif key == "ttsContent":
+            suggest = "tts_content"
+        elif key == "ttsRecoverContent":
+            suggest = "tts_recover_content"
+
+        if suggest:
+            pulumi.log.warn(f"Key '{key}' not found in DispatchRuleNotifyTemplate. Access the value via the '{suggest}' property getter instead.")
+
+    def __getitem__(self, key: str) -> Any:
+        DispatchRuleNotifyTemplate.__key_warning(key)
+        return super().__getitem__(key)
+
+    def get(self, key: str, default = None) -> Any:
+        DispatchRuleNotifyTemplate.__key_warning(key)
+        return super().get(key, default)
+
+    def __init__(__self__, *,
+                 email_content: str,
+                 email_recover_content: str,
+                 email_recover_title: str,
+                 email_title: str,
+                 robot_content: str,
+                 sms_content: str,
+                 sms_recover_content: str,
+                 tts_content: str,
+                 tts_recover_content: str):
+        """
+        :param str email_content: The content of the email notification.
+        :param str email_recover_content: The content of the email notification for restored alerts.
+        :param str email_recover_title: The title of the email notification for restored alerts.
+        :param str email_title: The title of the email notification.
+        :param str robot_content: The content of the robot notification.
+        :param str sms_content: The content of the SMS notification.
+        :param str sms_recover_content: The content of the SMS notification for restored alerts.
+        :param str tts_content: The content of the TTS notification.
+        :param str tts_recover_content: The content of the TTS notification for restored alerts.
+        """
+        pulumi.set(__self__, "email_content", email_content)
+        pulumi.set(__self__, "email_recover_content", email_recover_content)
+        pulumi.set(__self__, "email_recover_title", email_recover_title)
+        pulumi.set(__self__, "email_title", email_title)
+        pulumi.set(__self__, "robot_content", robot_content)
+        pulumi.set(__self__, "sms_content", sms_content)
+        pulumi.set(__self__, "sms_recover_content", sms_recover_content)
+        pulumi.set(__self__, "tts_content", tts_content)
+        pulumi.set(__self__, "tts_recover_content", tts_recover_content)
+
+    @property
+    @pulumi.getter(name="emailContent")
+    def email_content(self) -> str:
+        """
+        The content of the email notification.
+        """
+        return pulumi.get(self, "email_content")
+
+    @property
+    @pulumi.getter(name="emailRecoverContent")
+    def email_recover_content(self) -> str:
+        """
+        The content of the email notification for restored alerts.
+        """
+        return pulumi.get(self, "email_recover_content")
+
+    @property
+    @pulumi.getter(name="emailRecoverTitle")
+    def email_recover_title(self) -> str:
+        """
+        The title of the email notification for restored alerts.
+        """
+        return pulumi.get(self, "email_recover_title")
+
+    @property
+    @pulumi.getter(name="emailTitle")
+    def email_title(self) -> str:
+        """
+        The title of the email notification.
+        """
+        return pulumi.get(self, "email_title")
+
+    @property
+    @pulumi.getter(name="robotContent")
+    def robot_content(self) -> str:
+        """
+        The content of the robot notification.
+        """
+        return pulumi.get(self, "robot_content")
+
+    @property
+    @pulumi.getter(name="smsContent")
+    def sms_content(self) -> str:
+        """
+        The content of the SMS notification.
+        """
+        return pulumi.get(self, "sms_content")
+
+    @property
+    @pulumi.getter(name="smsRecoverContent")
+    def sms_recover_content(self) -> str:
+        """
+        The content of the SMS notification for restored alerts.
+        """
+        return pulumi.get(self, "sms_recover_content")
+
+    @property
+    @pulumi.getter(name="ttsContent")
+    def tts_content(self) -> str:
+        """
+        The content of the TTS notification.
+        """
+        return pulumi.get(self, "tts_content")
+
+    @property
+    @pulumi.getter(name="ttsRecoverContent")
+    def tts_recover_content(self) -> str:
+        """
+        The content of the TTS notification for restored alerts.
+        """
+        return pulumi.get(self, "tts_recover_content")
+
+
 @pulumi.output_type
 class PrometheusAlertRuleAnnotation(dict):
     def __init__(__self__, *,
@@ -2319,16 +2487,111 @@ class GetAlertContactsContactResult(dict):
         return pulumi.get(self, "webhook")
 
 
+@pulumi.output_type
+class GetAlertRobotsRobotResult(dict):
+    def __init__(__self__, *,
+                 create_time: str,
+                 daily_noc: str,
+                 daily_noc_time: str,
+                 id: str,
+                 robot_addr: str,
+                 robot_id: str,
+                 robot_name: str,
+                 robot_type: str):
+        """
+        :param str create_time: The creation time of the resource.
+        :param str daily_noc: Specifies whether the alert robot receives daily notifications.
+        :param str daily_noc_time: The time of the daily notification.
+        :param str id: The ID of the Alert Robot.
+        :param str robot_addr: The webhook url of the robot.
+        :param str robot_id: The id of the robot.
+        :param str robot_name: The name of the robot.
+        :param str robot_type: The robot type.
+        """
+        pulumi.set(__self__, "create_time", create_time)
+        pulumi.set(__self__, "daily_noc", daily_noc)
+        pulumi.set(__self__, "daily_noc_time", daily_noc_time)
+        pulumi.set(__self__, "id", id)
+        pulumi.set(__self__, "robot_addr", robot_addr)
+        pulumi.set(__self__, "robot_id", robot_id)
+        pulumi.set(__self__, "robot_name", robot_name)
+        pulumi.set(__self__, "robot_type", robot_type)
+
+    @property
+    @pulumi.getter(name="createTime")
+    def create_time(self) -> str:
+        """
+        The creation time of the resource.
+        """
+        return pulumi.get(self, "create_time")
+
+    @property
+    @pulumi.getter(name="dailyNoc")
+    def daily_noc(self) -> str:
+        """
+        Specifies whether the alert robot receives daily notifications.
+        """
+        return pulumi.get(self, "daily_noc")
+
+    @property
+    @pulumi.getter(name="dailyNocTime")
+    def daily_noc_time(self) -> str:
+        """
+        The time of the daily notification.
+        """
+        return pulumi.get(self, "daily_noc_time")
+
+    @property
+    @pulumi.getter
+    def id(self) -> str:
+        """
+        The ID of the Alert Robot.
+        """
+        return pulumi.get(self, "id")
+
+    @property
+    @pulumi.getter(name="robotAddr")
+    def robot_addr(self) -> str:
+        """
+        The webhook url of the robot.
+        """
+        return pulumi.get(self, "robot_addr")
+
+    @property
+    @pulumi.getter(name="robotId")
+    def robot_id(self) -> str:
+        """
+        The id of the robot.
+        """
+        return pulumi.get(self, "robot_id")
+
+    @property
+    @pulumi.getter(name="robotName")
+    def robot_name(self) -> str:
+        """
+        The name of the robot.
+        """
+        return pulumi.get(self, "robot_name")
+
+    @property
+    @pulumi.getter(name="robotType")
+    def robot_type(self) -> str:
+        """
+        The robot type.
+        """
+        return pulumi.get(self, "robot_type")
+
+
 @pulumi.output_type
 class GetDispatchRulesRuleResult(dict):
     def __init__(__self__, *,
                  dispatch_rule_id: str,
                  dispatch_rule_name: str,
-                 dispatch_type: str,
                  group_rules: Sequence['outputs.GetDispatchRulesRuleGroupRuleResult'],
                  id: str,
                  label_match_expression_grids: Sequence['outputs.GetDispatchRulesRuleLabelMatchExpressionGridResult'],
                  notify_rules: Sequence['outputs.GetDispatchRulesRuleNotifyRuleResult'],
+                 notify_templates: Sequence['outputs.GetDispatchRulesRuleNotifyTemplateResult'],
                  status: str):
         """
         :param str dispatch_rule_id: Dispatch rule ID.
@@ -2337,15 +2600,16 @@ class GetDispatchRulesRuleResult(dict):
         :param str id: The ID of the Dispatch Rule.
         :param Sequence['GetDispatchRulesRuleLabelMatchExpressionGridArgs'] label_match_expression_grids: Sets the dispatch rule.
         :param Sequence['GetDispatchRulesRuleNotifyRuleArgs'] notify_rules: Sets the notification rule.
+        :param Sequence['GetDispatchRulesRuleNotifyTemplateArgs'] notify_templates: (Available since v1.238.0) The notification method.
         :param str status: The resource status of Alert Dispatch Rule.
         """
         pulumi.set(__self__, "dispatch_rule_id", dispatch_rule_id)
         pulumi.set(__self__, "dispatch_rule_name", dispatch_rule_name)
-        pulumi.set(__self__, "dispatch_type", dispatch_type)
         pulumi.set(__self__, "group_rules", group_rules)
         pulumi.set(__self__, "id", id)
         pulumi.set(__self__, "label_match_expression_grids", label_match_expression_grids)
         pulumi.set(__self__, "notify_rules", notify_rules)
+        pulumi.set(__self__, "notify_templates", notify_templates)
         pulumi.set(__self__, "status", status)
 
     @property
@@ -2364,11 +2628,6 @@ class GetDispatchRulesRuleResult(dict):
         """
         return pulumi.get(self, "dispatch_rule_name")
 
-    @property
-    @pulumi.getter(name="dispatchType")
-    def dispatch_type(self) -> str:
-        return pulumi.get(self, "dispatch_type")
-
     @property
     @pulumi.getter(name="groupRules")
     def group_rules(self) -> Sequence['outputs.GetDispatchRulesRuleGroupRuleResult']:
@@ -2401,6 +2660,14 @@ class GetDispatchRulesRuleResult(dict):
         """
         return pulumi.get(self, "notify_rules")
 
+    @property
+    @pulumi.getter(name="notifyTemplates")
+    def notify_templates(self) -> Sequence['outputs.GetDispatchRulesRuleNotifyTemplateResult']:
+        """
+        (Available since v1.238.0) The notification method.
+        """
+        return pulumi.get(self, "notify_templates")
+
     @property
     @pulumi.getter
     def status(self) -> str:
@@ -2413,7 +2680,6 @@ class GetDispatchRulesRuleResult(dict):
 @pulumi.output_type
 class GetDispatchRulesRuleGroupRuleResult(dict):
     def __init__(__self__, *,
-                 group_id: int,
                  group_interval: int,
                  group_wait_time: int,
                  grouping_fields: Sequence[str],
@@ -2424,17 +2690,11 @@ class GetDispatchRulesRuleGroupRuleResult(dict):
         :param Sequence[str] grouping_fields: The fields that are used to group events. Events with the same field content are assigned to a group. Alerts with the same specified grouping field are sent to the handler in separate notifications.
         :param int repeat_interval: The silence period of repeated alerts. All alerts are repeatedly sent at specified intervals until the alerts are cleared. The minimum value is 61. Default to 600.
         """
-        pulumi.set(__self__, "group_id", group_id)
         pulumi.set(__self__, "group_interval", group_interval)
         pulumi.set(__self__, "group_wait_time", group_wait_time)
         pulumi.set(__self__, "grouping_fields", grouping_fields)
         pulumi.set(__self__, "repeat_interval", repeat_interval)
 
-    @property
-    @pulumi.getter(name="groupId")
-    def group_id(self) -> int:
-        return pulumi.get(self, "group_id")
-
     @property
     @pulumi.getter(name="groupInterval")
     def group_interval(self) -> int:
@@ -2548,22 +2808,36 @@ class GetDispatchRulesRuleLabelMatchExpressionGridLabelMatchExpressionGroupLabel
 class GetDispatchRulesRuleNotifyRuleResult(dict):
     def __init__(__self__, *,
                  notify_channels: Sequence[str],
-                 notify_objects: Sequence['outputs.GetDispatchRulesRuleNotifyRuleNotifyObjectResult']):
+                 notify_end_time: str,
+                 notify_objects: Sequence['outputs.GetDispatchRulesRuleNotifyRuleNotifyObjectResult'],
+                 notify_start_time: str):
         """
-        :param Sequence[str] notify_channels: The notification method.
+        :param Sequence[str] notify_channels: A list of notification methods.
+        :param str notify_end_time: (Available since v1.237.0) End time of notification.
         :param Sequence['GetDispatchRulesRuleNotifyRuleNotifyObjectArgs'] notify_objects: Sets the notification object.
+        :param str notify_start_time: (Available since v1.237.0) Start time of notification.
         """
         pulumi.set(__self__, "notify_channels", notify_channels)
+        pulumi.set(__self__, "notify_end_time", notify_end_time)
         pulumi.set(__self__, "notify_objects", notify_objects)
+        pulumi.set(__self__, "notify_start_time", notify_start_time)
 
     @property
     @pulumi.getter(name="notifyChannels")
     def notify_channels(self) -> Sequence[str]:
         """
-        The notification method.
+        A list of notification methods.
         """
         return pulumi.get(self, "notify_channels")
 
+    @property
+    @pulumi.getter(name="notifyEndTime")
+    def notify_end_time(self) -> str:
+        """
+        (Available since v1.237.0) End time of notification.
+        """
+        return pulumi.get(self, "notify_end_time")
+
     @property
     @pulumi.getter(name="notifyObjects")
     def notify_objects(self) -> Sequence['outputs.GetDispatchRulesRuleNotifyRuleNotifyObjectResult']:
@@ -2572,6 +2846,14 @@ class GetDispatchRulesRuleNotifyRuleResult(dict):
         """
         return pulumi.get(self, "notify_objects")
 
+    @property
+    @pulumi.getter(name="notifyStartTime")
+    def notify_start_time(self) -> str:
+        """
+        (Available since v1.237.0) Start time of notification.
+        """
+        return pulumi.get(self, "notify_start_time")
+
 
 @pulumi.output_type
 class GetDispatchRulesRuleNotifyRuleNotifyObjectResult(dict):
@@ -2613,6 +2895,112 @@ class GetDispatchRulesRuleNotifyRuleNotifyObjectResult(dict):
         return pulumi.get(self, "notify_type")
 
 
+@pulumi.output_type
+class GetDispatchRulesRuleNotifyTemplateResult(dict):
+    def __init__(__self__, *,
+                 email_content: str,
+                 email_recover_content: str,
+                 email_recover_title: str,
+                 email_title: str,
+                 robot_content: str,
+                 sms_content: str,
+                 sms_recover_content: str,
+                 tts_content: str,
+                 tts_recover_content: str):
+        """
+        :param str email_content: The content of the email.
+        :param str email_recover_content: The content of the email.
+        :param str email_recover_title: The title of the email.
+        :param str email_title: The title of the email.
+        :param str robot_content: The content of the robot.
+        :param str sms_content: The content of the SMS.
+        :param str sms_recover_content: The content of the SMS.
+        :param str tts_content: The content of the TTS.
+        :param str tts_recover_content: The content of the TTS.
+        """
+        pulumi.set(__self__, "email_content", email_content)
+        pulumi.set(__self__, "email_recover_content", email_recover_content)
+        pulumi.set(__self__, "email_recover_title", email_recover_title)
+        pulumi.set(__self__, "email_title", email_title)
+        pulumi.set(__self__, "robot_content", robot_content)
+        pulumi.set(__self__, "sms_content", sms_content)
+        pulumi.set(__self__, "sms_recover_content", sms_recover_content)
+        pulumi.set(__self__, "tts_content", tts_content)
+        pulumi.set(__self__, "tts_recover_content", tts_recover_content)
+
+    @property
+    @pulumi.getter(name="emailContent")
+    def email_content(self) -> str:
+        """
+        The content of the email.
+        """
+        return pulumi.get(self, "email_content")
+
+    @property
+    @pulumi.getter(name="emailRecoverContent")
+    def email_recover_content(self) -> str:
+        """
+        The content of the email.
+        """
+        return pulumi.get(self, "email_recover_content")
+
+    @property
+    @pulumi.getter(name="emailRecoverTitle")
+    def email_recover_title(self) -> str:
+        """
+        The title of the email.
+        """
+        return pulumi.get(self, "email_recover_title")
+
+    @property
+    @pulumi.getter(name="emailTitle")
+    def email_title(self) -> str:
+        """
+        The title of the email.
+        """
+        return pulumi.get(self, "email_title")
+
+    @property
+    @pulumi.getter(name="robotContent")
+    def robot_content(self) -> str:
+        """
+        The content of the robot.
+        """
+        return pulumi.get(self, "robot_content")
+
+    @property
+    @pulumi.getter(name="smsContent")
+    def sms_content(self) -> str:
+        """
+        The content of the SMS.
+        """
+        return pulumi.get(self, "sms_content")
+
+    @property
+    @pulumi.getter(name="smsRecoverContent")
+    def sms_recover_content(self) -> str:
+        """
+        The content of the SMS.
+        """
+        return pulumi.get(self, "sms_recover_content")
+
+    @property
+    @pulumi.getter(name="ttsContent")
+    def tts_content(self) -> str:
+        """
+        The content of the TTS.
+        """
+        return pulumi.get(self, "tts_content")
+
+    @property
+    @pulumi.getter(name="ttsRecoverContent")
+    def tts_recover_content(self) -> str:
+        """
+        The content of the TTS.
+        """
+        return pulumi.get(self, "tts_recover_content")
+
+
 @pulumi.output_type
 class GetIntegrationExportersIntegrationExporterResult(dict):
     def __init__(__self__, *,

pulumi_alicloud/bastionhost/get_host_accounts.py

@@ -203,7 +203,7 @@ def get_host_accounts_output(host_account_name: Optional[pulumi.Input[Optional[s
                              name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                              output_file: Optional[pulumi.Input[Optional[str]]] = None,
                              protocol_name: Optional[pulumi.Input[Optional[str]]] = None,
-                             opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetHostAccountsResult]:
+                             opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetHostAccountsResult]:
     """
     This data source provides the Bastionhost Host Accounts of the current Alibaba Cloud user.
 
@@ -247,7 +247,7 @@ def get_host_accounts_output(host_account_name: Optional[pulumi.Input[Optional[s
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
     __args__['protocolName'] = protocol_name
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:bastionhost/getHostAccounts:getHostAccounts', __args__, opts=opts, typ=GetHostAccountsResult)
     return __ret__.apply(lambda __response__: GetHostAccountsResult(
         accounts=pulumi.get(__response__, 'accounts'),

pulumi_alicloud/bastionhost/get_host_groups.py

@@ -173,7 +173,7 @@ def get_host_groups_output(host_group_name: Optional[pulumi.Input[Optional[str]]
                            instance_id: Optional[pulumi.Input[str]] = None,
                            name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                            output_file: Optional[pulumi.Input[Optional[str]]] = None,
-                           opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetHostGroupsResult]:
+                           opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetHostGroupsResult]:
     """
     This data source provides the Bastionhost Host Groups of the current Alibaba Cloud user.
 
@@ -211,7 +211,7 @@ def get_host_groups_output(host_group_name: Optional[pulumi.Input[Optional[str]]
     __args__['instanceId'] = instance_id
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:bastionhost/getHostGroups:getHostGroups', __args__, opts=opts, typ=GetHostGroupsResult)
     return __ret__.apply(lambda __response__: GetHostGroupsResult(
         groups=pulumi.get(__response__, 'groups'),

pulumi_alicloud/bastionhost/get_host_share_keys.py

@@ -173,7 +173,7 @@ def get_host_share_keys_output(enable_details: Optional[pulumi.Input[Optional[bo
                                instance_id: Optional[pulumi.Input[str]] = None,
                                name_regex: Optional[pulumi.Input[Optional[str]]] = None,
                                output_file: Optional[pulumi.Input[Optional[str]]] = None,
-                               opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetHostShareKeysResult]:
+                               opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetHostShareKeysResult]:
     """
     This data source provides the Bastionhost Host Share Keys of the current Alibaba Cloud user.
 
@@ -211,7 +211,7 @@ def get_host_share_keys_output(enable_details: Optional[pulumi.Input[Optional[bo
     __args__['instanceId'] = instance_id
     __args__['nameRegex'] = name_regex
     __args__['outputFile'] = output_file
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:bastionhost/getHostShareKeys:getHostShareKeys', __args__, opts=opts, typ=GetHostShareKeysResult)
     return __ret__.apply(lambda __response__: GetHostShareKeysResult(
         enable_details=pulumi.get(__response__, 'enable_details'),

pulumi_alicloud/bastionhost/get_hosts.py

@@ -257,7 +257,7 @@ def get_hosts_output(enable_details: Optional[pulumi.Input[Optional[bool]]] = No
                      source: Optional[pulumi.Input[Optional[str]]] = None,
                      source_instance_id: Optional[pulumi.Input[Optional[str]]] = None,
                      source_instance_state: Optional[pulumi.Input[Optional[str]]] = None,
-                     opts: Optional[pulumi.InvokeOptions] = None) -> pulumi.Output[GetHostsResult]:
+                     opts: Optional[Union[pulumi.InvokeOptions, pulumi.InvokeOutputOptions]] = None) -> pulumi.Output[GetHostsResult]:
     """
     This data source provides the Bastionhost Hosts of the current Alibaba Cloud user.
 
@@ -307,7 +307,7 @@ def get_hosts_output(enable_details: Optional[pulumi.Input[Optional[bool]]] = No
     __args__['source'] = source
     __args__['sourceInstanceId'] = source_instance_id
     __args__['sourceInstanceState'] = source_instance_state
-    opts = pulumi.InvokeOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
+    opts = pulumi.InvokeOutputOptions.merge(_utilities.get_invoke_opts_defaults(), opts)
     __ret__ = pulumi.runtime.invoke_output('alicloud:bastionhost/getHosts:getHosts', __args__, opts=opts, typ=GetHostsResult)
     return __ret__.apply(lambda __response__: GetHostsResult(
         enable_details=pulumi.get(__response__, 'enable_details'),