Merge pull request #5833 from opsmill/pog-align-testcontainer-version

ogenstad · web-flow · commit 1a0b164b5cad · 2025-02-24T14:32:06.000+01:00
Align testcontainers version to main project
diff --git a/backend/tests/unit/graphql/test_core_account.py b/backend/tests/unit/graphql/test_core_account.py
@@ -39,6 +39,7 @@ async def test_everyone_can_update_password(db: InfrahubDatabase, default_branch
     )
 
     assert result.errors is None
+    assert result.data
     assert result.data["InfrahubAccountSelfUpdate"]["ok"] is True
 
     updated_account = await NodeManager.get_one(db=db, id=first_account.id, branch=default_branch)
@@ -80,6 +81,7 @@ async def test_permissions(
     )
 
     assert result.errors is None
+    assert result.data
     perms = [edge["node"]["identifier"] for edge in result.data["InfrahubPermissions"]["global_permissions"]["edges"]]
     assert perms == [
         str(GlobalPermission(action=GlobalPermissions.SUPER_ADMIN.value, decision=PermissionDecision.ALLOW_ALL.value))
@@ -106,4 +108,5 @@ async def test_permissions(
     )
 
     assert result.errors is None
+    assert result.data
     assert not result.data["InfrahubPermissions"]["global_permissions"]["edges"]
diff --git a/docs/docs/infrahubctl/infrahubctl-dump.mdx b/docs/docs/infrahubctl/infrahubctl-dump.mdx
@@ -14,7 +14,7 @@ $ infrahubctl dump [OPTIONS]
 * `--directory PATH`: Directory path to store export  [default: (dynamic)]
 * `--quiet / --no-quiet`: No console output  [default: no-quiet]
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
-* `--branch TEXT`: Branch from which to export  [default: main]
+* `--branch TEXT`: Branch from which to export
 * `--concurrent INTEGER`: Maximum number of requests to execute at the same time.  [env var: INFRAHUB_MAX_CONCURRENT_EXECUTION; default: 4]
 * `--timeout INTEGER`: Timeout in sec  [env var: INFRAHUB_TIMEOUT; default: 60]
 * `--exclude TEXT`: Prevent node kind(s) from being exported, CoreAccount is excluded by default  [default: CoreAccount]
diff --git a/docs/docs/infrahubctl/infrahubctl-load.mdx b/docs/docs/infrahubctl/infrahubctl-load.mdx
@@ -14,7 +14,7 @@ $ infrahubctl load [OPTIONS]
 * `--continue-on-error / --no-continue-on-error`: Allow exceptions during loading and display them when complete  [default: no-continue-on-error]
 * `--quiet / --no-quiet`: No console output  [default: no-quiet]
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
-* `--branch TEXT`: Branch from which to export  [default: main]
+* `--branch TEXT`: Branch from which to export
 * `--concurrent INTEGER`: Maximum number of requests to execute at the same time.  [env var: INFRAHUB_MAX_CONCURRENT_EXECUTION]
 * `--timeout INTEGER`: Timeout in sec  [env var: INFRAHUB_TIMEOUT; default: 60]
 * `--install-completion`: Install completion for the current shell.
diff --git a/docs/docs/infrahubctl/infrahubctl-menu.mdx b/docs/docs/infrahubctl/infrahubctl-menu.mdx
@@ -35,6 +35,6 @@ $ infrahubctl menu load [OPTIONS] MENUS...
 **Options**:
 
 * `--debug / --no-debug`: [default: no-debug]
-* `--branch TEXT`: Branch on which to load the menu.  [default: main]
+* `--branch TEXT`: Branch on which to load the menu.
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
 * `--help`: Show this message and exit.
diff --git a/docs/docs/infrahubctl/infrahubctl-object.mdx b/docs/docs/infrahubctl/infrahubctl-object.mdx
@@ -35,6 +35,6 @@ $ infrahubctl object load [OPTIONS] PATHS...
 **Options**:
 
 * `--debug / --no-debug`: [default: no-debug]
-* `--branch TEXT`: Branch on which to load the objects.  [default: main]
+* `--branch TEXT`: Branch on which to load the objects.
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
 * `--help`: Show this message and exit.
diff --git a/docs/docs/infrahubctl/infrahubctl-repository.mdx b/docs/docs/infrahubctl/infrahubctl-repository.mdx
@@ -41,10 +41,9 @@ $ infrahubctl repository add [OPTIONS] NAME LOCATION
 * `--description TEXT`
 * `--username TEXT`
 * `--password TEXT`
-* `--commit TEXT`
+* `--ref TEXT`
 * `--read-only / --no-read-only`: [default: no-read-only]
 * `--debug / --no-debug`: [default: no-debug]
-* `--branch TEXT`: Branch on which to add the repository.  [default: main]
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
 * `--help`: Show this message and exit.
 
@@ -58,7 +57,7 @@ $ infrahubctl repository list [OPTIONS]
 
 **Options**:
 
-* `--branch TEXT`
+* `--branch TEXT`: Branch on which to list repositories.
 * `--debug / --no-debug`: [default: no-debug]
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
 * `--help`: Show this message and exit.
diff --git a/docs/docs/infrahubctl/infrahubctl-run.mdx b/docs/docs/infrahubctl/infrahubctl-run.mdx
@@ -18,7 +18,7 @@ $ infrahubctl run [OPTIONS] SCRIPT [VARIABLES]...
 * `--method TEXT`: [default: run]
 * `--debug / --no-debug`: [default: no-debug]
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
-* `--branch TEXT`: Branch on which to run the script.  [default: main]
+* `--branch TEXT`: Branch on which to run the script.
 * `--concurrent INTEGER`: Maximum number of requests to execute at the same time.  [env var: INFRAHUB_MAX_CONCURRENT_EXECUTION]
 * `--timeout INTEGER`: Timeout in sec  [env var: INFRAHUB_TIMEOUT; default: 60]
 * `--install-completion`: Install completion for the current shell.
diff --git a/docs/docs/infrahubctl/infrahubctl-schema.mdx b/docs/docs/infrahubctl/infrahubctl-schema.mdx
@@ -36,7 +36,7 @@ $ infrahubctl schema check [OPTIONS] SCHEMAS...
 **Options**:
 
 * `--debug / --no-debug`: [default: no-debug]
-* `--branch TEXT`: Branch on which to check the schema.  [default: main]
+* `--branch TEXT`: Branch on which to check the schema.
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
 * `--help`: Show this message and exit.
 
@@ -57,7 +57,7 @@ $ infrahubctl schema load [OPTIONS] SCHEMAS...
 **Options**:
 
 * `--debug / --no-debug`: [default: no-debug]
-* `--branch TEXT`: Branch on which to load the schema.  [default: main]
+* `--branch TEXT`: Branch on which to load the schema.
 * `--wait INTEGER`: Time in seconds to wait until the schema has converged across all workers  [default: 0]
 * `--config-file TEXT`: [env var: INFRAHUBCTL_CONFIG; default: infrahubctl.toml]
 * `--help`: Show this message and exit.
diff --git a/python_testcontainers/pyproject.toml b/python_testcontainers/pyproject.toml
@@ -1,11 +1,11 @@
 [project]
 name = "infrahub-testcontainers"
-version = "1.2.0a0"
+version = "1.2.0rc0"
 requires-python = ">=3.9"
 
 [tool.poetry]
 name = "infrahub-testcontainers"
-version = "1.2.0a0"
+version = "1.2.0rc0"
 description = "Testcontainers instance for Infrahub to easily build integration tests"
 authors = ["OpsMill <info@opsmill.com>"]
 readme = "README.md"

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ async def test_everyone_can_update_password(db: InfrahubDatabase, default_branch`
`39`	`39`	`)`
`40`	`40`
`41`	`41`	`assert result.errors is None`
	`42`	`+ assert result.data`
`42`	`43`	`assert result.data["InfrahubAccountSelfUpdate"]["ok"] is True`
`43`	`44`
`44`	`45`	`updated_account = await NodeManager.get_one(db=db, id=first_account.id, branch=default_branch)`
`@@ -80,6 +81,7 @@ async def test_permissions(`
`80`	`81`	`)`
`81`	`82`
`82`	`83`	`assert result.errors is None`
	`84`	`+ assert result.data`
`83`	`85`	`perms = [edge["node"]["identifier"] for edge in result.data["InfrahubPermissions"]["global_permissions"]["edges"]]`
`84`	`86`	`assert perms == [`
`85`	`87`	`str(GlobalPermission(action=GlobalPermissions.SUPER_ADMIN.value, decision=PermissionDecision.ALLOW_ALL.value))`
`@@ -106,4 +108,5 @@ async def test_permissions(`
`106`	`108`	`)`
`107`	`109`
`108`	`110`	`assert result.errors is None`
	`111`	`+ assert result.data`
`109`	`112`	`assert not result.data["InfrahubPermissions"]["global_permissions"]["edges"]`