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

OCM-9613 | feat: Allow billing account update via the cluster edit command #2258

Conversation

cristianoveiga
Copy link
Contributor

No description provided.

@openshift-ci openshift-ci bot requested review from den-rgb and robpblake July 16, 2024 17:38
@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch from 7e9899c to fae7327 Compare July 16, 2024 18:05
Copy link

codecov bot commented Jul 16, 2024

Codecov Report

Attention: Patch coverage is 6.86275% with 95 lines in your changes missing coverage. Please review.

Project coverage is 29.64%. Comparing base (42cc529) to head (8c796d2).
Report is 3 commits behind head on master.

Files with missing lines Patch % Lines
cmd/edit/cluster/cmd.go 11.11% 48 Missing ⚠️
pkg/ocm/billing.go 0.00% 33 Missing ⚠️
cmd/create/cluster/cmd.go 12.50% 7 Missing ⚠️
pkg/interactive/interactive.go 0.00% 4 Missing ⚠️
pkg/ocm/clusters.go 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2258      +/-   ##
==========================================
- Coverage   29.85%   29.64%   -0.22%     
==========================================
  Files         165      165              
  Lines       22844    22932      +88     
==========================================
- Hits         6821     6798      -23     
- Misses      15462    15573     +111     
  Partials      561      561              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@cristianoveiga cristianoveiga marked this pull request as draft July 16, 2024 18:35
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 16, 2024
Copy link
Member

@ciaranRoche ciaranRoche left a comment

Choose a reason for hiding this comment

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

This LGTM, just to confirm is there any blocker keeping this in draft?

@cristianoveiga
Copy link
Contributor Author

This LGTM, just to confirm is there any blocker keeping this in draft?

Thanks @ciaranRoche . We have been asked to review this change with the UX team.

I will resume the work on this whenever we get their input.

@ciaranRoche
Copy link
Member

@cristianoveiga one worry is this will get out of date, and result in more work on your end to keep up to date. Do we have an idea of how long it will take for UX review

@cristianoveiga
Copy link
Contributor Author

@cristianoveiga one worry is this will get out of date, and result in more work on your end to keep up to date. Do we have an idea of how long it will take for UX review

Indeed - I share the same concern.

I'm trying to identify an UX contact to get this information. I will keep you posted.

r.Reporter.Infof(
"The selected AWS billing account is a different account than your AWS infrastructure account." +
"The AWS billing account will be charged for subscription usage. " +
"The AWS infrastructure account will be used for managing the cluster.",
Copy link
Member

Choose a reason for hiding this comment

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

No space between the first and second sentence.
This needs rewording - "The AWS infrastructure account will be used for managing the cluster."

Choose a reason for hiding this comment

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

Can be reworded as "The AWS infrastructure account contains the ROSA infrastructure".

@abhgupta
Copy link
Member

Additional review comments that I could not figure out where to comment in the file changes.

  1. The "Billing Account" prompt should be "Update billing account"
  2. Instead of "default", we should highlight the AWS account as the "current" billing account that is shown within parenthesis.
  3. The text message once the user switches their AWS billing account should be entirely rewritten.

@cristianoveiga
Copy link
Contributor Author

Additional review comments that I could not figure out where to comment in the file changes.

  1. The "Billing Account" prompt should be "Update billing account"
  2. Instead of "default", we should highlight the AWS account as the "current" billing account that is shown within parenthesis.
  3. The text message once the user switches their AWS billing account should be entirely rewritten.

I've addressed items 1 and 2 above.

@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch 2 times, most recently from 123955d to 8ff1a07 Compare July 25, 2024 15:57
@lnagendr
Copy link

This LGTM. I don't have any additional comments.

@cristianoveiga cristianoveiga marked this pull request as ready for review July 31, 2024 14:36
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 31, 2024
@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch 2 times, most recently from 5281a3b to 07d136b Compare July 31, 2024 15:03
@cristianoveiga
Copy link
Contributor Author

/retest

@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch from 07d136b to 7e647c5 Compare July 31, 2024 15:35
@cristianoveiga
Copy link
Contributor Author

/retest

@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch from 7e647c5 to bb96300 Compare July 31, 2024 15:55
@cristianoveiga
Copy link
Contributor Author

This LGTM, just to confirm is there any blocker keeping this in draft?

Thanks @ciaranRoche . We have been asked to review this change with the UX team.

I will resume the work on this whenever we get their input.

Hi @ciaranRoche , I've addressed the PR comments and we have received green light from @lnagendr .

Can you please take another look at this and merge it if you don't have any additional comments?

"The AWS billing account will be charged for subscription usage. " +
"The AWS infrastructure account will be used for managing the cluster.",
"The AWS infrastructure account contains the ROSA infrastructure.",

Choose a reason for hiding this comment

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

the account contains the infrastructure? or does the thing that the account is for contain the infrastructure?

Copy link

Choose a reason for hiding this comment

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

@jseseCCS it's the latter.

&args.billingAccount,
"billing-account",
"",
"Account used for billing subscriptions purchased via the AWS console for ROSA",

Choose a reason for hiding this comment

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

via

Copy link

Choose a reason for hiding this comment

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

+1

@jseseCCS
Copy link

hey, guys!

a general note about error messages: Whenever possible, tell users why the problem occurred and how to fix or diagnose the problem.

@jseseCCS
Copy link

let me know if i can be of any more help. I'm just a ping/@ away.

@cristianoveiga
Copy link
Contributor Author

let me know if i can be of any more help. I'm just a ping/@ away.

Thanks!

@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch from bb96300 to b2ea93a Compare August 27, 2024 15:04
@cristianoveiga
Copy link
Contributor Author

/retest

1 similar comment
@cristianoveiga
Copy link
Contributor Author

/retest

@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch 2 times, most recently from 75cc8d5 to 14b5d77 Compare August 28, 2024 14:05
@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch 3 times, most recently from f3eb877 to 64bdb46 Compare September 24, 2024 12:07
Copy link
Contributor

@hunterkepley hunterkepley left a comment

Choose a reason for hiding this comment

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

LGTM, nitpick on UX with error displayed to user, but maybe OCM bubbles up what I'm asking

@hunterkepley
Copy link
Contributor

Validation + Tests look good to me

@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch 2 times, most recently from 52852a6 to 655ec1c Compare September 30, 2024 17:22
@cristianoveiga
Copy link
Contributor Author

/retest

@cristianoveiga cristianoveiga force-pushed the ocm-9613-allow-billing-account-update branch from 655ec1c to 8c796d2 Compare October 1, 2024 17:37
@gdbranco
Copy link
Contributor

gdbranco commented Oct 1, 2024

/lgtm
/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 1, 2024
@gdbranco
Copy link
Contributor

gdbranco commented Oct 1, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 1, 2024
Copy link
Contributor

openshift-ci bot commented Oct 1, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cristianoveiga, gdbranco, hunterkepley

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

Copy link
Contributor

openshift-ci bot commented Oct 1, 2024

@cristianoveiga: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit cd5b932 into openshift:master Oct 1, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants