VLTCLT-51 Add client method to get or create encryption key id #447

nicolas2bert · 2024-09-26T08:38:19Z

No description provided.

bert-e · 2024-09-26T08:38:23Z

Hello nicolas2bert,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options

name	description	privileged	authored
`/after_pull_request`	Wait for the given pull request id to be merged before continuing with the current one.
`/bypass_author_approval`	Bypass the pull request author's approval	⭐
`/bypass_build_status`	Bypass the build and test status	⭐
`/bypass_commit_size`	Bypass the check on the size of the changeset `TBA`	⭐
`/bypass_incompatible_branch`	Bypass the check on the source branch prefix	⭐
`/bypass_jira_check`	Bypass the Jira issue check	⭐
`/bypass_peer_approval`	Bypass the pull request peers' approval	⭐
`/bypass_leader_approval`	Bypass the pull request leaders' approval	⭐
`/approve`	Instruct Bert-E that the author has approved the pull request.		✍️
`/create_pull_requests`	Allow the creation of integration pull requests.
`/create_integration_branches`	Allow the creation of integration branches.
`/no_octopus`	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
`/unanimity`	Change review acceptance criteria from `one reviewer at least` to `all reviewers`
`/wait`	Instruct Bert-E not to run until further notice.

Available commands

name	description	privileged
`/help`	Print Bert-E's manual in the pull request.
`/status`	Print Bert-E's current status in the pull request `TBA`
`/clear`	Remove all comments from Bert-E from the history `TBA`
`/retry`	Re-start a fresh build `TBA`
`/build`	Re-start a fresh build `TBA`
`/force_reset`	Delete integration branches & pull requests, and restart merge process from the beginning.
`/reset`	Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

bert-e · 2024-09-26T08:38:27Z

Incorrect fix version

The Fix Version/s in issue VLTCLT-51 contains:

None

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

7.10.15
8.2.10
8.3.21
8.4.1
8.5.1

Please check the Fix Version/s of VLTCLT-51, or the target
branch of this pull request.

nicolas2bert · 2024-09-30T10:56:20Z

ping

bert-e · 2024-09-30T10:56:28Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

dvasilas · 2024-09-30T11:14:21Z

lib/IAMClient.js

+            Action: 'GetOrCreateEncryptionKeyId',
+            canonicalId,
+        };
+        this.request('POST', '/', false, (err, data, code) => {


Is a POST to / doing what we want to do here? 🤔

Yes, :) It uses an RPC (remote procedure call) protocol. All actions are sent to a single endpoint '/' and the payload specifies the action to do:

const data = { Action: 'GetOrCreateEncryptionKeyId', canonicalId, };

Ooh I see. I'm not familiar with the vault API and I assumed it uses HTTP routes.

This action doesn't exist for now I think

lib/IAMClient.js

nicolas2bert · 2024-10-01T16:03:17Z

/create_integration_branches

bert-e · 2024-10-01T16:03:26Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId with contents from improvement/VLTCLT-51/getOrCreateEncryptionKeyId
and development/8.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId origin/development/8.2
 $ git merge origin/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId

The following options are set: create_integration_branches

nicolas2bert · 2024-10-01T16:05:49Z

@bert-e approve

bert-e · 2024-10-01T16:05:59Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/VLTCLT-51/getOrCreateEncryptionKeyId into
development/7.10
w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.2
w/8.3/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.3
w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.4
w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.5

The following branches will NOT be impacted:

development/6.4
development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:06:45Z

Build failed

The build for commit did not succeed in branch w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:09:25Z

History mismatch

Merge commit #da3f8db2c20f35eacc6961b29ae64ea07470ac01 on the integration branch
w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId is merging a branch which is neither the current
branch improvement/VLTCLT-51/getOrCreateEncryptionKeyId nor the development branch
development/8.2.

It is likely due to a rebase of the branch improvement/VLTCLT-51/getOrCreateEncryptionKeyId and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve, create_integration_branches

nicolas2bert · 2024-10-01T16:12:13Z

@bert-e reset

bert-e · 2024-10-01T16:12:22Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:12:30Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId with contents from improvement/VLTCLT-51/getOrCreateEncryptionKeyId
and development/8.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId origin/development/8.2
 $ git merge origin/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId

The following options are set: approve, create_integration_branches

nicolas2bert · 2024-10-01T16:14:32Z

ping

bert-e · 2024-10-01T16:14:44Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/VLTCLT-51/getOrCreateEncryptionKeyId into
development/7.10
w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.2
w/8.3/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.3
w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.4
w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.5

The following branches will NOT be impacted:

development/6.4
development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:15:33Z

Build failed

The build for commit did not succeed in branch w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:16:30Z

Build failed

The build for commit did not succeed in branch w/8.3/improvement/VLTCLT-51/getOrCreateEncryptionKeyId.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:18:58Z

History mismatch

Merge commit #855eacf2781557ffcaeef7543434873ce066fb3a on the integration branch
w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId is merging a branch which is neither the current
branch improvement/VLTCLT-51/getOrCreateEncryptionKeyId nor the development branch
development/8.2.

It is likely due to a rebase of the branch improvement/VLTCLT-51/getOrCreateEncryptionKeyId and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: approve, create_integration_branches

nicolas2bert · 2024-10-01T16:19:20Z

@bert-e reset

bert-e · 2024-10-01T16:19:26Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:19:33Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId with contents from improvement/VLTCLT-51/getOrCreateEncryptionKeyId
and development/8.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId origin/development/8.2
 $ git merge origin/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId

The following options are set: approve, create_integration_branches

nicolas2bert · 2024-10-01T16:21:10Z

ping

nicolas2bert · 2024-10-01T16:21:43Z

@bert-e reset

bert-e · 2024-10-01T16:21:48Z

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:21:56Z

Conflict

A conflict has been raised during the creation of
integration branch w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId with contents from improvement/VLTCLT-51/getOrCreateEncryptionKeyId
and development/8.2.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId origin/development/8.2
 $ git merge origin/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:38:47Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/VLTCLT-51/getOrCreateEncryptionKeyId into
development/7.10
w/8.2/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.2
w/8.3/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.3
w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.4
w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId will be merged into development/8.5

The following branches will NOT be impacted:

development/6.4
development/7.4

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:39:31Z

Build failed

The build for commit did not succeed in branch w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T16:40:31Z

Build failed

The build for commit did not succeed in branch w/8.3/improvement/VLTCLT-51/getOrCreateEncryptionKeyId.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T17:05:49Z

Conflict

A conflict has been raised during the update of
integration branch w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId with contents from w/8.3/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
and development/8.4.

Please resolve the conflict on the integration branch (w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
 $ git pull  # or "git reset --hard origin/w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId"
 $ git merge origin/development/8.4
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/8.3/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T17:09:17Z

Conflict

A conflict has been raised during the update of
integration branch w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId with contents from w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
and development/8.5.

Please resolve the conflict on the integration branch (w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId).

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
 $ git pull  # or "git reset --hard origin/w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId"
 $ git merge origin/development/8.5
 $ # <intense conflict resolution>
 $ git commit
 $ git merge origin/w/8.4/improvement/VLTCLT-51/getOrCreateEncryptionKeyId
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T17:12:51Z

Build failed

The build for commit did not succeed in branch w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T17:14:46Z

Build failed

The build for commit did not succeed in branch w/8.5/improvement/VLTCLT-51/getOrCreateEncryptionKeyId.

The following options are set: approve, create_integration_branches

bert-e · 2024-10-01T17:17:34Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/7.10
✔️ development/8.2
✔️ development/8.3
✔️ development/8.4
✔️ development/8.5

The following branches have NOT changed:

development/6.4
development/7.4

Please check the status of the associated issue VLTCLT-51.

Goodbye nicolas2bert.

The following options are set: approve, create_integration_branches

dvasilas reviewed Sep 30, 2024

View reviewed changes

nicolas2bert force-pushed the improvement/VLTCLT-51/getOrCreateEncryptionKeyId branch from 57cd75a to 01a4614 Compare September 30, 2024 13:26

BourgoisMickael reviewed Sep 30, 2024

View reviewed changes

lib/IAMClient.js Outdated Show resolved Hide resolved

BourgoisMickael approved these changes Sep 30, 2024

View reviewed changes

dvasilas approved these changes Sep 30, 2024

View reviewed changes

nicolas2bert force-pushed the improvement/VLTCLT-51/getOrCreateEncryptionKeyId branch from 01a4614 to da3f8db Compare October 1, 2024 16:01

nicolas2bert force-pushed the improvement/VLTCLT-51/getOrCreateEncryptionKeyId branch from da3f8db to 855eacf Compare October 1, 2024 16:09

nicolas2bert force-pushed the improvement/VLTCLT-51/getOrCreateEncryptionKeyId branch from 855eacf to e8e5b1c Compare October 1, 2024 16:18

VLTCLT-51 Add client method to get or create encryption key id

a4b098e

nicolas2bert force-pushed the improvement/VLTCLT-51/getOrCreateEncryptionKeyId branch from e8e5b1c to a4b098e Compare October 1, 2024 16:20

bert-e merged commit a4b098e into development/7.10 Oct 1, 2024
1 check passed

bert-e deleted the improvement/VLTCLT-51/getOrCreateEncryptionKeyId branch October 1, 2024 17:17

VLTCLT-51 Add client method to get or create encryption key id #447

VLTCLT-51 Add client method to get or create encryption key id #447

Conversation

nicolas2bert commented Sep 26, 2024

bert-e commented Sep 26, 2024

Hello nicolas2bert,

bert-e commented Sep 26, 2024

Incorrect fix version

nicolas2bert commented Sep 30, 2024

bert-e commented Sep 30, 2024

Request integration branches

dvasilas Sep 30, 2024

Choose a reason for hiding this comment

nicolas2bert Sep 30, 2024

Choose a reason for hiding this comment

dvasilas Sep 30, 2024

Choose a reason for hiding this comment

BourgoisMickael Sep 30, 2024

Choose a reason for hiding this comment

nicolas2bert commented Oct 1, 2024

bert-e commented Oct 1, 2024

Conflict

nicolas2bert commented Oct 1, 2024

bert-e commented Oct 1, 2024

Integration data created

bert-e commented Oct 1, 2024

Build failed

bert-e commented Oct 1, 2024

History mismatch

nicolas2bert commented Oct 1, 2024

bert-e commented Oct 1, 2024

Reset complete

bert-e commented Oct 1, 2024

Conflict

nicolas2bert commented Oct 1, 2024

bert-e commented Oct 1, 2024

Integration data created

bert-e commented Oct 1, 2024

Build failed

bert-e commented Oct 1, 2024

Build failed

bert-e commented Oct 1, 2024

History mismatch

nicolas2bert commented Oct 1, 2024

bert-e commented Oct 1, 2024

Reset complete

bert-e commented Oct 1, 2024

Conflict

nicolas2bert commented Oct 1, 2024

nicolas2bert commented Oct 1, 2024

bert-e commented Oct 1, 2024

Reset complete

bert-e commented Oct 1, 2024

Conflict

bert-e commented Oct 1, 2024

Integration data created

bert-e commented Oct 1, 2024

Build failed

bert-e commented Oct 1, 2024

Build failed

bert-e commented Oct 1, 2024

Conflict

bert-e commented Oct 1, 2024

Conflict

bert-e commented Oct 1, 2024

Build failed

bert-e commented Oct 1, 2024

Build failed

bert-e commented Oct 1, 2024