Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixup some database problems #65

Merged
merged 6 commits into from
Aug 14, 2024

Conversation

fitzthum
Copy link
Member

This should fix #64

Upgrading sqlx was not as simple as I would have liked.

@ryansavino I am bumping the version of Rust which you pinned in our builder container a while ago. Do you think that's going to break things?

@ryansavino
Copy link
Member

The issue was the later bullseye images didn't support openssl v3 for some reason:
#61

1.80 may be okay though.

Also, docker hub images. Unfortunately, rust doesn't have a container image anywhere else besides docker hub.

@arvindskumar99 you have any additional insights here from your notes? I remember you having some issues recently with the simple-kbs.

Our old version of sqlx has some compatibility issues
with mariadb, so we've got to upgrade.

Upgrading requires some messing around due to upstream bugs.

Signed-off-by: Tobin Feldman-Fitzthum <[email protected]>
The new version of sqlx requires a new version of rust.

Signed-off-by: Tobin Feldman-Fitzthum <[email protected]>
the versions field is no longer needed

Signed-off-by: Tobin Feldman-Fitzthum <[email protected]>
The variable set in this test script does not match
the one we use in the CI. Let's adjust.

Signed-off-by: Tobin Feldman-Fitzthum <[email protected]>
@fitzthum
Copy link
Member Author

Still ironing out some issues with upgrading sqlx. There were a lot of changes between v0.5.0 and v0.8.0

@fitzthum fitzthum force-pushed the sqlx-080 branch 2 times, most recently from 6e516b1 to 32025cf Compare August 13, 2024 14:55
Updating sqlx broke our policy insertion.

Unfortunately we have to adopt some backend-specific
logic.

Signed-off-by: Tobin Feldman-Fitzthum <[email protected]>
With the udpate to sqlx, we are no longer able
to transparently convert SQL BLOBS (such as longtext)
to Rust strings when using the mysql driver.

Add some branches to convert these into bytes first
and then to strings.

Signed-off-by: Tobin Feldman-Fitzthum <[email protected]>
@fitzthum
Copy link
Member Author

Ok, issues appear to be ironed out.

@fitzthum fitzthum merged commit d4ae172 into confidential-containers:main Aug 14, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

simple-kbs-server startup error: error communicating with database: invalid certificate: BadDER
2 participants