From aea8dbb6887533a3607d1a7882613f4e8a81d3e6 Mon Sep 17 00:00:00 2001 From: Chris Pates Date: Fri, 6 Dec 2024 16:47:54 +0000 Subject: [PATCH] 224 scimendpointurl with anoother pattern (#225) * Updating scim api endpoint regex * Update paths for go releaser go releaser is now using different paths for arm64 build. dist/ssosync_linux_arm64/ssosync has become dist/ssosync_linux_arm64_v8.0/ssosync --- .gitignore | 1 + cicd/build/package/buildspec.yml | 4 ++-- cicd/cloudformation/secrets.yaml | 4 ++-- template.yaml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7393d88..c7df50a 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ staging.yaml *.rej cicd/.DS_Store *.swo +cicd/.DS_Store diff --git a/cicd/build/package/buildspec.yml b/cicd/build/package/buildspec.yml index f4e5a23..3f2595e 100644 --- a/cicd/build/package/buildspec.yml +++ b/cicd/build/package/buildspec.yml @@ -16,12 +16,12 @@ phases: # Check that the files need to package exist - ls README.md - ls SAR.md - - ls dist/ssosync_linux_arm64/ssosync + - ls dist/ssosync_linux_arm64_v8.0/ssosync - ls dist/ssosync_linux_amd64_v1/ssosync # Check that the executable works - ./dist/ssosync_linux_amd64_v1/ssosync --version - - mv dist/ssosync_linux_arm64/ssosync bootstrap + - mv dist/ssosync_linux_arm64_v8.0/ssosync bootstrap build: commands: diff --git a/cicd/cloudformation/secrets.yaml b/cicd/cloudformation/secrets.yaml index a085713..d5d35cb 100644 --- a/cicd/cloudformation/secrets.yaml +++ b/cicd/cloudformation/secrets.yaml @@ -56,13 +56,13 @@ Parameters: SCIMEndpointUrl: Description: AWS IAM Identity Center SCIM Endpoint Url Type: String - AllowedPattern: "https://scim.(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-([0-9]{1}).amazonaws.com/(.*)-([a-z0-9]{4})-([a-z0-9]{4})-([a-z0-9]{12})/scim/v2/" + AllowedPattern: "https://scim.(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-([0-9]{1}).amazonaws.com/([A-Za-z0-9]{11})-([A-Za-z0-9]{4})-([A-Za-z0-9]{4})-([A-Za-z0-9]{4})-([A-Za-z0-9]{12})/scim/v2/?" NoEcho: true SCIMEndpointAccessToken: Description: AWS IAM Identity Center SCIM AccessToken Type: String - AllowedPattern: '([0-9a-zA-Z/=+-\\]{500,600})' + AllowedPattern: '([0-9a-zA-Z/=+-\\]{500,620})' NoEcho: true IdentityStoreId: diff --git a/template.yaml b/template.yaml index 3520674..3cea06e 100644 --- a/template.yaml +++ b/template.yaml @@ -148,7 +148,7 @@ Parameters: Description: | AWS IAM Identity Center - SCIM Endpoint Url Default: "" - AllowedPattern: '(?!.*\s)|(https://scim.(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-([0-9]{1}).amazonaws.com/(.*)-([a-z0-9]{4})-([a-z0-9]{4})-([a-z0-9]{12})/scim/v2/?)' + AllowedPattern: '(?!.*\s)|(https://scim.(us(-gov)?|ap|ca|cn|eu|sa)-(central|(north|south)?(east|west)?)-([0-9]{1}).amazonaws.com/([A-Za-z0-9]{11})-([A-Za-z0-9]{4})-([A-Za-z0-9]{4})-([A-Za-z0-9]{4})-([A-Za-z0-9]{12})/scim/v2/?)' SCIMEndpointAccessToken: Type: String