Merge branch 'develop' of github.com:NHSDigital/NRLF into feature/eema1-NRL-1285-emptySegmentinOptionalFieldReturns400

Author: eesa456

.github/workflows/daily-build.yml

@@ -18,35 +18,19 @@ on:
 
 jobs:
   build:
-    name: Build - develop
-    runs-on: [self-hosted, ci]
+    name: Build - ${{ github.ref }}
+    runs-on: codebuild-nhsd-nrlf-ci-build-project-${{ github.run_id }}-${{ github.run_attempt }}
 
     steps:
-      - name: Git clone - develop
+      - name: Git clone - ${{ github.ref }}
         uses: actions/checkout@v4
         with:
-          ref: develop
+          ref: ${{ github.ref }}
 
-      - name: Setup asdf cache
-        uses: actions/cache@v4
-        with:
-          path: ~/.asdf
-          key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}
-          restore-keys: |
-            ${{ runner.os }}-asdf-
-
-      - name: Install asdf
-        uses: asdf-vm/actions/[email protected]
-        with:
-          asdf_branch: v0.13.1
-
-      - name: Install zip
-        run: sudo apt-get install zip
-
-      - name: Setup Python environment
+      - name: Setup environment
         run: |
+          echo "${HOME}/.asdf/bin" >> $GITHUB_PATH
           poetry install --no-root
-          source $(poetry env info --path)/bin/activate
 
       - name: Run Linting
         run: make lint
@@ -55,7 +39,13 @@ jobs:
         run: make test
 
       - name: Build Project
-        run: make build
+        run: |
+          echo "PATH: ${PATH}"
+          echo "HOME: ${HOME}"
+          echo "python: $(which python)"
+          echo "asdf: $(which asdf)"
+          echo "/usr/local/bin: $(ls -la /usr/local/bin)"
+          make build
 
       - name: Configure Management Credentials
         uses: aws-actions/configure-aws-credentials@v4

Dockerfile.ci-build

@@ -0,0 +1,50 @@
+FROM ubuntu:22.04
+
+RUN apt update && \
+    apt upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt install -y \
+        build-essential \
+        ca-certificates \
+        curl \
+        git \
+        gnupg \
+        libbz2-dev \
+        libffi-dev \
+        libicu70 \
+        liblzma-dev \
+        libncursesw5-dev \
+        libreadline-dev \
+        libsqlite3-dev \
+        libssl-dev \
+        libxml2-dev \
+        libxmlsec1-dev \
+        llvm \
+        lsb-release \
+        make \
+        python3 \
+        tar \
+        tk-dev \
+        unzip \
+        wget \
+        xz-utils \
+        zip \
+        zlib1g-dev && \
+    apt clean && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /root
+RUN git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.13.1 && \
+    echo ". $HOME/.asdf/asdf.sh" >> ~/.bashrc && \
+    echo ". $HOME/.asdf/completions/asdf.bash" >> ~/.bashrc && \
+    echo "export ASDF_DIR=$HOME/.asdf" >> ~/.bashrc && \
+    echo "export PATH=\$ASDF_DIR/bin:\$PATH" >> ~/.bashrc && \
+    echo "export PATH=\$ASDF_DIR/shims:\$PATH" >> ~/.bashrc
+
+COPY .tool-versions .
+RUN for plugin in $(cat .tool-versions | cut -d' ' -f1); do \
+        ./.asdf/bin/asdf plugin add "${plugin}"; \
+    done && \
+    ./.asdf/bin/asdf install && \
+    ln -s $(pwd)/.asdf/shims/* /usr/local/bin/.
+
+CMD [ "/bin/bash" ]

Makefile

@@ -74,6 +74,28 @@ build-api-packages: ./api/consumer/* ./api/producer/*
 		./scripts/build-lambda-package.sh $${api} $(DIST_PATH); \
 	done
 
+build-ci-image: ## Build the CI image
+	@echo "Building the CI image"
+	docker build \
+		-t nhsd-nrlf-ci-build:latest \
+		-f Dockerfile.ci-build
+
+ecr-login: ## Login to NRLF ECR repo
+	@echo "Logging into ECR"
+	$(eval AWS_REGION := $(shell aws configure get region))
+	$(eval AWS_ACCOUNT_ID := $(shell aws sts get-caller-identity | jq -r .Account))
+	@aws ecr get-login-password --region "$(AWS_REGION)" \
+		| docker login --username AWS --password-stdin \
+			$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com
+
+publish-ci-image: ## Publish the CI image
+	@echo "Publishing the CI image"
+	$(eval AWS_REGION := $(shell aws configure get region))
+	$(eval AWS_ACCOUNT_ID := $(shell aws sts get-caller-identity | jq -r .Account))
+	@docker tag nhsd-nrlf-ci-build:latest \
+		$(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/nhsd-nrlf-ci-build:latest
+	@docker push $(AWS_ACCOUNT_ID).dkr.ecr.$(AWS_REGION).amazonaws.com/nhsd-nrlf-ci-build:latest
+
 test: check-warn ## Run the unit tests
 	@echo "Running unit tests"
 	pytest --ignore=tests/smoke $(TEST_ARGS)

api/producer/createDocumentReference/create_document_reference.py

@@ -73,7 +73,7 @@ def _check_permissions(
             ods_code_parts=metadata.ods_code_parts,
             custodian_parts=custodian_parts,
         )
-        return SpineErrorResponse.BAD_REQUEST(
+        return SpineErrorResponse.UNPROCESSABLE_ENTITY(
             diagnostics="The custodian of the provided DocumentReference does not match the expected ODS code for this organisation",
             expression="custodian.identifier.value",
         )
@@ -201,10 +201,11 @@ def _raise_operation_outcome_error(diagnostics, idx):
     """
     raise OperationOutcomeError(
         severity="error",
-        code="invalid",
-        details=SpineErrorConcept.from_code("BAD_REQUEST"),
+        code="business-rule",
+        details=SpineErrorConcept.from_code("UNPROCESSABLE_ENTITY"),
         diagnostics=diagnostics,
         expression=[f"relatesTo[{idx}].target.identifier.value"],
+        status_code="422",
     )
 
 
@@ -236,7 +237,7 @@ def handler(
 
     if not result.is_valid:
         logger.log(LogReference.PROCREATE002)
-        return Response.from_issues(issues=result.issues, statusCode="400")
+        return Response.from_issues(issues=result.issues, statusCode="422")
 
     core_model = _create_core_model(result.resource, metadata)
     if error_response := _check_permissions(core_model, metadata):