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

tsh Profile SSH certs fix #6214

Merged
merged 6 commits into from
Mar 30, 2021
Merged

tsh Profile SSH certs fix #6214

merged 6 commits into from
Mar 30, 2021

Conversation

Joerger
Copy link
Contributor

@Joerger Joerger commented Mar 30, 2021

Fix invisible merge conflict. The reading side of tsh Profiles (refactored in #5993) needs the new SSH cert paths (#5938).

TODO: Add better tests for Read/Write of tsh profiles in main lib to catch issues like this.

@Joerger Joerger requested review from andrejtokarcik and awly March 30, 2021 00:30
@Joerger Joerger force-pushed the joerger/profile-ssh-certs-fix branch from caebc62 to 02f8f7c Compare March 30, 2021 00:31
@Joerger Joerger force-pushed the joerger/profile-ssh-certs-fix branch from 02f8f7c to d2bff6e Compare March 30, 2021 00:45
@Joerger Joerger enabled auto-merge (squash) March 30, 2021 16:33
Joerger and others added 2 commits March 30, 2021 09:37
@Joerger Joerger requested a review from r0mant March 30, 2021 18:00
@Joerger Joerger disabled auto-merge March 30, 2021 18:01
@Joerger Joerger enabled auto-merge (squash) March 30, 2021 19:00
@Joerger Joerger merged commit ee57e53 into master Mar 30, 2021
@Joerger Joerger deleted the joerger/profile-ssh-certs-fix branch March 30, 2021 19:10
awly pushed a commit that referenced this pull request Mar 30, 2021
awly pushed a commit that referenced this pull request Mar 30, 2021
pierrebeaucamp pushed a commit that referenced this pull request Mar 31, 2021
…e/dynamodb-gsi-autoscaling

* 'master' of github.com:gravitational/teleport: (41 commits)
  Refactor ssh.ClientConfig used by tctl and API clients to use the first valid principal as User.
  Update Architecture Overview With Link To User Roles (#6224)
  Add `lint-api` target and fix lint errors (#6169)
  ssh: fix relogin with jumphosts (#6213)
  drone: use emptyDir for /var/lib/docker filesystem and prevent repetitive docker pulls (#6145)
  Remove ARM64 FIPS builds (#6236)
  tsh Profile SSH certs fix (#6214)
  mfa: fix gRPC unimplemented check in cert reissue
  Open Sources Access Controls Docs (#6188) (#6217)
  add PAM environment with interpolation support
  Cache per-cluster SSH certificates under ~/.tsh (#5938)
  add special resource type for access plugin data
  Enable DynamoDB autoscaling on global secondary indices (#6112)
  darwin fips builds (#5866)
  kube: add kubernetes_labels to role JSON schema
  mfa: send username instead of SSH login name in MFA cert request
  fix nil slice bug
  RFD 16: Add a section on `tctl rm` resetting resources back to defaults (#5673)
  Update application access docs (#6055) (#6137)
  Bump linux FIPS builds to use go1.16.2b7 release (#6143)
  ...
@Joerger Joerger mentioned this pull request May 13, 2021
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.

4 participants