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

[4.3.x] fix: push plan subscription failure command not created for JDBC #9144

Merged
merged 3 commits into from
Sep 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2024

This is an automatic copy of pull request #9042 done by Mergify.


Issue

https://gravitee.atlassian.net/browse/APIM-6600

Description

  • Bump webhook entrypoint to latest ( https://github.com/gravitee-io/gravitee-entrypoint-webhook/pull/61 ) This one contains a fix about the DLQ for webhook entrypoints.

  • Remove not null constraint on command organization ID. When a subscription failure command is created an error occurs on JDBC databases. The gateway is not aware of the environment ID or the orgnization ID linked to the subscription so we should not force the not null constraint on the command.

  • Display consumer status in subscription page

Capture d’écran 2024-09-18 à 12 14 07

Linked PRs:

Additional context


📚  View the storybook of this branch here


Cherry-pick of cb15489 has failed:

On branch mergify/bp/4.3.x/pr-9042
Your branch is up to date with 'origin/4.3.x'.

You are currently cherry-picking commit cb15489555.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   gravitee-apim-repository/gravitee-apim-repository-jdbc/src/main/resources/liquibase/changelogs/v4_1_25/schema.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-repository/gravitee-apim-repository-jdbc/src/main/resources/liquibase/master.yml

Cherry-pick of efd3d83 has failed:

On branch mergify/bp/4.3.x/pr-9042
Your branch is ahead of 'origin/4.3.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit efd3d8388f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pom.xml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d5f2a81 has failed:

On branch mergify/bp/4.3.x/pr-9042
Your branch is ahead of 'origin/4.3.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d5f2a81f7d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-console-webui/src/management/api/subscriptions/edit/api-subscription-edit.component.spec.ts
	modified:   gravitee-apim-console-webui/src/management/api/subscriptions/edit/api-subscription-edit.harness.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gravitee-apim-console-webui/src/management/api/general/subscriptions/edit/api-general-subscription-edit.component.html
	both modified:   gravitee-apim-console-webui/src/management/api/subscriptions/edit/api-subscription-edit.component.ts

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


📚  View the storybook of this branch here

@mergify mergify bot requested a review from a team as a code owner September 20, 2024 12:39
@mergify mergify bot added the conflicts label Sep 20, 2024
Copy link
Contributor Author

mergify bot commented Sep 20, 2024

Cherry-pick of cb15489 has failed:

On branch mergify/bp/4.3.x/pr-9042
Your branch is up to date with 'origin/4.3.x'.

You are currently cherry-picking commit cb15489555.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   gravitee-apim-repository/gravitee-apim-repository-jdbc/src/main/resources/liquibase/changelogs/v4_1_25/schema.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-repository/gravitee-apim-repository-jdbc/src/main/resources/liquibase/master.yml

Cherry-pick of efd3d83 has failed:

On branch mergify/bp/4.3.x/pr-9042
Your branch is ahead of 'origin/4.3.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit efd3d8388f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pom.xml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d5f2a81 has failed:

On branch mergify/bp/4.3.x/pr-9042
Your branch is ahead of 'origin/4.3.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d5f2a81f7d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-console-webui/src/management/api/subscriptions/edit/api-subscription-edit.component.spec.ts
	modified:   gravitee-apim-console-webui/src/management/api/subscriptions/edit/api-subscription-edit.harness.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gravitee-apim-console-webui/src/management/api/general/subscriptions/edit/api-general-subscription-edit.component.html
	both modified:   gravitee-apim-console-webui/src/management/api/subscriptions/edit/api-subscription-edit.component.ts

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Okhelifi Okhelifi merged commit e1a4a80 into 4.3.x Sep 20, 2024
37 of 39 checks passed
@Okhelifi Okhelifi deleted the mergify/bp/4.3.x/pr-9042 branch September 20, 2024 17:18
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.

2 participants