Skip to content

Commit 545b3c6

Browse files
committed
chore: resolve changes from conflict resolution
1 parent 1fe17ee commit 545b3c6

3 files changed

Lines changed: 3 additions & 51 deletions

File tree

.github/workflows/test_publish.yml

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -63,53 +63,6 @@ jobs:
6363
${{ steps.docker_image.outputs.image_repository }}:${{ steps.docker_image.outputs.image_tag }}
6464
${{ steps.docker_image.outputs.image_repository }}:${{ env.DEVCONTAINER_IMAGE_TAG_MAIN }}
6565
66-
style-checks:
67-
runs-on: ubuntu-latest
68-
needs:
69-
- build-devcontainer
70-
steps:
71-
- uses: actions/checkout@v4
72-
with:
73-
fetch-depth: 0
74-
- name: Docker image metadata
75-
id: meta
76-
uses: docker/metadata-action@v5
77-
with:
78-
images: ${{ env.DEVCONTAINER_REGISTRY }}/${{ env.DEVCONTAINER_IMAGE_NAME }}
79-
tags: |
80-
type=ref,event=pr,prefix=cache-pr-,priority=600
81-
type=ref,event=branch,prefix=cache-,priority=500
82-
type=ref,event=tag,prefix=cache-,priority=500
83-
flavor: |
84-
latest=false
85-
- name: Extract Docker image name
86-
id: docker_image
87-
env:
88-
IMAGE_TAGS: ${{ steps.meta.outputs.tags }}
89-
run: |
90-
IMAGE=$(echo "$IMAGE_TAGS" | cut -d" " -f1)
91-
IMAGE_REPOSITORY=$(echo "$IMAGE" | cut -d":" -f1)
92-
IMAGE_TAG=$(echo "$IMAGE" | cut -d":" -f2)
93-
echo "image=$IMAGE" >> "$GITHUB_OUTPUT"
94-
echo "image_repository=$IMAGE_REPOSITORY" >> "$GITHUB_OUTPUT"
95-
echo "image_tag=$IMAGE_TAG" >> "$GITHUB_OUTPUT"
96-
- uses: docker/login-action@v3
97-
with:
98-
registry: ghcr.io
99-
username: ${{ github.actor }}
100-
password: ${{ secrets.GITHUB_TOKEN }}
101-
- name: Pre-build devcontainer
102-
uses: devcontainers/ci@v0.3
103-
continue-on-error: true
104-
with:
105-
push: always
106-
skipContainerUserIdUpdate: false
107-
imageName: ${{ steps.docker_image.outputs.image_repository }}
108-
imageTag: ${{ steps.docker_image.outputs.image_tag }}
109-
cacheFrom: |
110-
${{ steps.docker_image.outputs.image_repository }}:${{ steps.docker_image.outputs.image_tag }}
111-
${{ steps.docker_image.outputs.image_repository }}:${{ env.DEVCONTAINER_IMAGE_TAG_MAIN }}
112-
11366
style-checks:
11467
runs-on: ubuntu-latest
11568
needs:
@@ -142,6 +95,7 @@ jobs:
14295
push: never
14396
skipContainerUserIdUpdate: false
14497
cacheFrom: ${{ needs.build-devcontainer.outputs.image_repository }}:${{ needs.build-devcontainer.outputs.image_tag }}
98+
14599
test-main:
146100
runs-on: ubuntu-latest
147101
needs:

components/renku_data_services/session/db.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,7 @@ async def insert_launcher(
229229
raise errors.UnauthorizedError(message="You do not have the required permissions for this operation.")
230230

231231
project_id = new_launcher.project_id
232-
authorized = await self.project_authz.has_permission(
233-
user, ResourceType.project, ULID.from_str(project_id), Scope.WRITE
234-
)
232+
authorized = await self.project_authz.has_permission(user, ResourceType.project, project_id, Scope.WRITE)
235233
if not authorized:
236234
raise errors.MissingResourceError(
237235
message=f"Project with id '{project_id}' does not exist or you do not have access to it."

components/renku_data_services/session/orm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def dump(self) -> models.SessionLauncher:
139139
"""Create a session launcher model from the SessionLauncherORM."""
140140
return models.SessionLauncher(
141141
id=self.id,
142-
project_id=str(self.project_id),
142+
project_id=self.project_id,
143143
name=self.name,
144144
created_by=self.created_by_id,
145145
creation_date=self.creation_date,

0 commit comments

Comments
 (0)