TrueCloudLab
/
frostfs-node
18
1
Fork 20
Code Issues 88 Pull Requests 8 Actions Releases Activity

adm: Use ContractStorageReader for reading methods #1009

Merged
fyrchik merged 1 commits from aarifullin/frostfs-node:fix/ape_read_withot_wallet into master 2024-03-05 12:34:56 +00:00
Conversation 0 Commits 1 Files Changed 4
aarifullin commented 2024-02-26 16:26:36 +00:00
Collaborator

Since ContractStorageReader was introduced, reader method like get-admin and list-rule-chains should use it. This allows to use methods without wallets

Since `ContractStorageReader` was introduced, reader method like `get-admin` and `list-rule-chains` should use it. **This allows to use methods without wallets**
aarifullin requested review from storage-core-committers 2024-02-26 16:27:52 +00:00
aarifullin requested review from storage-core-developers 2024-02-26 16:27:59 +00:00
fyrchik requested changes 2024-02-26 16:32:42 +00:00
cmd/frostfs-adm/internal/modules/morph/ape/ape_util.go Outdated
@ -97,2 +95,3 @@
var w *wallet.Wallet
committeeAcc, err := helper.GetWalletAccount(wallets[0], constants.CommitteeAccountName)
walletPath := viper.GetString(commonflags.AlphabetWalletsFlag)
fyrchik commented 2024-02-26 16:31:39 +00:00
Owner

We can have config file which contains endpoint in wallets.
I would rather provide an explicit option here or even split newPolicyContractInterface() into, the first one is called from read methods, and the second one (current) is called from other places.

We can have config file which contains endpoint in wallets. I would rather provide an explicit option here or even split `newPolicyContractInterface()` into, the first one is called from read methods, and the second one (current) is called from other places.
aarifullin commented 2024-02-27 09:00:04 +00:00
Poster
Collaborator

I have introduced newPolicyContractReaderInterface and used it for get-admin and list-targets

I have introduced `newPolicyContractReaderInterface` and used it for `get-admin` and `list-targets`
cmd/frostfs-adm/internal/modules/morph/ape/ape_util.go Outdated
@ -99,0 +104,4 @@
// TODO (aarifullin): this workaround that creates a dummy wallet is used to create
// Actor without alpabet wallet. It is necessary to get rid of this workaround
// when ContractStorageReader will be introduced in policy engine.
w = wallet.NewInMemoryWallet()
fyrchik commented 2024-02-26 16:32:38 +00:00
Owner

we can just use wallet.NewAccount() and use committeeAcc, err = helper.GetWalletAccount(w, constants.CommitteeAccountName) only inside the first branch

we can just use `wallet.NewAccount()` and use `committeeAcc, err = helper.GetWalletAccount(w, constants.CommitteeAccountName)` only inside the first branch
aarifullin commented 2024-02-27 09:00:10 +00:00
Poster
Collaborator

Fixed

Fixed
fyrchik marked this conversation as resolved
aarifullin changed title from adm: Make workarount for get-admin and list-rule-chains to adm: Make workaround for get-admin and list-rule-chains 2024-02-27 08:41:32 +00:00
aarifullin force-pushed fix/ape_read_withot_wallet from e743e65d2c to 7d5d11a2a8 2024-02-27 08:54:25 +00:00 Compare
aarifullin requested review from fyrchik 2024-02-27 09:44:50 +00:00
fyrchik approved these changes 2024-02-28 18:59:34 +00:00
aarifullin force-pushed fix/ape_read_withot_wallet from 7d5d11a2a8 to 2fa24dfcda 2024-02-29 08:18:00 +00:00 Compare
aarifullin requested review from fyrchik 2024-02-29 08:18:32 +00:00
aarifullin force-pushed fix/ape_read_withot_wallet from 2fa24dfcda to afccd2dfc8 2024-03-05 07:56:37 +00:00 Compare
fyrchik approved these changes 2024-03-05 07:57:19 +00:00
aarifullin changed title from adm: Make workaround for get-admin and list-rule-chains to adm: Use ContractStorageReader for reading methods 2024-03-05 07:57:33 +00:00
fyrchik added the
bug
 label 2024-03-05 07:57:51 +00:00
fyrchik added this to the v0.38.0 milestone 2024-03-05 07:57:56 +00:00
acid-ant approved these changes 2024-03-05 08:14:00 +00:00
fyrchik approved these changes 2024-03-05 08:15:02 +00:00
fyrchik added the
frostfs-adm
 label 2024-03-05 08:15:16 +00:00
dstepanov-yadro approved these changes 2024-03-05 08:21:05 +00:00
fyrchik merged commit b84cf91f73 into master 2024-03-05 12:34:56 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
acid-ant
fyrchik
dstepanov-yadro
TrueCloudLab/storage-core-developers
Labels
Clear labels   
P0

Highest   
P1

High   
P2

Medium   
P3

Low   
badger

Badger DB related issues   
frostfs-adm
   
frostfs-cli
   
frostfs-ir
   
frostfs-lens
   
frostfs-node
   
good first issue

Good for newcomers   
triage
  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff   
blocked

The issue or PR is blocked by something   
bug

Something is not working   
config

Configuration format update or breaking change   
discussion

Talking about something in order to reach a decision or to exchange ideas   
documentation

Documentation related   
duplicate

This issue or pull request already exists   
enhancement

New feature   
go

Language features adoption   
help wanted

Extra attention is needed   
internal
   
invalid

Something is wrong   
kludge

This is a kludge and we know it   
observability

Related to metrics, tracing and logs   
perfomance

Perfomance related   
question

More information is needed   
refactoring

Refactoring   
wontfix

This won't be fixed
No Label
P0
P1
P2
P3
badger
frostfs-adm
frostfs-cli
frostfs-ir
frostfs-lens
frostfs-node
good first issue
triage
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No Milestone
v0.38.0
Assignees
Clear assignees
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-node#1009
There is no content yet.
Delete Branch "aarifullin/frostfs-node:fix/ape_read_withot_wallet"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?