diff --git a/cicd/build/package/release.patch b/cicd/build/package/release.patch index fb3d8619..a99d6260 100644 --- a/cicd/build/package/release.patch +++ b/cicd/build/package/release.patch @@ -1,5 +1,5 @@ ---- template.yaml 2023-10-27 16:02:11 -+++ release.yaml 2023-10-27 16:06:09 +--- template.yaml 2023-10-27 16:34:16 ++++ release.yaml 2023-10-27 16:34:37 @@ -36,7 +36,7 @@ - ScheduleExpression diff --git a/cicd/build/package/staging.patch b/cicd/build/package/staging.patch index 0f9607d1..b9c7a00c 100644 --- a/cicd/build/package/staging.patch +++ b/cicd/build/package/staging.patch @@ -1,5 +1,5 @@ ---- template.yaml 2023-10-27 16:02:11 -+++ staging.yaml 2023-10-27 16:04:04 +--- template.yaml 2023-10-27 16:34:16 ++++ staging.yaml 2023-10-27 16:33:15 @@ -36,7 +36,7 @@ - ScheduleExpression @@ -9,7 +9,7 @@ Description: Helping you populate AWS SSO directly with your Google Apps users. Author: Sebastian Doell SpdxLicenseId: Apache-2.0 -@@ -147,6 +147,7 @@ +@@ -143,6 +143,7 @@ SSOSyncFunction: Type: AWS::Serverless::Function Properties: @@ -17,7 +17,7 @@ Runtime: provided.al2 Handler: bootstrap Architectures: -@@ -246,3 +247,10 @@ +@@ -242,3 +243,10 @@ Properties: Name: SSOSyncIdentityStoreID SecretString: !Ref IdentityStoreID diff --git a/template.yaml b/template.yaml index 397d6ea4..abad08f6 100644 --- a/template.yaml +++ b/template.yaml @@ -9,7 +9,7 @@ Metadata: Parameters: - SCIMEndpointUrl - SCIMEndpointAccessToken - - IdentityStoreId + - IdentityStoreID - Label: default: Google Workspace Credentials Parameters: @@ -98,10 +98,6 @@ Parameters: Type: String Description: AWS SSO SCIM AccessToken NoEcho: true - Region: - Type: String - Description: AWS Region where AWS SSO is enabled - NoEcho: true IdentityStoreID: Type: String Description: Identifier of Identity Store in AWS SSO @@ -113,13 +109,13 @@ Parameters: Description: | Google Workspace user filter query parameter, example: 'name:John* email:admin*', see: https://developers.google.com/admin-sdk/directory/v1/guides/search-users Default: '*' - AllowedPattern: "(*)|(name|Name|NAME)(:([a-zA-Z0-9]{1,64})(\*))|(name|Name|NAME)(=([a-zA-Z0-9 ]{1,64}))|(email|Email|EMAIL)(:([a-zA-Z0-9.-_]{1,64})(\*))|(email|Email|EMAIL)(=([a-zA-Z0-9.-_]{1,64})@([a-zA-Z0-9.-]{5,260}))" + AllowedPattern: '(*)|(name|Name|NAME)(:([a-zA-Z0-9]{1,64})(\*))|(name|Name|NAME)(=([a-zA-Z0-9 ]{1,64}))|(email|Email|EMAIL)(:([a-zA-Z0-9.-_]{1,64})(\*))|(email|Email|EMAIL)(=([a-zA-Z0-9.-_]{1,64})@([a-zA-Z0-9.-]{5,260}))' GoogleGroupMatch: Type: String Description: | Google Workspace group filter query parameter, example: 'name:Admin* email:aws-*', see: https://developers.google.com/admin-sdk/directory/v1/guides/search-groups Default: 'name:AWS*' - AllowedPattern: "((name|Name|NAME)(:([a-zA-Z0-9]{1,64})\*)|(name|Name|NAME)(=([a-zA-Z0-9 ]{1,64})))|((email|Email|EMAIL)(:([a-zA-Z0-9.-_]{1,64})\*)|(email|Email|EMAIL)(=([a-zA-Z0-9.-_]{1,64})@([a-zA-Z0-9.-]{5,260})))" + AllowedPattern: '(name|Name|NAME)(:([a-zA-Z0-9]{1,64})\*)|(name|Name|NAME)(=([a-zA-Z0-9 ]{1,64}))|(email|Email|EMAIL)(:([a-zA-Z0-9.-_]{1,64})\*)|(email|Email|EMAIL)(=([a-zA-Z0-9.-_]{1,64})@([a-zA-Z0-9.-]{5,260}))' IgnoreGroups: Type: String Description: |