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

ROX-12137: Use billing_marketplace_account instead of cloud_account_id #634

Merged

Conversation

ivan-degtiarenko
Copy link
Contributor

Description

To get AMS to bill the cloud account, we need to use billing_marketplace_account instead of cloud_account_id parameter.
Links:

  1. Slack discussion with AMS team
  2. Article from AMS

Checklist (Definition of Done)

  • Unit and integration tests added
  • Added test description under Test manual
  • Evaluated and added CHANGELOG.md entry if required
  • Documentation added if necessary (i.e. changes to dev setup, test execution, ...)
  • CI and all relevant tests are passing
  • Add the ticket number to the PR title if available, i.e. ROX-12345: ...
  • Discussed security and business related topics privately. Will move any security and business related topics that arise to private communication channel.

Test manual

TODO: Add manual testing efforts

# To run tests locally run:
make db/teardown db/setup db/migrate
make ocm/setup OCM_OFFLINE_TOKEN=<ocm-offline-token> OCM_ENV=development
make verify lint binary test test/integration

@openshift-ci openshift-ci bot added the approved label Dec 1, 2022
}
hasGenericMarketplace = hasGenericMarketplace || rr.BillingModel() == string(amsv1.BillingModelMarketplace)
hasMarketplaceAWS = hasMarketplaceAWS || rr.BillingModel() == string(amsv1.BillingModelMarketplaceAWS)
hasStandardMarketplace = hasStandardMarketplace || rr.BillingModel() == string(amsv1.BillingModelStandard)
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you rename this variable? Generic and standard are too similar, and the standard billing model does not have any marketplace.

Copy link
Contributor

@stehessel stehessel left a comment

Choose a reason for hiding this comment

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

I'd recommend at least testing the telemeter labels once before merging. Otherwise lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 6, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ivan-degtiarenko, stehessel

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ivan-degtiarenko
Copy link
Contributor Author

/retest

@ivan-degtiarenko ivan-degtiarenko force-pushed the ivan/ROX-12137-use-billing-marketplace-account-in-ams branch from 1ee67b0 to cb99f50 Compare December 6, 2022 14:12
@openshift-ci openshift-ci bot removed the lgtm label Dec 6, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 6, 2022

New changes are detected. LGTM label has been removed.

@ivan-degtiarenko ivan-degtiarenko merged commit f3c11d5 into main Dec 13, 2022
@ivan-degtiarenko ivan-degtiarenko deleted the ivan/ROX-12137-use-billing-marketplace-account-in-ams branch December 13, 2022 00:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants