Skip to content

fix: rh_subscription org value#5390

Closed
pneigel-ca wants to merge 4 commits into
canonical:mainfrom
pneigel-ca:pneigel-ca-patch-1
Closed

fix: rh_subscription org value#5390
pneigel-ca wants to merge 4 commits into
canonical:mainfrom
pneigel-ca:pneigel-ca-patch-1

Conversation

@pneigel-ca
Copy link
Copy Markdown

@pneigel-ca pneigel-ca commented Jun 7, 2024

Update org type from integer to string, updated unit test that references org.

Fixes GH-5382

Proposed Commit Message

fix: rh_subscription org value

Update org value type

Fixes GH-5382

Additional Context

The original issue identified schema errors for values that were determined to be appropriate using underlying tools.

Test Steps

Provide sample configuration for rh_subscription using a string for the value of org and it should be free of schema errors when validated, ie: cloud-init schema --system

Checklist

Merge type

  • Squash merge using "Proposed Commit Message"
  • Rebase and merge unique commits. Requires commit messages per-commit each referencing the pull request number (#<PR_NUM>)

@pneigel-ca pneigel-ca marked this pull request as ready for review June 7, 2024 15:36
Copy link
Copy Markdown

@alabonne-ca alabonne-ca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for delving into this :shipit:

@aciba90 aciba90 added the CLA signed The submitter of the PR has signed the CLA label Jun 10, 2024
@catmsred
Copy link
Copy Markdown
Contributor

Looks good to me, thank you for cleaning this up!

Copy link
Copy Markdown
Contributor

@aciba90 aciba90 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for reporting and addressing this!

"org": {
"type": "integer",
"description": "The organization number to use. Must be used with ``activation-key``. Should not be used with ``username`` or ``password``"
"type": "string",
Copy link
Copy Markdown
Contributor

@aciba90 aciba90 Jun 11, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As the value of this is ultimately going to be passed as string to subscription-manager and in order to maintain backwards compatibility, I think we should maintain both types as valid and mark integer as deprecated.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the feedback. I will address this in a new commit!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pneigel-ca any updates on this?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@holmanb No updates. If someone can handle in a new PR, I'm welcome to it. I haven't had the time to familiarize myself with the deprecation syntax and rebase with the changes to documentation.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pneigel-ca Is 8532268+pneigel-ca@users.noreply.github.com your preferred email for the commit message?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@holmanb Thanks for checking in - I didn't configure my email properly in git 😄

patrick.neigel@gmail.com can be used.

@holmanb holmanb added the incomplete Action required by submitter label Jun 25, 2024
@pneigel-ca pneigel-ca closed this Jun 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA signed The submitter of the PR has signed the CLA incomplete Action required by submitter

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[enhancement]: rh_subscription module attribute org has the wrong schema

5 participants