Merge pull request #56 from canonical/IAM-995

Default passsha256 and passbcrypt to ""
canonical · Aug 9, 2024 · 8f0725b · 8f0725b
2 parents b9ad784 + be2c5bd
commit 8f0725b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -96,4 +96,9 @@ bases:
 parts:
   charm:
     charm-binary-python-packages:
+      - jsonschema
       - cryptography
+      - psycopg[binary]
+    build-packages:
+      - rustc
+      - cargo
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,6 @@ Jinja2
 lightkube
 lightkube-models
 ops >= 2.2.0
-psycopg[binary]
 pydantic ~= 2.5.3
 SQLAlchemy
 tenacity ~= 8.2.3
diff --git a/src/database.py b/src/database.py
@@ -29,8 +29,8 @@ class User(Base):
     name: Mapped[str] = mapped_column(String, name="name", unique=True)
     uid_number: Mapped[int] = mapped_column(name="uidnumber")
     gid_number: Mapped[int] = mapped_column(name="primarygroup")
-    password_sha256: Mapped[Optional[str]] = mapped_column(name="passsha256")
-    password_bcrypt: Mapped[Optional[str]] = mapped_column(name="passbcrypt")
+    password_sha256: Mapped[Optional[str]] = mapped_column(name="passsha256", default="")
+    password_bcrypt: Mapped[Optional[str]] = mapped_column(name="passbcrypt", default="")
 
 
 class Group(Base):