From c4a705f0dbb8610c619ca7c906f5924c2b65a416 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Mon, 6 Feb 2023 09:33:18 -0600 Subject: [PATCH 1/6] container slashRoot preserve symlinks (CO-2599) --- container/match/base/comanage_shibboleth_sp_utils.sh | 4 ++-- container/match/base/comanage_utils.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/container/match/base/comanage_shibboleth_sp_utils.sh b/container/match/base/comanage_shibboleth_sp_utils.sh index 02ac20986..27964cec4 100755 --- a/container/match/base/comanage_shibboleth_sp_utils.sh +++ b/container/match/base/comanage_shibboleth_sp_utils.sh @@ -226,11 +226,11 @@ function comanage_shibboleth_sp_utils::process_slash_root() { pushd "${slash_root}" - # Copy all files and preserve all details but exclude any files + # Copy all files and sysmlinks and preserve all details but exclude any files # for the Shibboleth SP if they exist to allow the Shib SP # entrypoint script to process that path and prevent a race # condition. - find etc/shibboleth -type f | xargs -I{} cp --preserve=all --parents {} / > ${OUTPUT} 2>&1 + find etc/shibboleth -type f,l | xargs -I{} cp --preserve=all --parents --no-dereference {} / > ${OUTPUT} 2>&1 popd diff --git a/container/match/base/comanage_utils.sh b/container/match/base/comanage_utils.sh index d66d4ad4a..341ebeafa 100644 --- a/container/match/base/comanage_utils.sh +++ b/container/match/base/comanage_utils.sh @@ -651,11 +651,11 @@ function comanage_utils::process_slash_root() { pushd "${slash_root}" - # Copy all files and preserve all details but exclude any files + # Copy all files and symlinks and preserve all details but exclude any files # for the Shibboleth SP if they exist to allow the Shib SP # entrypoint script to process that path and prevent a race # condition. - find . -type f -not -path "./etc/shibboleth/*" | xargs -I{} cp --preserve=all --parents {} / > ${OUTPUT} 2>&1 + find . -type f,l -not -path "./etc/shibboleth/*" | xargs -I{} cp --preserve=all --parents --no-dereference {} / > ${OUTPUT} 2>&1 popd From 21e009e9b6414e26b1837e8718890994ac02cff7 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Tue, 7 Feb 2023 07:42:27 -0600 Subject: [PATCH 2/6] container add buildspec for hotfix-1.1.x branch --- container/aws_buildspec_hotfix-1.1.x.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 container/aws_buildspec_hotfix-1.1.x.yml diff --git a/container/aws_buildspec_hotfix-1.1.x.yml b/container/aws_buildspec_hotfix-1.1.x.yml new file mode 100644 index 000000000..bb728c564 --- /dev/null +++ b/container/aws_buildspec_hotfix-1.1.x.yml @@ -0,0 +1,24 @@ +version: 0.2 + +env: + shell: bash + +phases: + pre_build: + commands: + - echo Logging in to Amazon ECR... + - aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/u0z2s2z8 + - echo Logging in to Docker Hub + - docker login --username skoranda --password $HUB_DOCKER_COM_TOKEN + build: + commands: + - echo Build started on `date` + - SHORT_COMMIT_HASH="${CODEBUILD_RESOLVED_SOURCE_VERSION:0:8}" + - container/build.sh --image_registry=public.ecr.aws --repository=u0z2s2z8 --label=hotfix-1.1.x-$SHORT_COMMIT_HASH --suffix=$CODEBUILD_BUILD_NUMBER match all + post_build: + commands: + - echo Build completed on `date` + - echo Pushing the Docker images to AWS public repository... + - docker push public.ecr.aws/u0z2s2z8/comanage-match:hotfix-1.1.x-$SHORT_COMMIT_HASH-basic-auth-$CODEBUILD_BUILD_NUMBER + - docker push public.ecr.aws/u0z2s2z8/comanage-match:hotfix-1.1.x-$SHORT_COMMIT_HASH-mod_auth_openidc-$CODEBUILD_BUILD_NUMBER + - docker push public.ecr.aws/u0z2s2z8/comanage-match:hotfix-1.1.x-$SHORT_COMMIT_HASH-shibboleth-sp-supervisor-$CODEBUILD_BUILD_NUMBER From 479d6a72ea9493d843efadf41b689cfffce15f62 Mon Sep 17 00:00:00 2001 From: Scott Koranda Date: Mon, 20 Mar 2023 07:23:14 -0500 Subject: [PATCH 3/6] container update PHP base to 8.1.17 --- container/match/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/match/base/Dockerfile b/container/match/base/Dockerfile index c0afe30d8..2721b0031 100644 --- a/container/match/base/Dockerfile +++ b/container/match/base/Dockerfile @@ -16,7 +16,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM php:8.1.16-apache-bullseye +FROM php:8.1.17-apache-bullseye # Official PHP image with Apache HTTPD includes # --with-openssl From 0727b5463c100243f3c1e80b4f379c932248018e Mon Sep 17 00:00:00 2001 From: Arlen Johnson Date: Wed, 29 Mar 2023 14:29:23 -0400 Subject: [PATCH 4/6] Add test for whether an "add" link should be included in the index view (CO-2585) (#58) --- app/templates/Standard/index.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/templates/Standard/index.php b/app/templates/Standard/index.php index 592154357..41f02ddad 100644 --- a/app/templates/Standard/index.php +++ b/app/templates/Standard/index.php @@ -222,12 +222,14 @@ function _column_key($modelsName, $c, $tz=null) { $addLink = $addLinkFilter($addLink, $this->request); } - $action_args['vv_actions'][] = array( - 'order' => $this->Menu->getMenuOrder('Add'), - 'icon' => $this->Menu->getMenuIcon('Add'), - 'url' => $this->Url->build($addLink), - 'label' => __('match.op.add.a', __('match.ct.'.$vv_modelname, [1])) - ); + if($addLink) { + $action_args['vv_actions'][] = array( + 'order' => $this->Menu->getMenuOrder('Add'), + 'icon' => $this->Menu->getMenuIcon('Add'), + 'url' => $this->Url->build($addLink), + 'label' => __('match.op.add.a', __('match.ct.'.$vv_modelname, [1])) + ); + } // Output the topLinks if(!empty($action_args['vv_actions'])) { From 7b2ec6b7cd153fdb0bcbcabaae1ed87b494ae346 Mon Sep 17 00:00:00 2001 From: benno Date: Thu, 30 Mar 2023 11:39:16 -0400 Subject: [PATCH 5/6] Fix generation of sequence based identifiers (CO-2623) --- app/src/Lib/Identifier/Sequence.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/Lib/Identifier/Sequence.php b/app/src/Lib/Identifier/Sequence.php index 9baf85a1f..a6cb657d1 100644 --- a/app/src/Lib/Identifier/Sequence.php +++ b/app/src/Lib/Identifier/Sequence.php @@ -45,9 +45,12 @@ class Sequence extends ReferenceIdService { public function generate(\App\Model\Entity\Matchgrid $mgConfig, DBALConnection $dbc) { // The prefix is optional and configured by the admin - $prefix = $mgConfig->matchgrid_setting->getReferenceIdPrefix($mgConfig->id); + $MatchgridSettings = TableRegistry::getTableLocator()->get('MatchgridSettings'); + + $prefix = $MatchgridSettings->getReferenceIdPrefix($mgConfig->id); + $seqName = $mgConfig->matchgrid_setting->ref_id_sequence_name; - $sql = "SELECT nextval(' . $mgConfig->matchgrid_setting->ref_id_sequence_name . ')"; + $sql = "SELECT nextval('$seqName')"; $stmt = $dbc->Prepare($sql); @@ -55,4 +58,4 @@ public function generate(\App\Model\Entity\Matchgrid $mgConfig, DBALConnection $ return $prefix . $resultSet->fetchOne(); } -} \ No newline at end of file +} From 10e8996437a1d78baaa0c6b6dd35dbb68ea86091 Mon Sep 17 00:00:00 2001 From: Shayna Atkinson Date: Mon, 24 Jul 2023 11:06:29 -0400 Subject: [PATCH 6/6] bump version to 1.1.1 --- app/config/VERSION | 2 +- container/aws_buildspec.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/VERSION b/app/config/VERSION index 9084fa2f7..524cb5524 100644 --- a/app/config/VERSION +++ b/app/config/VERSION @@ -1 +1 @@ -1.1.0 +1.1.1 diff --git a/container/aws_buildspec.yml b/container/aws_buildspec.yml index 023b133f8..c0061cd42 100644 --- a/container/aws_buildspec.yml +++ b/container/aws_buildspec.yml @@ -3,7 +3,7 @@ version: 0.2 env: shell: bash variables: - LABEL: "1.1.0" + LABEL: "1.1.1" exported-variables: - LABEL