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

DRAFT - WIP swatch-metrics-hbi database component #3990

Closed

Conversation

lindseyburnett
Copy link
Contributor

No description provided.

awood and others added 15 commits November 19, 2024 12:23
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Bumps software.amazon.awssdk:bom from 2.29.18 to 2.29.20.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
* Methods with underscores in the names
* Parameters and variables that were in all upper snake case
* Variables that only had a single lower-case letter before a capital.
  This is not a violation of the style, per se, but the Checkstyle
  Google style configuration flags it.
* Missing braces
* Description-less JavaDoc tags
* Missing braces
* Malformed JavaDoc
* catch and else statements that aren't right after the closing brace
  of the previous statement.
Google-java-format does not catch issues like

* Separating else or catch from the previous closing brace.  E.g.
    ```
    if (a == 1) {
      // do something
    }
    else {
      // something else
    }
    ```
    should have the else on the same line as the first closing brace.
* `if` statements with no braces at all
* Malformed JavaDoc
* Method names with underscores
* Parameter names in all caps
* Wildcard imports
Jira issue: None. This was a quick add-on based on some PR review
discussion

## Description
The google-java-format tool, as good as it is, simply doesn't catch some
style issues in our code. The issue that initiated this PR is wildcard
imports which are forbidden by the [official
style](https://google.github.io/styleguide/javaguide.html). However,
google-java-format can't handle those issues because fixing a wildcard
import requires looking across the project classpath and
google-java-format doesn't compile code.

However, Checkstyle is not a formatter. It just finds violations and
fails the build. It doesn't try to fix anything. Checkstyle also
[supports](https://checkstyle.org/google_style.html) the Google Style.
Surprisingly, Checkstyle is actually stricter in many cases. In addition
to the wildcard imports, our code had

* Methods with underscores in the name
* Lots of malformed JavaDoc
  * Unescaped angle brackets
  * Tags with no descriptions
  * Placement below annotations on the method rather than above
* `if` statements missing braces
* `else` and `catch` statements that didn't immediately follow the
closing brace
  of the preceding `if` or `try`.

This commit adds Checkstyle and then fixes any issues it flagged in our
code. I reordered the commits such that Checkstyle is added in a commit
**after** the fixes so that the build will pass (important for `git
bisect` operations) on each commit in this PR.

I did elect to suppress several issues that Checkstyle flagged. My goal
with the suppressions is to leave the Google style XML configuration
unaltered so that we don't have to merge any custom changes whenever
Checkstyle makes alterations to the DTD or to the Google style
implementation (and from past experience, I can attest that DTD changes
do happen). Instead, all the suppressions are addressed in the
suppressions XML file and commented. I chose
to suppress

* The line length requirement.  The formatter allows longer lines than
Checkstyle! I'm not in the business of giving developers headaches when
the
  formatter itself doesn't create conforming code.
* The indentation check. The formatter and Checkstyle have differing
opinions
  on the indentation for `"""`.  My reasoning is the same as above.
* Some requirements on locality for overloaded methods and variable
declaration.
  This is maybe something we can work towards.
* The requirement for JavaDoc on all public methods. This requirement is
admirable, and something we can work towards, but I wanted this done
some time
  before next year.
* A narrow exception on the parameter name regex.  The regex is
`^[a-z]([a-z0-9][a-zA-Z0-9]*)?$` which doesn't allow for a capital
letter to
  immediately follow a lower case letter.  However, we use names like
  `xRhIdentityHeader` in a few places, so parameters beginning `xRh` are
  allowed.
* The requirement for a newline between the license header and the
package
definition. All our files violate this rule and I'm pretty sure the
default
  class template we all use violates this too.

Additionally, I modified it so that `spotlessCheck` runs Checkstyle
after it completes. My goal in doing this is so that developers don't
have to remember to do another thing or modify their pre-commit hooks.
Likewise, our CI scripts
do not need to change. This decision may be controversial. Others may
wish Checkstyle to be a discrete step. Regardless, I think it is
important that Checkstyle run automatically in CI at least so that style
errors don't sneak
back in.

Finally, there is a Checkstyle plugin for IntelliJ that will catch style
errors as the occur. I installed it and it works great. I'll be happy to
help others configure it.

## Testing

### Setup
1. Create a style error. Add something like `if (1==1)
System.out.print("hi");`
   to a method somewhere.

### Steps
1. `./gradlew checkstyle`
1. The build will fail and you'll get a link to generated report.
1. `./gradlew spotlessCheck` will run the google-java-format tool and
then
   run Checkstyle afterward.

### Verification
1. The build fails
This PR contains the following updates:

| Package | Change |
|---|---|
| quay.io/konflux-ci/tekton-catalog/task-buildah | `d588db7` ->
`7779f9e` |
| quay.io/redhat-appstudio-tekton-catalog/task-buildah | `82da08d` ->
`570831e` |

---

### Configuration

📅 **Schedule**: Branch creation - "after 5am on saturday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR is behind base branch, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

To execute skipped test pipelines write comment `/ok-to-test`

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41NS4yLXJwbSIsInVwZGF0ZWRJblZlciI6IjM4LjU1LjItcnBtIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com>
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [mypy](https://www.mypy-lang.org/)
([source](https://togithub.com/python/mypy),
[changelog](https://mypy-lang.blogspot.com/)) | dev | major | `^0.991`
-> `^1.0.0` |

---

### Release Notes

<details>
<summary>python/mypy (mypy)</summary>

###
[`v1.13.0`](https://togithub.com/python/mypy/compare/v1.12.1...v1.13.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.12.1...v1.13.0)

###
[`v1.12.1`](https://togithub.com/python/mypy/blob/HEAD/CHANGELOG.md#Mypy-1121)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.12.0...v1.12.1)

- Fix crash when showing partially analyzed type in error message (Ivan
Levkivskyi, PR [17961](https://togithub.com/python/mypy/pull/17961))
- Fix iteration over union (when self type is involved) (Shantanu, PR
[17976](https://togithub.com/python/mypy/pull/17976))
- Fix type object with type var default in union context (Jukka
Lehtosalo, PR [17991](https://togithub.com/python/mypy/pull/17991))
- Revert change to `os.path` stubs affecting use of `os.PathLike[Any]`
(Shantanu, PR [17995](https://togithub.com/python/mypy/pull/17995))

###
[`v1.12.0`](https://togithub.com/python/mypy/compare/v1.11.2...v1.12.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.11.2...v1.12.0)

###
[`v1.11.2`](https://togithub.com/python/mypy/blob/HEAD/CHANGELOG.md#Mypy-1112)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.11.1...v1.11.2)

- Alternative fix for a union-like literal string (Ivan Levkivskyi, PR
[17639](https://togithub.com/python/mypy/pull/17639))
- Unwrap `TypedDict` item types before storing (Ivan Levkivskyi, PR
[17640](https://togithub.com/python/mypy/pull/17640))

###
[`v1.11.1`](https://togithub.com/python/mypy/blob/HEAD/CHANGELOG.md#Mypy-1111)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.11.0...v1.11.1)

- Fix `RawExpressionType.accept` crash with `--cache-fine-grained`
(Anders Kaseorg, PR
[17588](https://togithub.com/python/mypy/pull/17588))
- Fix PEP 604 isinstance caching (Shantanu, PR
[17563](https://togithub.com/python/mypy/pull/17563))
- Fix `typing.TypeAliasType` being undefined on python < 3.12 (Nikita
Sobolev, PR [17558](https://togithub.com/python/mypy/pull/17558))
- Fix `types.GenericAlias` lookup crash (Shantanu, PR
[17543](https://togithub.com/python/mypy/pull/17543))

###
[`v1.11.0`](https://togithub.com/python/mypy/compare/v1.10.1...v1.11.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.10.1...v1.11.0)

###
[`v1.10.1`](https://togithub.com/python/mypy/blob/HEAD/CHANGELOG.md#Mypy-1101)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.10.0...v1.10.1)

- Fix error reporting on cached run after uninstallation of third party
library (Shantanu, PR
[17420](https://togithub.com/python/mypy/pull/17420))

###
[`v1.10.0`](https://togithub.com/python/mypy/compare/1.9.0...v1.10.0)

[Compare
Source](https://togithub.com/python/mypy/compare/1.9.0...v1.10.0)

### [`v1.9.0`](https://togithub.com/python/mypy/compare/v1.8.0...1.9.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.8.0...1.9.0)

### [`v1.8.0`](https://togithub.com/python/mypy/compare/v1.7.1...v1.8.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.7.1...v1.8.0)

### [`v1.7.1`](https://togithub.com/python/mypy/compare/v1.7.0...v1.7.1)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.7.0...v1.7.1)

### [`v1.7.0`](https://togithub.com/python/mypy/compare/v1.6.1...v1.7.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.6.1...v1.7.0)

### [`v1.6.1`](https://togithub.com/python/mypy/compare/v1.6.0...v1.6.1)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.6.0...v1.6.1)

### [`v1.6.0`](https://togithub.com/python/mypy/compare/v1.5.1...v1.6.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.5.1...v1.6.0)

### [`v1.5.1`](https://togithub.com/python/mypy/compare/v1.5.0...v1.5.1)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.5.0...v1.5.1)

### [`v1.5.0`](https://togithub.com/python/mypy/compare/v1.4.1...v1.5.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.4.1...v1.5.0)

### [`v1.4.1`](https://togithub.com/python/mypy/compare/v1.4.0...v1.4.1)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.4.0...v1.4.1)

### [`v1.4.0`](https://togithub.com/python/mypy/compare/v1.3.0...v1.4.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.3.0...v1.4.0)

### [`v1.3.0`](https://togithub.com/python/mypy/compare/v1.2.0...v1.3.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.2.0...v1.3.0)

### [`v1.2.0`](https://togithub.com/python/mypy/compare/v1.1.1...v1.2.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.1.1...v1.2.0)

###
[`v1.1.1`](https://togithub.com/python/mypy/blob/HEAD/CHANGELOG.md#Mypy-111)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.0.1...v1.1.1)

[Monday, 6 March
2023](https://mypy-lang.blogspot.com/2023/03/mypy-111-released.html)

We’ve just uploaded mypy 1.1.1 to the Python Package Index
([PyPI](https://pypi.org/project/mypy/)). Mypy is a static type checker
for Python. This release includes new features, performance improvements
and bug fixes. You can install it as follows:

    python3 -m pip install -U mypy

You can read the full documentation for this release on [Read the
Docs](http://mypy.readthedocs.io).

##### Support for \`dataclass_transform\`\`

This release adds full support for the dataclass_transform decorator
defined in [PEP
681](https://peps.python.org/pep-0681/#decorator-function-example). This
allows decorators, base classes, and metaclasses that generate a
\__init\_\_ method or other methods based on the properties of that
class (similar to dataclasses) to have those methods recognized by mypy.

This was contributed by Wesley Collin Wright.

##### Dedicated Error Code for Method Assignments

Mypy can’t safely check all assignments to methods (a form of monkey
patching), so mypy generates an error by default. To make it easier to
ignore this error, mypy now uses the new error code method-assign for
this. By disabling this error code in a file or globally, mypy will no
longer complain about assignments to methods if the signatures are
compatible.

Mypy also supports the old error code assignment for these assignments
to prevent a backward compatibility break. More generally, we can use
this mechanism in the future if we wish to split or rename another
existing error code without causing backward compatibility issues.

This was contributed by Ivan Levkivskyi (PR
[14570](https://togithub.com/python/mypy/pull/14570)).

##### Fixes to Crashes

- Fix a crash on walrus in comprehension at class scope (Ivan
Levkivskyi, PR [14556](https://togithub.com/python/mypy/pull/14556))
- Fix crash related to value-constrained TypeVar (Shantanu, PR
[14642](https://togithub.com/python/mypy/pull/14642))

##### Fixes to Cache Corruption

- Fix generic TypedDict/NamedTuple caching (Ivan Levkivskyi, PR
[14675](https://togithub.com/python/mypy/pull/14675))

##### Mypyc Fixes and Improvements

- Raise "non-trait base must be first..." error less frequently (Richard
Si, PR [14468](https://togithub.com/python/mypy/pull/14468))
- Generate faster code for bool comparisons and arithmetic (Jukka
Lehtosalo, PR [14489](https://togithub.com/python/mypy/pull/14489))
- Optimize \__(a)enter\_\_/\__(a)exit\_\_ for native classes (Jared
Hance, PR [14530](https://togithub.com/python/mypy/pull/14530))
- Detect if attribute definition conflicts with base class/trait (Jukka
Lehtosalo, PR [14535](https://togithub.com/python/mypy/pull/14535))
- Support \__(r)divmod\_\_ dunders (Richard Si, PR
[14613](https://togithub.com/python/mypy/pull/14613))
- Support \__pow\_\_, \__rpow\_\_, and \__ipow\_\_ dunders (Richard Si,
PR [14616](https://togithub.com/python/mypy/pull/14616))
- Fix crash on star unpacking to underscore (Ivan Levkivskyi, PR
[14624](https://togithub.com/python/mypy/pull/14624))
- Fix iterating over a union of dicts (Richard Si, PR
[14713](https://togithub.com/python/mypy/pull/14713))

##### Fixes to Detecting Undefined Names (used-before-def)

- Correctly handle walrus operator (Stas Ilinskiy, PR
[14646](https://togithub.com/python/mypy/pull/14646))
- Handle walrus declaration in match subject correctly (Stas Ilinskiy,
PR [14665](https://togithub.com/python/mypy/pull/14665))

##### Stubgen Improvements

Stubgen is a tool for automatically generating draft stubs for
libraries.

- Allow aliases below the top level (Chad Dombrova, PR
[14388](https://togithub.com/python/mypy/pull/14388))
- Fix crash with PEP 604 union in type variable bound (Shantanu, PR
[14557](https://togithub.com/python/mypy/pull/14557))
- Preserve PEP 604 unions in generated .pyi files (hamdanal, PR
[14601](https://togithub.com/python/mypy/pull/14601))

##### Stubtest Improvements

Stubtest is a tool for testing that stubs conform to the
implementations.

- Update message format so that it’s easier to go to error location
(Avasam, PR [14437](https://togithub.com/python/mypy/pull/14437))
- Handle name-mangling edge cases better (Alex Waygood, PR
[14596](https://togithub.com/python/mypy/pull/14596))

##### Changes to Error Reporting and Messages

- Add new TypedDict error code typeddict-unknown-key (JoaquimEsteves, PR
[14225](https://togithub.com/python/mypy/pull/14225))
- Give arguments a more reasonable location in error messages (Max
Murin, PR [14562](https://togithub.com/python/mypy/pull/14562))
- In error messages, quote just the module's name (Ilya Konstantinov, PR
[14567](https://togithub.com/python/mypy/pull/14567))
- Improve misleading message about Enum() (Rodrigo Silva, PR
[14590](https://togithub.com/python/mypy/pull/14590))
- Suggest importing from `typing_extensions` if definition is not in
typing (Shantanu, PR
[14591](https://togithub.com/python/mypy/pull/14591))
- Consistently use type-abstract error code (Ivan Levkivskyi, PR
[14619](https://togithub.com/python/mypy/pull/14619))
- Consistently use literal-required error code for TypedDicts (Ivan
Levkivskyi, PR [14621](https://togithub.com/python/mypy/pull/14621))
- Adjust inconsistent dataclasses plugin error messages (Wesley Collin
Wright, PR [14637](https://togithub.com/python/mypy/pull/14637))
- Consolidate literal bool argument error messages (Wesley Collin
Wright, PR [14693](https://togithub.com/python/mypy/pull/14693))

##### Other Fixes and Improvements

- Check that type guards accept a positional argument (EXPLOSION, PR
[14238](https://togithub.com/python/mypy/pull/14238))
- Fix bug with in operator used with a union of Container and Iterable
(Max Murin, PR [14384](https://togithub.com/python/mypy/pull/14384))
- Support protocol inference for type\[T] via metaclass (Ivan
Levkivskyi, PR [14554](https://togithub.com/python/mypy/pull/14554))
- Allow overlapping comparisons between bytes-like types (Shantanu, PR
[14658](https://togithub.com/python/mypy/pull/14658))
- Fix mypy daemon documentation link in README (Ivan Levkivskyi, PR
[14644](https://togithub.com/python/mypy/pull/14644))

##### Typeshed Updates

Typeshed is now modular and distributed as separate PyPI packages for
everything except the standard library stubs. Please see [git
log](https://togithub.com/python/typeshed/commits/main?after=5ebf892d0710a6e87925b8d138dfa597e7bb11cc+0\&branch=main\&path=stdlib)
for full list of typeshed changes.

##### Acknowledgements

Thanks to all mypy contributors who contributed to this release:

-   Alex Waygood
-   Avasam
-   Chad Dombrova
-   dosisod
-   EXPLOSION
-   hamdanal
-   Ilya Konstantinov
-   Ivan Levkivskyi
-   Jared Hance
-   JoaquimEsteves
-   Jukka Lehtosalo
-   Marc Mueller
-   Max Murin
-   Michael Lee
-   Michael R. Crusoe
-   Richard Si
-   Rodrigo Silva
-   Shantanu
-   Stas Ilinskiy
-   Wesley Collin Wright
-   Yilei "Dolee" Yang
-   Yurii Karabas

We’d also like to thank our employer, Dropbox, for funding the mypy core
team.

Posted by Max Murin

### [`v1.0.1`](https://togithub.com/python/mypy/compare/v1.0.0...v1.0.1)

[Compare
Source](https://togithub.com/python/mypy/compare/v1.0.0...v1.0.1)

### [`v1.0.0`](https://togithub.com/python/mypy/compare/v0.991...v1.0.0)

[Compare
Source](https://togithub.com/python/mypy/compare/v0.991...v1.0.0)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5am on saturday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41NS4yLXJwbSIsInVwZGF0ZWRJblZlciI6IjM4LjU1LjItcnBtIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com>
<!-- Replace XXXX with the issue number. Issue will be auto-linked -->
Jira issue: SWATCH-2003

## Description
<!-- Provide a description of this PR. Try to provide answers to "what",
"how",
and "why" -->

Add flag to disable oidc auth on azure marketplace client for simplified
EE testing
@lindseyburnett lindseyburnett changed the base branch from main to mstead/hbi-event-translation November 25, 2024 20:41
@lindseyburnett lindseyburnett force-pushed the lburnett/metrics-hbi-db branch from b85849d to c29c176 Compare November 25, 2024 20:53
dependabot bot and others added 12 commits November 25, 2024 21:43
Bumps [jakarta.persistence:jakarta.persistence-api](https://github.com/jakartaee/persistence) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/jakartaee/persistence/releases)
- [Commits](https://github.com/jakartaee/persistence/commits)

---
updated-dependencies:
- dependency-name: jakarta.persistence:jakarta.persistence-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [flake8](https://togithub.com/pycqa/flake8)
([changelog](https://flake8.pycqa.org/en/latest/release-notes/index.html))
| dev | major | `^6.0.0` -> `^7.0.0` |

---

### Release Notes

<details>
<summary>pycqa/flake8 (flake8)</summary>

### [`v7.1.1`](https://togithub.com/pycqa/flake8/compare/7.1.0...7.1.1)

[Compare
Source](https://togithub.com/pycqa/flake8/compare/7.1.0...7.1.1)

### [`v7.1.0`](https://togithub.com/pycqa/flake8/compare/7.0.0...7.1.0)

[Compare
Source](https://togithub.com/pycqa/flake8/compare/7.0.0...7.1.0)

### [`v7.0.0`](https://togithub.com/pycqa/flake8/compare/6.1.0...7.0.0)

[Compare
Source](https://togithub.com/pycqa/flake8/compare/6.1.0...7.0.0)

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5am on saturday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41NS4yLXJwbSIsInVwZGF0ZWRJblZlciI6IjM4LjU1LjItcnBtIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
Bumps software.amazon.awssdk:bom from 2.29.18 to 2.29.20.


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=software.amazon.awssdk:bom&package-manager=gradle&previous-version=2.29.18&new-version=2.29.20)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
There are some leftovers that are only used in tests, for example:

SubscriptionService
RhMarketplaceSubscriptionCollector
And probably more.
Most of these classes were ported to swatch contracts.
When usage is processed by swatch-producer-azure, it should increment a counter named "swatch_producer_metered_total" with the amount in metric units, having labels:

product (swatch product tag)
metric_id (metric ID)
billing_provider
status (failed or succeeded)
What about retry: we only care about the final state after Azure returns
These changes are about to update the existing counters when getting the subscription usage for aws and azure:
- swatch_missing_subscriptions
- swatch_ambiguous_subscriptions

By adding the "product" dimension.
After merging these changes, we could add a plot to see the numbers by product to early detect misconfigurations.

Apart from these changes, I converted the existing UsageContextSubscriptionProviderTest to a QuarkusTest, to better cover the SQL query.
…3991)

Bumps
[jakarta.persistence:jakarta.persistence-api](https://github.com/jakartaee/persistence)
from 3.1.0 to 3.2.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/jakartaee/persistence/releases">jakarta.persistence:jakarta.persistence-api's
releases</a>.</em></p>
<blockquote>
<h2>Jakarta Persistence 3.2.0-M01</h2>
<p>This release contains following changes:</p>
<ul>
<li>Adds factory-level access to named queries and named entity
graphs</li>
<li>Updates orm schema for 3.2</li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/jakartaee/persistence/compare/3.2-DRAFT01-3.2.0-B02-RELEASE...3.2-M1-3.2.0-M1-RELEASE">https://github.com/jakartaee/persistence/compare/3.2-DRAFT01-3.2.0-B02-RELEASE...3.2-M1-3.2.0-M1-RELEASE</a></p>
<h2>Jakarta Persistence 3.1.0 API</h2>
<p>This release contains following changes:</p>
<ul>
<li>EntityManagerFactory and EntityManager interfaces extends
java.lang.AutoCloseable interface</li>
<li>Fixes ClassTransformer.transform to throw Persistence API specific
exception</li>
<li>Adds support for java.util.UUID and GenerationType.UUID</li>
<li>Adds CEILING, EXP, FLOOR, LN, POWER, ROUND, and SIGN numeric
functions to Jakarta Persistence QL and ceiling(), exp(), floor(), ln(),
power(), round(), and sign() to Criteria API</li>
<li>Adds LOCAL DATE, LOCAL DATETIME, and LOCAL TIME functions to Jakarta
Persistence QL and corresponding localDate(), localDateTime(), and
localTime() to Criteria API</li>
<li>Adds EXTRACT function to Jakarta Persistence QL</li>
<li>Adds support for Expressions as conditions in Criteria CASE
expressions</li>
<li>Adds missing definition of single_valued_embeddable_object_field in
Jakarta Persistence QL BNF</li>
<li>Clarifies mixing types of query input parameters</li>
<li>Clarifies definition of the Basic type</li>
<li>Clarifies the order of parameters in the LOCATE function</li>
<li>Clarifies SqlResultSetMapping with multiple EntityResults and
conflicting aliases</li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/scottmarlow"><code>@​scottmarlow</code></a></li>
<li><a href="https://github.com/m0mus"><code>@​m0mus</code></a></li>
<li><a
href="https://github.com/pzygielo"><code>@​pzygielo</code></a></li>
<li><a href="https://github.com/hebo6"><code>@​hebo6</code></a></li>
<li><a
href="https://github.com/moghaddam"><code>@​moghaddam</code></a></li>
<li><a href="https://github.com/manouti"><code>@​manouti</code></a></li>
<li><a href="https://github.com/jbescos"><code>@​jbescos</code></a></li>
<li><a
href="https://github.com/gavinking"><code>@​gavinking</code></a></li>
<li><a href="https://github.com/dazey3"><code>@​dazey3</code></a></li>
<li><a
href="https://github.com/DmitriGit"><code>@​DmitriGit</code></a></li>
<li><a
href="https://github.com/sebersole"><code>@​sebersole</code></a></li>
</ul>
<p><strong>Project Board</strong>: <a
href="https://github.com/eclipse-ee4j/jpa-api/projects/2">https://github.com/eclipse-ee4j/jpa-api/projects/2</a>
<strong>Full Changelog</strong>: <a
href="https://github.com/eclipse-ee4j/jpa-api/commits/3.1-3.1.0-RELEASE">https://github.com/eclipse-ee4j/jpa-api/commits/3.1-3.1.0-RELEASE</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/jakartaee/persistence/commits">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=jakarta.persistence:jakarta.persistence-api&package-manager=gradle&previous-version=3.1.0&new-version=3.2.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
…3979)

Jira issue: SWATCH-3133

## Description
There are some leftovers that are only used in tests, for example:

SubscriptionService
RhMarketplaceSubscriptionCollector
And probably more.
Most of these classes were ported to swatch contracts.


## Testing
Only regression testing.
…3980)

Related to Jira issue: SWATCH-3050 and SWATCH-3125

## Description
These changes are about to update the existing counters when getting the
subscription usage for aws and azure:
- swatch_missing_subscriptions
- swatch_ambiguous_subscriptions

By adding the "product" dimension. 
After merging these changes, we could add a plot to see the numbers by
product to early detect misconfigurations.

Apart from these changes, I converted the existing
UsageContextSubscriptionProviderTest to a QuarkusTest, to better cover
the SQL query.

## Testing
Only regression testing.
…3949)

Jira issue: SWATCH-2303

## Description
When usage is processed by swatch-producer-azure, it should increment a
counter named "swatch_producer_metered_total" with the amount in metric
units, having labels:

product (swatch product tag)
metric_id (metric ID)
billing_provider
status (failed or succeeded)
What about retry: we only care about the final state after Azure returns

## Testing
Added junit test to ensure the metric is populated.

### Manual verification

1. podman-compose up
2. start azure service:

```
SERVER_PORT=8001 QUARKUS_MANAGEMENT_PORT=9001 ./gradlew :swatch-producer-azure:quarkusDev
```

3. send message to topic
"platform.rhsm-subscriptions.billable-usage-hourly-aggregate":

```
{"windowTimestamp":"2023-12-21T01:10:28Z","aggregateId": "e81bc918-6434-4a58-9192-8a8dd73ec8fb","aggregateKey": {"orgId": "org123","billingProvider": "azure","metricId": "Cores","productId": "rosa"}}
```

Note that this message is expected to fail at usage context lookup

4. verification:
The metrics from the swatch producer azure service should contain the
new metric:

```
curl http://localhost:9001/metrics  | grep swatch_
  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                 Dload  Upload   Total   Spent    Left  Speed
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0# TYPE swatch_producer_metered counter
# HELP swatch_producer_metered  
swatch_producer_metered_total{billing_provider="azure",error_code="usage_context_lookup",metric_id="Cores",product="rosa",status="failed"} 0.0
# TYPE swatch_azure_marketplace_batch_rejected counter
# HELP swatch_azure_marketplace_batch_rejected  
swatch_azure_marketplace_batch_rejected_total 0.0
# TYPE swatch_azure_marketplace_batch_accepted counter
# HELP swatch_azure_marketplace_batch_accepted  
swatch_azure_marketplace_batch_accepted_total 0.0
```

Note that the new metric is "swatch_producer_metered_total".
…3957)

Jira issue: SWATCH-2302

## Description
When usage is processed by swatch-producer-aws, it increments a counter
named
"swatch_producer_metered_total" with the amount in metric units, labeled
with

* product (swatch product tag)
* metric_id (metric ID)
* billing_provider
* status (failed/succeeded/duplicate)

## Testing
Unit tests are in the PR.

### Setup
1. 
    ```
SERVER_PORT=8001 QUARKUS_MANAGEMENT_PORT=9001 ./gradlew
:swatch-producer-aws:quarkusDev
    ```

### Steps
1. Verify the counters are zero
    ```
    http localhost:9001/metrics | grep swatch_producer_metered_total
    ```
1. Produce a message for
`platform.rhsm-subscriptions.billable-usage-hourly-aggregate`. I do it
with IntelliJ, but use whatever tool you like.
    ```json
{"windowTimestamp":"2023-12-21T01:10:28Z","aggregateId":
"e81bc918-6434-4a58-9192-8a8dd73ec8fb","aggregateKey": {"orgId":
"org123","billingProvider": "aws","metricId": "Cores","productId":
"rosa"}}
    ```
    This will produce an error since there's no AWS to communicate with

### Verification
1. Repeat
    ```
    http localhost:9001/metrics | grep swatch_producer_metered_total
    ```
1. You'll see
    ```

swatch_producer_metered_total{billing_provider="aws",error_code="usage_context_lookup",metric_id="Cores",product_tag="rosa",status="failed"}
0.0
    ```
with the billing_provider, error_code, metric_id, product_id, and
status.
Fixes:
- Production issue: Unlink the panel Export Requests Task Lag (the first panel)
- Export Requests: update panels for Subscriptions and Instances
- Rename swatch-subscriptions-sync to "Subscriptions & Contracts"
- "Subscriptions & Contracts"
    - Added swatch-contracts Memory Used
    - Fixed "Subscription Sync Task Lag"
- Billing Provider Integration
    - Added "Azure Marketplace Batch Stats"
    - Added "Azure Billable Usage Lag"
@mstead mstead self-assigned this Nov 26, 2024
@mstead mstead self-requested a review November 26, 2024 15:31
dependabot bot and others added 20 commits November 26, 2024 21:07
Bumps software.amazon.awssdk:bom from 2.29.20 to 2.29.21.

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps software.amazon.awssdk:bom from 2.29.20 to 2.29.21.


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=software.amazon.awssdk:bom&package-manager=gradle&previous-version=2.29.20&new-version=2.29.21)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
Bumps `quarkusVersion` from 3.16.4 to 3.17.0.

Updates `io.quarkus:gradle-application-plugin` from 3.16.4 to 3.17.0

Updates `io.quarkus.platform:quarkus-bom` from 3.16.4 to 3.17.0
- [Commits](quarkusio/quarkus-platform@3.16.4...3.17.0)

---
updated-dependencies:
- dependency-name: io.quarkus:gradle-application-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: io.quarkus.platform:quarkus-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps org.apache.kafka:kafka-streams-test-utils from 7.7.1-ce to 7.7.2-ce.

---
updated-dependencies:
- dependency-name: org.apache.kafka:kafka-streams-test-utils
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps `jacksonVersion` from 2.18.1 to 2.18.2.

Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.18.1 to 2.18.2
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-xml` from 2.18.1 to 2.18.2
- [Commits](FasterXML/jackson-dataformat-xml@jackson-dataformat-xml-2.18.1...jackson-dataformat-xml-2.18.2)

Updates `com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations` from 2.18.1 to 2.18.2
- [Commits](https://github.com/FasterXML/jackson-modules-base/commits)

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.1 to 2.18.2

---
updated-dependencies:
- dependency-name: com.fasterxml.jackson.core:jackson-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-xml
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…-ce (#3996)

Bumps org.apache.kafka:kafka-streams-test-utils from 7.7.1-ce to
7.7.2-ce.


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.kafka:kafka-streams-test-utils&package-manager=gradle&previous-version=7.7.1-ce&new-version=7.7.2-ce)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
## Description
Fixes:
- Production issue: Unlink the panel Export Requests Task Lag (the first
panel)

In Prod:

![Captura de pantalla de 2024-11-26
12-33-28](https://github.com/user-attachments/assets/86ea900a-568a-462d-b353-516b9ccfad0e)

The problem was that this panel was linked to another which didn't exist
in prod. Unlinking the panel should fix this.

- Export Requests: update panels for Subscriptions and Instances

![Captura de pantalla de 2024-11-26
13-28-07](https://github.com/user-attachments/assets/448b42dc-0afc-47c8-af9e-b122282c572e)

- Rename swatch-subscriptions-sync to "Subscriptions & Contracts"
- "Subscriptions & Contracts"
    - Added swatch-contracts Memory Used
    - Fixed "Subscription Sync Task Lag"

![Captura de pantalla de 2024-11-26
13-30-53](https://github.com/user-attachments/assets/a61b4586-b47a-4743-bb66-34f38a194de7)

    - Added panels for ambiguous and missing subscriptions by product

![Captura de pantalla de 2024-11-26
13-31-27](https://github.com/user-attachments/assets/6bafa957-6417-4c95-8e39-872939902ead)

- Billing Provider Integration
    - Added "Azure Marketplace Batch Stats"
    - Added "Azure Billable Usage Lag"
- Replaced "Billable Usage Dead Letter Task Lag" by "Billable Usage
Status Task Lag"

![Captura de pantalla de 2024-11-26
13-32-03](https://github.com/user-attachments/assets/bd9bfbb3-b411-44bb-a572-2132160f5b90)

## Testing
To extract the JSON from the k8s configmap file:

```
oc extract -f .rhcicd/grafana/grafana-dashboard-subscription-watch.configmap.yaml --confirm
```

Once you extract it from the .yaml that's checked into this repo, you
can import it into the stage instance of grafana by going to `Dashboards
-> +Import` from the left nav.
Bumps `quarkusVersion` from 3.16.4 to 3.17.0.
Updates `io.quarkus:gradle-application-plugin` from 3.16.4 to 3.17.0

Updates `io.quarkus.platform:quarkus-bom` from 3.16.4 to 3.17.0
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/1b01986f6ce1d77695ef6dc224ce180dad04b157"><code>1b01986</code></a>
[maven-release-plugin] prepare release 3.17.0</li>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/1f1289cbbec64a71b1b3257d412bab12df4a1de4"><code>1f1289c</code></a>
Merge pull request <a
href="https://redirect.github.com/quarkusio/quarkus-platform/issues/1361">#1361</a>
from ppalaga/241126-qcxf-3.17.0</li>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/7cd1363c0cf62deb30d318511ccfde48cc98cd72"><code>7cd1363</code></a>
Upgrade to Quarkus CXF 3.17.0</li>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/13779c6555d68329bb5d98471ac0ddc318267606"><code>13779c6</code></a>
Merge pull request <a
href="https://redirect.github.com/quarkusio/quarkus-platform/issues/1357">#1357</a>
from metacosm/qosdk-release-6.9.1-main</li>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/474184b5f55af2a15af03c3e8b368c673b19d98f"><code>474184b</code></a>
Update QOSDK to 6.9.1 for main</li>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/bd34923185830ba350f6fab05c59a46020a610cd"><code>bd34923</code></a>
Merge pull request <a
href="https://redirect.github.com/quarkusio/quarkus-platform/issues/1355">#1355</a>
from gsmet/upload-artifact-v4</li>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/e9384ecf1bd58e82fca79d231a0d2762bceece55"><code>e9384ec</code></a>
Defaults to bash shell globally</li>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/0dcb5ad60760ed0fce9548f4823dc06f2747640e"><code>0dcb5ad</code></a>
Replace deprecated ::set-output</li>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/37a1cd38e2211b2df1bed0d3e13c3020ddbd8f30"><code>37a1cd3</code></a>
Update to upload-artifact@v4 and produce job summary</li>
<li><a
href="https://github.com/quarkusio/quarkus-platform/commit/832b5fd079e4aacd681d6e71aac0895a1f2eb925"><code>832b5fd</code></a>
Merge pull request <a
href="https://redirect.github.com/quarkusio/quarkus-platform/issues/1352">#1352</a>
from Naros/upgrade-debezium-3.0.2</li>
<li>Additional commits viewable in <a
href="https://github.com/quarkusio/quarkus-platform/compare/3.16.4...3.17.0">compare
view</a></li>
</ul>
</details>
<br />


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
Bumps software.amazon.awssdk:bom from 2.29.21 to 2.29.23.


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=software.amazon.awssdk:bom&package-manager=gradle&previous-version=2.29.21&new-version=2.29.23)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps `jacksonVersion` from 2.18.1 to 2.18.2.
Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.18.1 to
2.18.2
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/FasterXML/jackson/commits">compare
view</a></li>
</ul>
</details>
<br />

Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-xml` from
2.18.1 to 2.18.2
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/310241bb6c1bee9d901440e9a3e73f1ce2513817"><code>310241b</code></a>
[maven-release-plugin] prepare release
jackson-dataformat-xml-2.18.2</li>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/21dfc4f948ab82fc0d05209495e521c216fab3ec"><code>21dfc4f</code></a>
minor warnings removal</li>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/06d28aacf1bbe4354cecb2400b657c32be3f485f"><code>06d28aa</code></a>
Prep for 2.18.2 release</li>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/0a7cf7b7beaf980fdafb5834dbab1688c79c2932"><code>0a7cf7b</code></a>
Merge test classes</li>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/7e35baae9080b1ddcaf410ed8e425b9d4e2554c4"><code>7e35baa</code></a>
Add test for <a
href="https://redirect.github.com/FasterXML/jackson-dataformat-xml/issues/682">#682</a>
(passing with jackson-databind fix) (<a
href="https://redirect.github.com/FasterXML/jackson-dataformat-xml/issues/685">#685</a>)</li>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/5b78983c3cba363d95a964e074c025f47eac04b4"><code>5b78983</code></a>
Fix <a
href="https://redirect.github.com/FasterXML/jackson-dataformat-xml/issues/678">#678</a>:
allow configuring custom SerializerFactory via JacksonXmlModule (<a
href="https://redirect.github.com/FasterXML/jackson-dataformat-xml/issues/680">#680</a>)</li>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/180a75b439ffbae1e49cd4c7da614680f881a931"><code>180a75b</code></a>
Merge branch '2.17' into 2.18</li>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/b19f1ca14710a4427e2704b96cabbc30ca91e58a"><code>b19f1ca</code></a>
Back to snapshot dep</li>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/acd25dc161081039a63f0930327ca1431d2bf4be"><code>acd25dc</code></a>
[maven-release-plugin] prepare for next development iteration</li>
<li><a
href="https://github.com/FasterXML/jackson-dataformat-xml/commit/2ddb9709224a4b04e1f545191cb3d214b73c7395"><code>2ddb970</code></a>
[maven-release-plugin] prepare release
jackson-dataformat-xml-2.17.3</li>
<li>Additional commits viewable in <a
href="https://github.com/FasterXML/jackson-dataformat-xml/compare/jackson-dataformat-xml-2.18.1...jackson-dataformat-xml-2.18.2">compare
view</a></li>
</ul>
</details>
<br />

Updates
`com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations`
from 2.18.1 to 2.18.2
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a
href="https://github.com/FasterXML/jackson-modules-base/commits">compare
view</a></li>
</ul>
</details>
<br />

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from
2.18.1 to 2.18.2


Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
|
[openshift-client](https://togithub.com/openshift/openshift-client-python)
| dependencies | major | `^1.0.18` -> `^2.0.0` |

---

### Release Notes

<details>
<summary>openshift/openshift-client-python (openshift-client)</summary>

###
[`v2.0.4`](https://togithub.com/openshift/openshift-client-python/releases/tag/2.0.4)

[Compare
Source](https://togithub.com/openshift/openshift-client-python/compare/2.0.3...2.0.4)

#### What's Changed

- Updating the frameinfo check with the new package name by
[@&#8203;bradmwilliams](https://togithub.com/bradmwilliams) in
[https://github.com/openshift/openshift-client-python/pull/160](https://togithub.com/openshift/openshift-client-python/pull/160)
- More examples by
[@&#8203;bradmwilliams](https://togithub.com/bradmwilliams) in
[https://github.com/openshift/openshift-client-python/pull/161](https://togithub.com/openshift/openshift-client-python/pull/161)
- Preparing 2.0.4 by
[@&#8203;bradmwilliams](https://togithub.com/bradmwilliams) in
[https://github.com/openshift/openshift-client-python/pull/162](https://togithub.com/openshift/openshift-client-python/pull/162)

**Full Changelog**:
openshift/openshift-client-python@2.0.3...2.0.4

###
[`v2.0.3`](https://togithub.com/openshift/openshift-client-python/releases/tag/2.0.3)

[Compare
Source](https://togithub.com/openshift/openshift-client-python/compare/2.0.2...2.0.3)

#### What's Changed

- Fix offset-naive and offset-aware operation by
[@&#8203;mdujava](https://togithub.com/mdujava) in
[https://github.com/openshift/openshift-client-python/pull/155](https://togithub.com/openshift/openshift-client-python/pull/155)
- Preparing 2.0.3 by
[@&#8203;bradmwilliams](https://togithub.com/bradmwilliams) in
[https://github.com/openshift/openshift-client-python/pull/158](https://togithub.com/openshift/openshift-client-python/pull/158)

**Full Changelog**:
openshift/openshift-client-python@2.0.2...2.0.3

###
[`v2.0.2`](https://togithub.com/openshift/openshift-client-python/releases/tag/2.0.2)

[Compare
Source](https://togithub.com/openshift/openshift-client-python/compare/2.0.1...2.0.2)

#### What's Changed

- Use datetime.now with timezone, instead of datetime.utcnow by
[@&#8203;mdujava](https://togithub.com/mdujava) in
[https://github.com/openshift/openshift-client-python/pull/151](https://togithub.com/openshift/openshift-client-python/pull/151)
- Preparing version 2.0.2 by
[@&#8203;bradmwilliams](https://togithub.com/bradmwilliams) in
[https://github.com/openshift/openshift-client-python/pull/154](https://togithub.com/openshift/openshift-client-python/pull/154)

#### New Contributors

- [@&#8203;mdujava](https://togithub.com/mdujava) made their first
contribution in
[https://github.com/openshift/openshift-client-python/pull/151](https://togithub.com/openshift/openshift-client-python/pull/151)

**Full Changelog**:
openshift/openshift-client-python@2.0.1...2.0.2

###
[`v2.0.1`](https://togithub.com/openshift/openshift-client-python/releases/tag/2.0.1)

[Compare
Source](https://togithub.com/openshift/openshift-client-python/compare/2.0.0...2.0.1)

#### What's Changed

- Converting to modern python packaging by
[@&#8203;bradmwilliams](https://togithub.com/bradmwilliams) in
[https://github.com/openshift/openshift-client-python/pull/147](https://togithub.com/openshift/openshift-client-python/pull/147)
- Preparing version 2.0.1 by
[@&#8203;bradmwilliams](https://togithub.com/bradmwilliams) in
[https://github.com/openshift/openshift-client-python/pull/149](https://togithub.com/openshift/openshift-client-python/pull/149)

**Full Changelog**:
openshift/openshift-client-python@2.0.0...2.0.1

###
[`v2.0.0`](https://togithub.com/openshift/openshift-client-python/releases/tag/2.0.0)

[Compare
Source](https://togithub.com/openshift/openshift-client-python/compare/1.0.23...2.0.0)

#### What's Changed

- Preparing version 2.0.0 by
[@&#8203;bradmwilliams](https://togithub.com/bradmwilliams) in
[https://github.com/openshift/openshift-client-python/pull/146](https://togithub.com/openshift/openshift-client-python/pull/146)

**Full Changelog**:
openshift/openshift-client-python@1.0.20...2.0.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "after 5am on saturday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Renovate
Bot](https://togithub.com/renovatebot/renovate).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC41NS4yLXJwbSIsInVwZGF0ZWRJblZlciI6IjM4LjU1LjItcnBtIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6W119-->
NOTE: HostGuestRepository stubbed out until implementation lands
When HBI event messages are received, filter them to ensure
that we do not process any that define a billing_model of
'marketplace' or a host_type of 'edge'.

This filter mimics the query currently being made to fetch
applicable host records from HBI, with the exception of
orgId.

Since the query (used by the nightly) is made based on the
opted-in org list, we need to also filter any incoming
Swatch Event messages so that Events are not persisted for
orgs that will not be tallied. We do not currently want to
open upnightly tally for every org that sends data to HBI.

NOTE:
The opt-in check added to the EventController does not
add any overhead since we continue to do at most one check
per event.
Periodically tests would fail because of a conflict with
the management port for swatch-metrics-hbi. Disabling
management for this service during testing
…hsm-subscriptions into lburnett/metrics-hbi-db
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.

6 participants