Skip to content

Commit 69160f3

Browse files
authored
Merge pull request #4811 from opsmill/stable
Sync develop with Stable
2 parents 65ff6be + b2928f9 commit 69160f3

File tree

27 files changed

+270
-141
lines changed

27 files changed

+270
-141
lines changed

.yamllint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ignore: |
1010
**/node_modules
1111
# https://github.com/sbaudoin/yamllint/issues/16
1212
/helm/templates
13+
/python_sdk
1314
1415
rules:
1516
new-lines: disable

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang
1111

1212
<!-- towncrier release notes start -->
1313

14+
## [1.0.1](https://github.com/opsmill/infrahub/tree/v1.0.1) - 2024-10-31
15+
16+
### Fixed
17+
18+
- When a user is not logged in and the branch name is not found, hide the quick-create action and display the message: 'No branch found' ([#4801](https://github.com/opsmill/infrahub/issues/4801))
19+
- Fix automation to trigger generation of artifacts after merging a branch ([#4804](https://github.com/opsmill/infrahub/issues/4804))
20+
- Avoid sending an empty list to the load schema API on repository import if it's not required
21+
- Update demo environment to work with Infrahub 1.0
22+
1423
## [1.0.0](https://github.com/opsmill/infrahub/tree/v1.0.0) - 2024-10-30
1524

1625
### Removed

backend/infrahub/core/ipam/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
@flow(
18-
name="ipam-reconciliation",
18+
name="ipam_reconciliation",
1919
flow_run_name="branch-{branch}",
2020
description="Ensure the IPAM Tree is up to date",
2121
persist_result=False,

backend/infrahub/core/migrations/schema/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from infrahub.core.schema import MainSchemaTypes
1919

2020

21-
@flow(name="schema-migrations-apply")
21+
@flow(name="schema_apply_migrations")
2222
async def schema_apply_migrations(message: SchemaApplyMigrationData) -> list[str]:
2323
service = services.service
2424
await add_branch_tag(branch_name=message.branch.name)

backend/infrahub/core/validators/tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from .models.validate_migration import SchemaValidateMigrationData # noqa: TCH001
1414

1515

16-
@flow(name="schema-migrations-validate")
16+
@flow(name="schema_validate_migrations")
1717
async def schema_validate_migrations(message: SchemaValidateMigrationData) -> list[str]:
1818
batch = InfrahubBatch(return_exceptions=True)
1919
error_messages: list[str] = []

backend/infrahub/git/integrator.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,11 @@ async def import_schema_files(self, branch_name: str, commit: str, config_file:
472472
schema_file.load_content()
473473
schemas_data.append(schema_file)
474474

475+
if not schemas_data:
476+
# If the repository doesn't contain any schema files there is no reason to continue
477+
# and send an empty list to the API
478+
return
479+
475480
for schema_file in schemas_data:
476481
if schema_file.valid:
477482
continue

backend/infrahub/git/tasks.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
log = get_logger()
1919

2020

21-
@flow(name="git-repositories-branch-create")
21+
@flow(name="git_repositories_create_branch")
2222
async def create_branch(branch: str, branch_id: str) -> None:
2323
"""Request to the creation of git branches in available repositories."""
2424
service = services.service
@@ -42,7 +42,7 @@ async def create_branch(branch: str, branch_id: str) -> None:
4242
pass
4343

4444

45-
@flow(name="git-repository-sync")
45+
@flow(name="git_repositories_sync")
4646
async def sync_remote_repositories() -> None:
4747
service = services.service
4848

@@ -162,7 +162,7 @@ async def generate_artifact(model: RequestArtifactGenerate) -> None:
162162
await artifact.save()
163163

164164

165-
@flow(name="artifact-definition-generate")
165+
@flow(name="request_artifact_definitions_generate")
166166
async def generate_request_artifact_definition(model: RequestArtifactDefinitionGenerate) -> None:
167167
await add_branch_tag(branch_name=model.branch)
168168

backend/infrahub/tasks/telemetry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ async def post_telemetry_data(service: InfrahubServices, url: str, payload: dict
101101
response.raise_for_status()
102102

103103

104-
@flow(name="anonymous-telemetry-push")
104+
@flow(name="anonymous_telemetry_send")
105105
async def send_telemetry_push() -> None:
106106
service = services.service
107107
log = get_run_logger()

backend/infrahub/transformations/tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
log = get_logger()
1313

1414

15-
@flow(name="transform-render-python")
15+
@flow(name="transform_render_python")
1616
async def transform_python(message: TransformPythonData) -> Any:
1717
service = services.service
1818
await add_branch_tag(branch_name=message.branch)
@@ -35,7 +35,7 @@ async def transform_python(message: TransformPythonData) -> Any:
3535
return transformed_data
3636

3737

38-
@flow(name="transform-render-jinja2")
38+
@flow(name="transform_render_jinja2_template")
3939
async def transform_render_jinja2_template(message: TransformJinjaTemplateData) -> str:
4040
service = services.service
4141
await add_branch_tag(branch_name=message.branch)

backend/infrahub/workflows/catalogue.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
)
8787

8888
REQUEST_ARTIFACT_DEFINITION_GENERATE = WorkflowDefinition(
89-
name="artifact-definition-generate",
89+
name="request_artifact_definitions_generate",
9090
type=WorkflowType.INTERNAL,
9191
module="infrahub.git.tasks",
9292
function="generate_request_artifact_definition",

0 commit comments

Comments
 (0)