robhan-cdk-lib.aws-grafana 0.0.33__py3-none-any.whl → 0.0.35__py3-none-any.whl

robhan_cdk_lib/aws_grafana/__init__.py

@@ -1039,6 +1039,7 @@ class VpcConfiguration:
         "account_access_type": "accountAccessType",
         "authentication_providers": "authenticationProviders",
         "permission_type": "permissionType",
+        "workspace_arn": "workspaceArn",
         "client_token": "clientToken",
         "data_sources": "dataSources",
         "description": "description",
@@ -1052,8 +1053,6 @@ class VpcConfiguration:
         "saml_configuration": "samlConfiguration",
         "stack_set_name": "stackSetName",
         "vpc_configuration": "vpcConfiguration",
-        "workspace_arn": "workspaceArn",
-        "workspace_id": "workspaceId",
     },
 )
 class WorkspaceAttributes:
@@ -1063,6 +1062,7 @@ class WorkspaceAttributes:
         account_access_type: AccountAccessType,
         authentication_providers: typing.Sequence[AuthenticationProviders],
         permission_type: PermissionTypes,
+        workspace_arn: builtins.str,
         client_token: typing.Optional[builtins.str] = None,
         data_sources: typing.Optional[typing.Sequence[builtins.str]] = None,
         description: typing.Optional[builtins.str] = None,
@@ -1076,13 +1076,12 @@ class WorkspaceAttributes:
         saml_configuration: typing.Optional[typing.Union[SamlConfiguration, typing.Dict[builtins.str, typing.Any]]] = None,
         stack_set_name: typing.Optional[builtins.str] = None,
         vpc_configuration: typing.Optional[typing.Union[VpcConfiguration, typing.Dict[builtins.str, typing.Any]]] = None,
-        workspace_arn: typing.Optional[builtins.str] = None,
-        workspace_id: typing.Optional[builtins.str] = None,
     ) -> None:
         '''
         :param account_access_type: Specifies whether the workspace can access AWS resources in this AWS account only, or whether it can also access AWS resources in other accounts in the same organization. If this is ORGANIZATION, the OrganizationalUnits parameter specifies which organizational units the workspace can access. Required field.
         :param authentication_providers: Specifies whether this workspace uses SAML 2.0, AWS IAM Identity Center, or both to authenticate users for using the Grafana console within a workspace. Required field.
         :param permission_type: If this is SERVICE_MANAGED, and the workplace was created through the Amazon Managed Grafana console, then Amazon Managed Grafana automatically creates the IAM roles and provisions the permissions that the workspace needs to use AWS data sources and notification channels. If this is CUSTOMER_MANAGED, you must manage those roles and permissions yourself. If you are working with a workspace in a member account of an organization and that account is not a delegated administrator account, and you want the workspace to access data sources in other AWS accounts in the organization, this parameter must be set to CUSTOMER_MANAGED. Required field.
+        :param workspace_arn: The arn of this workspace.
         :param client_token: A unique, case-sensitive, user-provided identifier to ensure the idempotency of the request. Must be 1-64 characters long and contain only printable ASCII characters.
         :param data_sources: Specifies the AWS data sources that have been configured to have IAM roles and permissions created to allow Amazon Managed Grafana to read data from these sources. This list is only used when the workspace was created through the AWS console, and the permissionType is SERVICE_MANAGED.
         :param description: The user-defined description of the workspace. Maximum length of 2048 characters.
@@ -1096,8 +1095,6 @@ class WorkspaceAttributes:
         :param saml_configuration: If the workspace uses SAML, use this structure to map SAML assertion attributes to workspace user information and define which groups in the assertion attribute are to have the Admin and Editor roles in the workspace.
         :param stack_set_name: The name of the AWS CloudFormation stack set that is used to generate IAM roles to be used for this workspace.
         :param vpc_configuration: The configuration settings for an Amazon VPC that contains data sources for your Grafana workspace to connect to.
-        :param workspace_arn: The arn of this workspace. Either this or the workspaceId must be provided.
-        :param workspace_id: The unique ID of this workspace. Either this or the workspaceArn must be provided.
         '''
         if isinstance(network_access_control, dict):
             network_access_control = NetworkAccessControl(**network_access_control)
@@ -1110,6 +1107,7 @@ class WorkspaceAttributes:
             check_type(argname="argument account_access_type", value=account_access_type, expected_type=type_hints["account_access_type"])
             check_type(argname="argument authentication_providers", value=authentication_providers, expected_type=type_hints["authentication_providers"])
             check_type(argname="argument permission_type", value=permission_type, expected_type=type_hints["permission_type"])
+            check_type(argname="argument workspace_arn", value=workspace_arn, expected_type=type_hints["workspace_arn"])
             check_type(argname="argument client_token", value=client_token, expected_type=type_hints["client_token"])
             check_type(argname="argument data_sources", value=data_sources, expected_type=type_hints["data_sources"])
             check_type(argname="argument description", value=description, expected_type=type_hints["description"])
@@ -1123,12 +1121,11 @@ class WorkspaceAttributes:
             check_type(argname="argument saml_configuration", value=saml_configuration, expected_type=type_hints["saml_configuration"])
             check_type(argname="argument stack_set_name", value=stack_set_name, expected_type=type_hints["stack_set_name"])
             check_type(argname="argument vpc_configuration", value=vpc_configuration, expected_type=type_hints["vpc_configuration"])
-            check_type(argname="argument workspace_arn", value=workspace_arn, expected_type=type_hints["workspace_arn"])
-            check_type(argname="argument workspace_id", value=workspace_id, expected_type=type_hints["workspace_id"])
         self._values: typing.Dict[builtins.str, typing.Any] = {
             "account_access_type": account_access_type,
             "authentication_providers": authentication_providers,
             "permission_type": permission_type,
+            "workspace_arn": workspace_arn,
         }
         if client_token is not None:
             self._values["client_token"] = client_token
@@ -1156,10 +1153,6 @@ class WorkspaceAttributes:
             self._values["stack_set_name"] = stack_set_name
         if vpc_configuration is not None:
             self._values["vpc_configuration"] = vpc_configuration
-        if workspace_arn is not None:
-            self._values["workspace_arn"] = workspace_arn
-        if workspace_id is not None:
-            self._values["workspace_id"] = workspace_id
 
     @builtins.property
     def account_access_type(self) -> AccountAccessType:
@@ -1201,6 +1194,13 @@ class WorkspaceAttributes:
         assert result is not None, "Required property 'permission_type' is missing"
         return typing.cast(PermissionTypes, result)
 
+    @builtins.property
+    def workspace_arn(self) -> builtins.str:
+        '''The arn of this workspace.'''
+        result = self._values.get("workspace_arn")
+        assert result is not None, "Required property 'workspace_arn' is missing"
+        return typing.cast(builtins.str, result)
+
     @builtins.property
     def client_token(self) -> typing.Optional[builtins.str]:
         '''A unique, case-sensitive, user-provided identifier to ensure the idempotency of the request.
@@ -1306,24 +1306,6 @@ class WorkspaceAttributes:
         result = self._values.get("vpc_configuration")
         return typing.cast(typing.Optional[VpcConfiguration], result)
 
-    @builtins.property
-    def workspace_arn(self) -> typing.Optional[builtins.str]:
-        '''The arn of this workspace.
-
-        Either this or the workspaceId must be provided.
-        '''
-        result = self._values.get("workspace_arn")
-        return typing.cast(typing.Optional[builtins.str], result)
-
-    @builtins.property
-    def workspace_id(self) -> typing.Optional[builtins.str]:
-        '''The unique ID of this workspace.
-
-        Either this or the workspaceArn must be provided.
-        '''
-        result = self._values.get("workspace_id")
-        return typing.cast(typing.Optional[builtins.str], result)
-
     def __eq__(self, rhs: typing.Any) -> builtins.bool:
         return isinstance(rhs, self.__class__) and rhs._values == self._values
 
@@ -2039,6 +2021,7 @@ class Workspace(
         account_access_type: AccountAccessType,
         authentication_providers: typing.Sequence[AuthenticationProviders],
         permission_type: PermissionTypes,
+        workspace_arn: builtins.str,
         client_token: typing.Optional[builtins.str] = None,
         data_sources: typing.Optional[typing.Sequence[builtins.str]] = None,
         description: typing.Optional[builtins.str] = None,
@@ -2052,8 +2035,6 @@ class Workspace(
         saml_configuration: typing.Optional[typing.Union[SamlConfiguration, typing.Dict[builtins.str, typing.Any]]] = None,
         stack_set_name: typing.Optional[builtins.str] = None,
         vpc_configuration: typing.Optional[typing.Union[VpcConfiguration, typing.Dict[builtins.str, typing.Any]]] = None,
-        workspace_arn: typing.Optional[builtins.str] = None,
-        workspace_id: typing.Optional[builtins.str] = None,
     ) -> IWorkspace:
         '''
         :param scope: -
@@ -2061,6 +2042,7 @@ class Workspace(
         :param account_access_type: Specifies whether the workspace can access AWS resources in this AWS account only, or whether it can also access AWS resources in other accounts in the same organization. If this is ORGANIZATION, the OrganizationalUnits parameter specifies which organizational units the workspace can access. Required field.
         :param authentication_providers: Specifies whether this workspace uses SAML 2.0, AWS IAM Identity Center, or both to authenticate users for using the Grafana console within a workspace. Required field.
         :param permission_type: If this is SERVICE_MANAGED, and the workplace was created through the Amazon Managed Grafana console, then Amazon Managed Grafana automatically creates the IAM roles and provisions the permissions that the workspace needs to use AWS data sources and notification channels. If this is CUSTOMER_MANAGED, you must manage those roles and permissions yourself. If you are working with a workspace in a member account of an organization and that account is not a delegated administrator account, and you want the workspace to access data sources in other AWS accounts in the organization, this parameter must be set to CUSTOMER_MANAGED. Required field.
+        :param workspace_arn: The arn of this workspace.
         :param client_token: A unique, case-sensitive, user-provided identifier to ensure the idempotency of the request. Must be 1-64 characters long and contain only printable ASCII characters.
         :param data_sources: Specifies the AWS data sources that have been configured to have IAM roles and permissions created to allow Amazon Managed Grafana to read data from these sources. This list is only used when the workspace was created through the AWS console, and the permissionType is SERVICE_MANAGED.
         :param description: The user-defined description of the workspace. Maximum length of 2048 characters.
@@ -2074,8 +2056,6 @@ class Workspace(
         :param saml_configuration: If the workspace uses SAML, use this structure to map SAML assertion attributes to workspace user information and define which groups in the assertion attribute are to have the Admin and Editor roles in the workspace.
         :param stack_set_name: The name of the AWS CloudFormation stack set that is used to generate IAM roles to be used for this workspace.
         :param vpc_configuration: The configuration settings for an Amazon VPC that contains data sources for your Grafana workspace to connect to.
-        :param workspace_arn: The arn of this workspace. Either this or the workspaceId must be provided.
-        :param workspace_id: The unique ID of this workspace. Either this or the workspaceArn must be provided.
         '''
         if __debug__:
             type_hints = typing.get_type_hints(_typecheckingstub__3998e8138348ba3fd0198ea857bd0357c9ffc4806dd420f1974b384d9116186f)
@@ -2085,6 +2065,7 @@ class Workspace(
             account_access_type=account_access_type,
             authentication_providers=authentication_providers,
             permission_type=permission_type,
+            workspace_arn=workspace_arn,
             client_token=client_token,
             data_sources=data_sources,
             description=description,
@@ -2098,8 +2079,6 @@ class Workspace(
             saml_configuration=saml_configuration,
             stack_set_name=stack_set_name,
             vpc_configuration=vpc_configuration,
-            workspace_arn=workspace_arn,
-            workspace_id=workspace_id,
         )
 
         return typing.cast(IWorkspace, jsii.sinvoke(cls, "fromWorkspaceAttributes", [scope, id, attrs]))
@@ -2361,6 +2340,7 @@ def _typecheckingstub__c7b2f7e0bca3214d1d530a9824b09f4187fa0fc3d9bc0a9db3801c372
     account_access_type: AccountAccessType,
     authentication_providers: typing.Sequence[AuthenticationProviders],
     permission_type: PermissionTypes,
+    workspace_arn: builtins.str,
     client_token: typing.Optional[builtins.str] = None,
     data_sources: typing.Optional[typing.Sequence[builtins.str]] = None,
     description: typing.Optional[builtins.str] = None,
@@ -2374,8 +2354,6 @@ def _typecheckingstub__c7b2f7e0bca3214d1d530a9824b09f4187fa0fc3d9bc0a9db3801c372
     saml_configuration: typing.Optional[typing.Union[SamlConfiguration, typing.Dict[builtins.str, typing.Any]]] = None,
     stack_set_name: typing.Optional[builtins.str] = None,
     vpc_configuration: typing.Optional[typing.Union[VpcConfiguration, typing.Dict[builtins.str, typing.Any]]] = None,
-    workspace_arn: typing.Optional[builtins.str] = None,
-    workspace_id: typing.Optional[builtins.str] = None,
 ) -> None:
     """Type checking stubs"""
     pass
@@ -2459,6 +2437,7 @@ def _typecheckingstub__3998e8138348ba3fd0198ea857bd0357c9ffc4806dd420f1974b384d9
     account_access_type: AccountAccessType,
     authentication_providers: typing.Sequence[AuthenticationProviders],
     permission_type: PermissionTypes,
+    workspace_arn: builtins.str,
     client_token: typing.Optional[builtins.str] = None,
     data_sources: typing.Optional[typing.Sequence[builtins.str]] = None,
     description: typing.Optional[builtins.str] = None,
@@ -2472,8 +2451,6 @@ def _typecheckingstub__3998e8138348ba3fd0198ea857bd0357c9ffc4806dd420f1974b384d9
     saml_configuration: typing.Optional[typing.Union[SamlConfiguration, typing.Dict[builtins.str, typing.Any]]] = None,
     stack_set_name: typing.Optional[builtins.str] = None,
     vpc_configuration: typing.Optional[typing.Union[VpcConfiguration, typing.Dict[builtins.str, typing.Any]]] = None,
-    workspace_arn: typing.Optional[builtins.str] = None,
-    workspace_id: typing.Optional[builtins.str] = None,
 ) -> None:
     """Type checking stubs"""
     pass

robhan_cdk_lib/aws_grafana/_jsii/__init__.py

@@ -33,9 +33,9 @@ import constructs._jsii
 
 __jsii_assembly__ = jsii.JSIIAssembly.load(
     "@robhan-cdk-lib/aws_grafana",
-    "0.0.33",
+    "0.0.35",
     __name__[0:-6],
-    "aws_grafana@0.0.33.jsii.tgz",
+    "aws_grafana@0.0.35.jsii.tgz",
 )
 
 __all__ = [

{robhan_cdk_lib_aws_grafana-0.0.33.dist-info → robhan_cdk_lib_aws_grafana-0.0.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: robhan_cdk_lib.aws_grafana
-Version: 0.0.33
+Version: 0.0.35
 Summary: AWS CDK Construct Library for Grafana
 Home-page: https://github.com/robert-hanuschke/cdk-aws_grafana
 Author: Robert Hanuschke<robhan-cdk-lib@hanuschke.eu>

robhan_cdk_lib_aws_grafana-0.0.35.dist-info/RECORD

@@ -0,0 +1,9 @@
+robhan_cdk_lib/aws_grafana/__init__.py,sha256=DgslsbKZEQSfa_h8K_i9uaEmsbdgQBGrR-1-5CPdT1Q,130258
+robhan_cdk_lib/aws_grafana/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+robhan_cdk_lib/aws_grafana/_jsii/__init__.py,sha256=tD-Zc4Kq5jzp6abbSyDoVUgA7usqepCD6Qeg7WrmBXo,1464
+robhan_cdk_lib/aws_grafana/_jsii/aws_grafana@0.0.35.jsii.tgz,sha256=HCMa-RHudTSMzT_BJf9fKelJ-Xf-WaBeAEMkyKBuUys,61643
+robhan_cdk_lib_aws_grafana-0.0.35.dist-info/LICENSE,sha256=4XPjxtvMDZSu-9820NaFomMw08Ri6JrgByiDz0XZhDY,1060
+robhan_cdk_lib_aws_grafana-0.0.35.dist-info/METADATA,sha256=B8KG72crMUl6N7W0B8UHdgs6TisrvAv-zJ4L7fXSpGs,2842
+robhan_cdk_lib_aws_grafana-0.0.35.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+robhan_cdk_lib_aws_grafana-0.0.35.dist-info/top_level.txt,sha256=P6XdVCMOK2Rt55vMQhnq4WJqpu14FeZZcktc4hoDIwI,15
+robhan_cdk_lib_aws_grafana-0.0.35.dist-info/RECORD,,

robhan_cdk_lib_aws_grafana-0.0.33.dist-info/RECORD

@@ -1,9 +0,0 @@
-robhan_cdk_lib/aws_grafana/__init__.py,sha256=hmXMOsUHXnkqRld3WZwFyJNQoM6lbBH6S9zN0GcQUwY,131584
-robhan_cdk_lib/aws_grafana/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-robhan_cdk_lib/aws_grafana/_jsii/__init__.py,sha256=NU8gYkJvRYm3bE4JMYKt9DD07AZcXupKsg9pumz-v-Q,1464
-robhan_cdk_lib/aws_grafana/_jsii/aws_grafana@0.0.33.jsii.tgz,sha256=0alPwOQo-0PKtTko-jyJSAHdeJIINlJ1t-vkSM-G_Ac,62309
-robhan_cdk_lib_aws_grafana-0.0.33.dist-info/LICENSE,sha256=4XPjxtvMDZSu-9820NaFomMw08Ri6JrgByiDz0XZhDY,1060
-robhan_cdk_lib_aws_grafana-0.0.33.dist-info/METADATA,sha256=qoTVMrKj2j8MwslgJY7ClB59R3UAnMclHhd7MECFVlQ,2842
-robhan_cdk_lib_aws_grafana-0.0.33.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-robhan_cdk_lib_aws_grafana-0.0.33.dist-info/top_level.txt,sha256=P6XdVCMOK2Rt55vMQhnq4WJqpu14FeZZcktc4hoDIwI,15
-robhan_cdk_lib_aws_grafana-0.0.33.dist-info/RECORD,,