Skip to content

[v15] Change the tctl format for database_object_import_rule resource#40203

Merged
Tener merged 4 commits intobranch/v15from
tener/v15/backport-39764
Apr 17, 2024
Merged

[v15] Change the tctl format for database_object_import_rule resource#40203
Tener merged 4 commits intobranch/v15from
tener/v15/backport-39764

Conversation

@Tener
Copy link
Copy Markdown
Contributor

@Tener Tener commented Apr 4, 2024

Backport #39764 to v15.

Changelog: Fixed incorrect format for database_object_import_rule resources with non-empty expiry.

…39764)

* Fix incorrect expiry when using resource153ToLegacyAdapter

* Change the `tctl` format for database_object_import_rule resource.

Prior to this change the resource wouldn't round-trip through `tctl get ... | tctl create` because of header incompatibilities.

In general, all resources must be compatible with services.UnknownResource for their `tctl` storage format.

* Lint fix
@github-actions github-actions Bot requested review from rudream and strideynet April 4, 2024 12:22
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Apr 4, 2024

The PR changelog entry failed validation: Changelog entry not found in the PR body. Please add a "no-changelog" label to the PR, or changelog lines starting with changelog: followed by the changelog entries for the PR.

@github-actions github-actions Bot added backport size/sm tctl tctl - Teleport admin tool labels Apr 4, 2024
@Tener
Copy link
Copy Markdown
Contributor Author

Tener commented Apr 4, 2024

Manual merge due to conflicts in:

  • tool/tctl/common/collection.go
  • tool/tctl/common/resource_command.go
  • tool/tctl/common/resource_command_test.go

@Tener
Copy link
Copy Markdown
Contributor Author

Tener commented Apr 15, 2024

@rudream PTAL

@public-teleport-github-review-bot public-teleport-github-review-bot Bot removed the request for review from rudream April 17, 2024 07:51
@Tener Tener added this pull request to the merge queue Apr 17, 2024
Merged via the queue into branch/v15 with commit d39661d Apr 17, 2024
@Tener Tener deleted the tener/v15/backport-39764 branch April 17, 2024 10:34
@camscale camscale mentioned this pull request Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport size/sm tctl tctl - Teleport admin tool

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants