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

OSD-21060: backplane cloud console open in proper region #343

Merged
merged 2 commits into from
Feb 19, 2024

Conversation

Tof1973
Copy link
Contributor

@Tof1973 Tof1973 commented Feb 19, 2024

What type of PR is this?

bug

What this PR does / Why we need it?

When using ocm-backplane cloud console the aws connexion will be don on last connected region and not on the one of the cluster.

Which Jira/Github issue(s) does this PR fix?

_Resolves #OSD-21060

Special notes for your reviewer

Pre-checks (if applicable)

  • Ran unit tests locally
  • Validated the changes in a cluster
  • [na] Included documentation changes with PR

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 19, 2024

@Tof1973: This pull request references OSD-21060 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.16.0" version, but no target version was set.

In response to this:

What type of PR is this?

bug

What this PR does / Why we need it?

When using ocm-backplane cloud console the aws connexion will be don on last connected region and not on the one of the cluster.

Which Jira/Github issue(s) does this PR fix?

_Resolves #OSD-21060

Special notes for your reviewer

Pre-checks (if applicable)

  • Ran unit tests locally
  • Validated the changes in a cluster
  • [na] Included documentation changes with PR

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 19, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 19, 2024

@Tof1973: This pull request references OSD-21060 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.16.0" version, but no target version was set.

In response to this:

What type of PR is this?

bug

What this PR does / Why we need it?

When using ocm-backplane cloud console the aws connexion will be don on last connected region and not on the one of the cluster.

Which Jira/Github issue(s) does this PR fix?

_Resolves #OSD-21060

Special notes for your reviewer

Pre-checks (if applicable)

  • Ran unit tests locally
  • Validated the changes in a cluster
  • [na] Included documentation changes with PR

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 openshift-eng/jira-lifecycle-plugin repository.

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (339c486) 44.04% compared to head (194682c) 44.04%.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #343   +/-   ##
=======================================
  Coverage   44.04%   44.04%           
=======================================
  Files          54       54           
  Lines        4064     4064           
=======================================
  Hits         1790     1790           
  Misses       2015     2015           
  Partials      259      259           
Files Coverage Δ
pkg/awsutil/sts.go 53.38% <100.00%> (ø)

Copy link
Contributor

@mjlshen mjlshen left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 19, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2024
Copy link
Contributor

@mjlshen mjlshen left a comment

Choose a reason for hiding this comment

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

/label tide/merge-method-squash
/lgtm

@openshift-ci openshift-ci bot added tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. lgtm Indicates that a PR is ready to be merged. labels Feb 19, 2024
Copy link
Contributor

openshift-ci bot commented Feb 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mjlshen, Tof1973

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 Feb 19, 2024

@Tof1973: 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/test-infra repository. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit e5222c8 into openshift:main Feb 19, 2024
7 checks passed
@Tof1973 Tof1973 deleted the OSD-21060 branch March 6, 2024 15:06
amej pushed a commit to amej/backplane-cli that referenced this pull request Apr 11, 2024
Bumps [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) from 0.1.401 to 0.1.402.
- [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases)
- [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md)
- [Commits](https://github.com/openshift-online/ocm-sdk-go/commits)

---
updated-dependencies:
- dependency-name: github.com/openshift-online/ocm-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

OSD-21060: backplane cloud console open in proper region (openshift#343)

* backplane cloud console open in proper region

* replace missing ocm-sdk-go v0.1.402 by ocm-sdk-go v0.1.403

Development complete. Local testing complete.

add more approvers and reviewers

OSD-16899: Backplane CLI debug output lets you know the ELB its connecting to. (openshift#331)

* feat(OSD-16899): Backplane CLI debug output should let you know which backplane server it is connecting through at the time of login

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* feat(OSD-16899): Prints descriptive string

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* feat(OSD-16899): Adds the doc link containing mapping of the ELB to the backplane api servers

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* style(OSD-16899)

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* style(OSD-16899): Function names should ideally be written in CamelCase.

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* test(OSD-16899): Logs the error string instead of returing the error as error type externally

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* style(OSD-16899): Renames variable to camelcase
-Prints warning because the script does not get terminated

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* code(OSD-16899):  Finally, the convention in Go is to use MixedCaps or mixedCaps rather than underscores to write multiword

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* code(OSD-16899): Go convention to use mixedCase variables for non-exported vars

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* fix(OSD-16899): Switches to generic message devoid of Red Hat Internal links

Signed-off-by: Ameya Sathe <asathe@redhat.com>

* Update cmd/ocm-backplane/login/login.go

making it more generic

Co-authored-by: Supreeth Basabattini <sbasabat@redhat.com>

---------

Signed-off-by: Ameya Sathe <asathe@redhat.com>
Co-authored-by: Supreeth Basabattini <sbasabat@redhat.com>

Do not override KUBECONFIG when RunElevate

Bump ubi8/ubi from 8.9-1107.1706791207 to 8.9-1136

Bumps ubi8/ubi from 8.9-1107.1706791207 to 8.9-1136.

---
updated-dependencies:
- dependency-name: ubi8/ubi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump github.com/aws/aws-sdk-go-v2/config from 1.27.0 to 1.27.4

Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.27.0 to 1.27.4.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.27.0...config/v1.27.4)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Modify the awk command to exclude the rhel-specific binary

initial commit OSD-20994

adding --manager flag, logs

changes suggested in review

Fix monitoring-plugin on podman

Bump github.com/openshift-online/ocm-sdk-go from 0.1.403 to 0.1.405

Bumps [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) from 0.1.403 to 0.1.405.
- [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases)
- [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md)
- [Commits](openshift-online/ocm-sdk-go@v0.1.403...v0.1.405)

---
updated-dependencies:
- dependency-name: github.com/openshift-online/ocm-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

use tmpdir for testjob to import lib

Add iniitla debug messages to login.go

First version of loggos

change fmt.println  to logger.debugln

Change varible names

Added additional ocm-backplane login debug logging

Added Tests for cmd/ocm-backplane/console/

Added tests for validatecontainer engine, getcontainerengineimpl and the run function.

Added isTest flag to console options to prevent the occurance of an infinite loop

Added tests for cleanup function for console options

Added an additional test for ports

"Remove test for cleanup function"

Uncapitalize strings

Expect error from run command to be lower case

Split up the Validate Container Engine Tests

Added podman and docker into a temp path

Added exec permissions to temp file

Change order of errors

Implemented isTest flag in consoleOptions, this is a workaround since that environment varibles within contains cannot be changed, this purely

Incorperated validateContainerEngine into consoleOptions, this is due to some problems with containers and testing

Make changes in test for validateContainerEngine

Added missing method

Make lint changes to o.test flag

Roll back changes to validateContainerEngine

Added a functionality to mock the existence of a podman and docker binary, but they are actually just empty executable files in tmpfs

Made changes to the circuit breaker at run

Cleaned up some formatting issues

Added tests for ocm-backplane and made some formatting and syntax changes

Alternative workaround for console test of the run function in console.go via mock interfaces

Moved temp path configuration utilities in console_test to console_test_utils

added file console_tests_util.go

Added defensive code into cleanup and moved mockinterface into utils

Commenting

Removed uncessary comments

Bump github.com/openshift-online/ocm-sdk-go from 0.1.405 to 0.1.409

Bumps [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) from 0.1.405 to 0.1.409.
- [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases)
- [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md)
- [Commits](openshift-online/ocm-sdk-go@v0.1.405...v0.1.409)

---
updated-dependencies:
- dependency-name: github.com/openshift-online/ocm-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump github.com/aws/aws-sdk-go-v2/credentials from 1.17.4 to 1.17.7

Bumps [github.com/aws/aws-sdk-go-v2/credentials](https://github.com/aws/aws-sdk-go-v2) from 1.17.4 to 1.17.7.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Changelog](https://github.com/aws/aws-sdk-go-v2/blob/v1.17.7/CHANGELOG.md)
- [Commits](aws/aws-sdk-go-v2@v1.17.4...v1.17.7)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/credentials
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump github.com/aws/aws-sdk-go-v2/config from 1.27.4 to 1.27.7

Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.27.4 to 1.27.7.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.27.4...config/v1.27.7)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

feat: Enable backplane login through PD incident link or ID

Bump github.com/openshift-online/ocm-sdk-go from 0.1.409 to 0.1.411

Bumps [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) from 0.1.409 to 0.1.411.
- [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases)
- [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md)
- [Commits](openshift-online/ocm-sdk-go@v0.1.409...v0.1.411)

---
updated-dependencies:
- dependency-name: github.com/openshift-online/ocm-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump golang.org/x/term from 0.17.0 to 0.18.0

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.17.0 to 0.18.0.
- [Commits](golang/term@v0.17.0...v0.18.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

fix: Include condition to check if arg pd is empty

OSD-21670: Reduce verbosity level of pd-token config

feat(OSD-19729): Enables ocm backplane login to set default namespace post-login

Signed-off-by: Ameya Sathe <asathe@redhat.com>

refactor(OSD-19729): Removes unintended line
-Sorts the struct

Signed-off-by: Ameya Sathe <asathe@redhat.com>

docs(OSD-19729): For setting namespace as part of default context

Signed-off-by: Ameya Sathe <asathe@redhat.com>

refactor(OSD-19729): Removes whitespace

Signed-off-by: Ameya Sathe <asathe@redhat.com>

test(OSD-19729): Changes the assumed namespace

Signed-off-by: Ameya Sathe <asathe@redhat.com>

test(OSD-19729): Replaces instances of default with the openshift-backplane-sre namespace

Signed-off-by: Ameya Sathe <asathe@redhat.com>

test(OSD-19729): Hardcodes value of namespace ( defaultNamespace ) into test files

Signed-off-by: Ameya Sathe <asathe@redhat.com>

Attempt to write a test case

Signed-off-by: Ameya Sathe <asathe@redhat.com>

test(OSD-19729): Fixes the test erorr reported for the test 'Login when cluster ID is not provided'
- string: default does not match the expected "string: openshift-backplane-srep"

Signed-off-by: Ameya Sathe <asathe@redhat.com>

style(OSD-19729): Accepts devppratik's suggestion provided at openshift#315 (comment)

Signed-off-by: Ameya Sathe <asathe@redhat.com>

OSD-19729: Malformed expression

Signed-off-by: Ameya Sathe <asathe@redhat.com>

feat(OSD-19729): Default behaviour is to not set a namespace at all

Signed-off-by: Ameya Sathe <asathe@redhat.com>

Bump github.com/aws/aws-sdk-go-v2/config from 1.27.7 to 1.27.9

Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.27.7 to 1.27.9.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.27.7...config/v1.27.9)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump github.com/openshift-online/ocm-sdk-go from 0.1.411 to 0.1.413

Bumps [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) from 0.1.411 to 0.1.413.
- [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases)
- [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md)
- [Commits](openshift-online/ocm-sdk-go@v0.1.411...v0.1.413)

---
updated-dependencies:
- dependency-name: github.com/openshift-online/ocm-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump github.com/onsi/gomega from 1.31.1 to 1.32.0

Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.31.1 to 1.32.0.
- [Release notes](https://github.com/onsi/gomega/releases)
- [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md)
- [Commits](onsi/gomega@v1.31.1...v1.32.0)

---
updated-dependencies:
- dependency-name: github.com/onsi/gomega
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

make the testjob source dir configurable

refactor(OSD-19729): Assumes 'default' namespace as fallback mechanism in case string is not passed as an argument

Signed-off-by: Ameya Sathe <asathe@redhat.com>

Bump github.com/aws/aws-sdk-go-v2/config from 1.27.9 to 1.27.10

Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.27.9 to 1.27.10.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.27.9...config/v1.27.10)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump sigs.k8s.io/kustomize/api from 0.15.0 to 0.16.0

Bumps [sigs.k8s.io/kustomize/api](https://github.com/kubernetes-sigs/kustomize) from 0.15.0 to 0.16.0.
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](kubernetes-sigs/kustomize@api/v0.15.0...api/v0.16.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/kustomize/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Use md5 hash for session name when assuming Org Role in new backplane flow

Update dockerfile to exclude all arch binaries

test(OSD-19729): Validates the argument satisfies Kubernetes namespace rules

Signed-off-by: Ameya Sathe <asathe@redhat.com>

Bump github.com/aws/aws-sdk-go-v2/config from 1.27.10 to 1.27.11

Bumps [github.com/aws/aws-sdk-go-v2/config](https://github.com/aws/aws-sdk-go-v2) from 1.27.10 to 1.27.11.
- [Release notes](https://github.com/aws/aws-sdk-go-v2/releases)
- [Commits](aws/aws-sdk-go-v2@config/v1.27.10...config/v1.27.11)

---
updated-dependencies:
- dependency-name: github.com/aws/aws-sdk-go-v2/config
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump ubi8/ubi from 8.9-1136 to 8.9-1160

Bumps ubi8/ubi from 8.9-1136 to 8.9-1160.

---
updated-dependencies:
- dependency-name: ubi8/ubi
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump github.com/openshift-online/ocm-sdk-go from 0.1.413 to 0.1.414

Bumps [github.com/openshift-online/ocm-sdk-go](https://github.com/openshift-online/ocm-sdk-go) from 0.1.413 to 0.1.414.
- [Release notes](https://github.com/openshift-online/ocm-sdk-go/releases)
- [Changelog](https://github.com/openshift-online/ocm-sdk-go/blob/main/CHANGES.md)
- [Commits](openshift-online/ocm-sdk-go@v0.1.413...v0.1.414)

---
updated-dependencies:
- dependency-name: github.com/openshift-online/ocm-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

OSD-21419: Fixed console container cleanup issues

refactor(OSD-19729): fewer variable assignments

Accepted suggestion of supreeth.

Co-authored-by: Supreeth Basabattini <sbasabat@redhat.com>

refactor(OSD-19729): Making it more generic

because backplane is used by different personas, including SRE, TAMs etc.

Co-authored-by: Supreeth Basabattini <sbasabat@redhat.com>

refactor(OSD-19729): only be logged if args.defaultNamespace!="default"

Signed-off-by: Ameya Sathe <asathe@redhat.com>

Bump sigs.k8s.io/kustomize/api from 0.16.0 to 0.17.1

Bumps [sigs.k8s.io/kustomize/api](https://github.com/kubernetes-sigs/kustomize) from 0.16.0 to 0.17.1.
- [Release notes](https://github.com/kubernetes-sigs/kustomize/releases)
- [Commits](kubernetes-sigs/kustomize@api/v0.16.0...api/v0.17.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/kustomize/api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Bump golang.org/x/term from 0.18.0 to 0.19.0

Bumps [golang.org/x/term](https://github.com/golang/term) from 0.18.0 to 0.19.0.
- [Commits](golang/term@v0.18.0...v0.19.0)

---
updated-dependencies:
- dependency-name: golang.org/x/term
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants