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

Update return block documentation for rds modules #2156

Conversation

GomathiselviS
Copy link
Collaborator

SUMMARY

Refer: https://issues.redhat.com/browse/ACA-1484

This PR updates the return block in the rds module documentation.

ISSUE TYPE
  • Docs Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION

Copy link
Contributor

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/ansible-collections/amazon.aws for 2156,6d76fb9c9c2945aadda2924f4dcdc973baf9b147

Copy link
Collaborator

@alinabuzachis alinabuzachis left a comment

Choose a reason for hiding this comment

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

Can you also please update description of returned values to end with a period. Thanks.

description: ID of VPC containing the DB
returned: always
type: str
sample: vpc-abcd1234
cluster_snapshots:
description: List of cluster snapshots
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
description: List of cluster snapshots
description: List of cluster snapshots.

@@ -200,32 +90,32 @@
description: Date and time the cluster was created
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
description: Date and time the cluster was created
description: Date and time the cluster was created.

@@ -200,32 +90,32 @@
description: Date and time the cluster was created
returned: always
type: str
sample: '2018-05-17T00:13:40.223000+00:00'
sample: "2018-05-17T00:13:40.223000+00:00"
db_cluster_identifier:
description: Database cluster identifier
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
description: Database cluster identifier
description: Database cluster identifier.

db_cluster_identifier:
description: Database cluster identifier
returned: always
type: str
sample: test-aurora-cluster
sample: "test-aurora-cluster"
db_cluster_snapshot_arn:
description: ARN of the database snapshot
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
description: ARN of the database snapshot
description: ARN of the database snapshot.

db_cluster_snapshot_arn:
description: ARN of the database snapshot
returned: always
type: str
sample: arn:aws:rds:ca-central-1:123456789012:cluster-snapshot:test-aurora-snapshot
sample: "arn:aws:rds:ca-central-1:123456789012:cluster-snapshot:test-aurora-snapshot"
db_cluster_snapshot_identifier:
description: Snapshot identifier
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
description: Snapshot identifier
description: Snapshot identifier.

db_cluster_snapshot_identifier:
description: Snapshot identifier
returned: always
type: str
sample: test-aurora-snapshot
sample: "test-aurora-snapshot"
engine:
description: Database engine
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
description: Database engine
description: Database engine.

Copy link

github-actions bot commented Jul 1, 2024

Docs Build 📝

Thank you for contribution!✨

This PR has been merged and your docs changes will be incorporated when they are next published.

Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/78f1025cfba846a0b9a3881112a9f9bd

✔️ ansible-galaxy-importer SUCCESS in 3m 21s
✔️ build-ansible-collection SUCCESS in 12m 37s
✔️ ansible-test-splitter SUCCESS in 5m 03s
✔️ integration-amazon.aws-1 SUCCESS in 37m 23s
✔️ integration-amazon.aws-2 SUCCESS in 9m 59s
✔️ integration-amazon.aws-3 SUCCESS in 8m 42s
✔️ integration-amazon.aws-4 SUCCESS in 13m 50s
✔️ integration-amazon.aws-5 SUCCESS in 17m 14s
✔️ integration-amazon.aws-6 SUCCESS in 11m 26s
✔️ integration-amazon.aws-7 SUCCESS in 16m 05s
✔️ integration-amazon.aws-8 SUCCESS in 6m 07s
Skipped 36 jobs

@GomathiselviS GomathiselviS added the mergeit Merge the PR (SoftwareFactory) label Jul 1, 2024
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/3851c72f3c344c3a896dd6148b12c107

✔️ ansible-galaxy-importer SUCCESS in 4m 36s
✔️ build-ansible-collection SUCCESS in 12m 14s
✔️ ansible-test-splitter SUCCESS in 4m 56s
✔️ integration-amazon.aws-1 SUCCESS in 33m 31s
✔️ integration-amazon.aws-2 SUCCESS in 11m 39s
✔️ integration-amazon.aws-3 SUCCESS in 9m 06s
✔️ integration-amazon.aws-4 SUCCESS in 11m 49s
✔️ integration-amazon.aws-5 SUCCESS in 15m 48s
✔️ integration-amazon.aws-6 SUCCESS in 8m 15s
✔️ integration-amazon.aws-7 SUCCESS in 18m 52s
✔️ integration-amazon.aws-8 SUCCESS in 6m 01s
Skipped 36 jobs

Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/29df96e3806a43958f41f1293b6c0a76

✔️ ansible-galaxy-importer SUCCESS in 4m 31s
✔️ build-ansible-collection SUCCESS in 12m 15s
✔️ ansible-test-splitter SUCCESS in 4m 51s
✔️ integration-amazon.aws-1 SUCCESS in 34m 32s
✔️ integration-amazon.aws-2 SUCCESS in 9m 42s
✔️ integration-amazon.aws-3 SUCCESS in 8m 19s
✔️ integration-amazon.aws-4 SUCCESS in 16m 31s
✔️ integration-amazon.aws-5 SUCCESS in 14m 54s
✔️ integration-amazon.aws-6 SUCCESS in 8m 20s
✔️ integration-amazon.aws-7 SUCCESS in 15m 24s
✔️ integration-amazon.aws-8 SUCCESS in 9m 16s
Skipped 36 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 8d37698 into ansible-collections:main Jul 1, 2024
36 checks passed
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Jul 2, 2024
…s#2156)

SUMMARY


Refer: https://issues.redhat.com/browse/ACA-1484
This PR updates the return block in the rds module documentation.
ISSUE TYPE


Docs Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis
Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Helen Bailey <[email protected]>
@tremble tremble added the backport-8 PR should be backported to the stable-8 branch label Aug 27, 2024
Copy link

patchback bot commented Aug 27, 2024

Backport to stable-8: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 8d37698 on top of patchback/backports/stable-8/8d376986155cad278e96c449d8901dc4238af117/pr-2156

Backporting merged PR #2156 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/amazon.aws.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-8/8d376986155cad278e96c449d8901dc4238af117/pr-2156 upstream/stable-8
  4. Now, cherry-pick PR Update return block documentation for rds modules #2156 contents into that branch:
    $ git cherry-pick -x 8d376986155cad278e96c449d8901dc4238af117
    If it'll yell at you with something like fatal: Commit 8d376986155cad278e96c449d8901dc4238af117 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 8d376986155cad278e96c449d8901dc4238af117
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Update return block documentation for rds modules #2156 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-8/8d376986155cad278e96c449d8901dc4238af117/pr-2156
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@tremble tremble added backport-8 PR should be backported to the stable-8 branch and removed backport-8 PR should be backported to the stable-8 branch labels Aug 27, 2024
Copy link

patchback bot commented Aug 27, 2024

Backport to stable-8: 💚 backport PR created

✅ Backport PR branch: patchback/backports/stable-8/8d376986155cad278e96c449d8901dc4238af117/pr-2156

Backported as #2240

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Aug 27, 2024
SUMMARY

Refer: https://issues.redhat.com/browse/ACA-1484
This PR updates the return block in the rds module documentation.
ISSUE TYPE

Docs Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis
Reviewed-by: Mike Graves <[email protected]>
Reviewed-by: Helen Bailey <[email protected]>
(cherry picked from commit 8d37698)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Aug 27, 2024
This is a backport of PR #2156 as merged into main (8d37698).
SUMMARY


Refer: https://issues.redhat.com/browse/ACA-1484
This PR updates the return block in the rds module documentation.
ISSUE TYPE


Docs Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Mark Chappell
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Oct 26, 2024
SUMMARY
There are some inaccuracies and inconsistencies in the documentation for rds_snapshot_info - specifically, missing return types and fields. This PR corrects these issues, and updates their descriptions to more closely mirror the official AWS documentation.
ISSUE TYPE

Docs Pull Request

COMPONENT NAME
rds_snapshot_info
ADDITIONAL INFORMATION
The documentation for rds_snapshot_info show that the module returns cluster_snapshots, but this is only true when db_cluster_identifier or db_cluster_snapshot_identifier is defined. The module returns snapshots when db_snapshot_identifier or db_instance_identifier is defined instead. This appears to have been introduced in amazon.aws 8.2.0 (specifically, PR #2156 - I have mirrored many of the formatting changes done in that PR when re-adding the snapshots object).
Several fields were also missing from the return objects for both snapshots and cluster_snapshots, so those have been added. Some descriptions also varied for identical fields in snapshots and cluster_snapshots, so all descriptions have been updated to match the AWS CLI documentation pages for describe-db-snapshots and describe-db-cluster-snapshots.

Reviewed-by: Alina Buzachis
Reviewed-by: Mark Chappell
patchback bot pushed a commit that referenced this pull request Jan 8, 2025
SUMMARY
There are some inaccuracies and inconsistencies in the documentation for rds_snapshot_info - specifically, missing return types and fields. This PR corrects these issues, and updates their descriptions to more closely mirror the official AWS documentation.
ISSUE TYPE

Docs Pull Request

COMPONENT NAME
rds_snapshot_info
ADDITIONAL INFORMATION
The documentation for rds_snapshot_info show that the module returns cluster_snapshots, but this is only true when db_cluster_identifier or db_cluster_snapshot_identifier is defined. The module returns snapshots when db_snapshot_identifier or db_instance_identifier is defined instead. This appears to have been introduced in amazon.aws 8.2.0 (specifically, PR #2156 - I have mirrored many of the formatting changes done in that PR when re-adding the snapshots object).
Several fields were also missing from the return objects for both snapshots and cluster_snapshots, so those have been added. Some descriptions also varied for identical fields in snapshots and cluster_snapshots, so all descriptions have been updated to match the AWS CLI documentation pages for describe-db-snapshots and describe-db-cluster-snapshots.

Reviewed-by: Alina Buzachis
Reviewed-by: Mark Chappell
(cherry picked from commit 786c4b7)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Jan 8, 2025
This is a backport of PR #2354 as merged into main (786c4b7).
SUMMARY
There are some inaccuracies and inconsistencies in the documentation for rds_snapshot_info - specifically, missing return types and fields. This PR corrects these issues, and updates their descriptions to more closely mirror the official AWS documentation.
ISSUE TYPE

Docs Pull Request

COMPONENT NAME
rds_snapshot_info
ADDITIONAL INFORMATION
The documentation for rds_snapshot_info show that the module returns cluster_snapshots, but this is only true when db_cluster_identifier or db_cluster_snapshot_identifier is defined. The module returns snapshots when db_snapshot_identifier or db_instance_identifier is defined instead. This appears to have been introduced in amazon.aws 8.2.0 (specifically, PR #2156 - I have mirrored many of the formatting changes done in that PR when re-adding the snapshots object).
Several fields were also missing from the return objects for both snapshots and cluster_snapshots, so those have been added. Some descriptions also varied for identical fields in snapshots and cluster_snapshots, so all descriptions have been updated to match the AWS CLI documentation pages for describe-db-snapshots and describe-db-cluster-snapshots.

Reviewed-by: Helen Bailey <[email protected]>
Reviewed-by: Bikouo Aubin
Reviewed-by: GomathiselviS <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-8 PR should be backported to the stable-8 branch mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants