Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 5b6912c

Browse files
bstasyszynbstasyszyn
authored
[FABG-1020] Changed lifecycle payloads to use camel-case in JSON fields (#154)
Updated the lifecycle structs to use camel-case in JSON responses since most style guides recommend using camel-case instead of snake-case. Signed-off-by: Bob Stasyszyn <[email protected]>
1 parent 2f93a32 commit 5b6912c

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎pkg/client/resmgmt/lifecycleclient.go

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type LifecycleInstallCCRequest struct {
2929
type LifecycleInstallCCResponse struct {
3030
Target string `json:"target,omitempty"`
3131
Status int32 `json:"status,omitempty"`
32-
PackageID string `json:"package_id,omitempty"`
32+
PackageID string `json:"packageID,omitempty"`
3333
}
3434

3535
// CCReference contains the name and version of an instantiated chaincode that
@@ -43,7 +43,7 @@ type CCReference struct {
4343
// including a map of channel name to chaincode name and version
4444
// pairs of chaincode definitions that reference this chaincode package.
4545
type LifecycleInstalledCC struct {
46-
PackageID string `json:"package_id,omitempty"`
46+
PackageID string `json:"packageID,omitempty"`
4747
Label string `json:"label,omitempty"`
4848
References map[string][]CCReference `json:"references,omitempty"`
4949
}
@@ -52,14 +52,14 @@ type LifecycleInstalledCC struct {
5252
type LifecycleApproveCCRequest struct {
5353
Name string `json:"name,omitempty"`
5454
Version string `json:"version,omitempty"`
55-
PackageID string `json:"package_id,omitempty"`
55+
PackageID string `json:"packageID,omitempty"`
5656
Sequence int64 `json:"sequence,omitempty"`
57-
EndorsementPlugin string `json:"endorsement_plugin,omitempty"`
58-
ValidationPlugin string `json:"validation_plugin,omitempty"`
59-
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signature_policy,omitempty"`
60-
ChannelConfigPolicy string `json:"channel_config_policy,omitempty"`
61-
CollectionConfig []*pb.CollectionConfig `json:"collection_config,omitempty"`
62-
InitRequired bool `json:"init_required,omitempty"`
57+
EndorsementPlugin string `json:"endorsementPlugin,omitempty"`
58+
ValidationPlugin string `json:"validationPlugin,omitempty"`
59+
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signaturePolicy,omitempty"`
60+
ChannelConfigPolicy string `json:"channelConfigPolicy,omitempty"`
61+
CollectionConfig []*pb.CollectionConfig `json:"collectionConfig,omitempty"`
62+
InitRequired bool `json:"initRequired,omitempty"`
6363
}
6464

6565
// LifecycleQueryApprovedCCRequest contains the parameters for querying approved chaincodes
@@ -73,26 +73,26 @@ type LifecycleApprovedChaincodeDefinition struct {
7373
Name string `json:"name,omitempty"`
7474
Version string `json:"version,omitempty"`
7575
Sequence int64 `json:"sequence,omitempty"`
76-
EndorsementPlugin string `json:"endorsement_plugin,omitempty"`
77-
ValidationPlugin string `json:"validation_plugin,omitempty"`
78-
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signature_policy,omitempty"`
79-
ChannelConfigPolicy string `json:"channel_config_policy,omitempty"`
80-
CollectionConfig []*pb.CollectionConfig `json:"collection_config,omitempty"`
81-
InitRequired bool `json:"init_required,omitempty"`
82-
PackageID string `json:"package_id,omitempty"`
76+
EndorsementPlugin string `json:"endorsementPlugin,omitempty"`
77+
ValidationPlugin string `json:"validationPlugin,omitempty"`
78+
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signaturePolicy,omitempty"`
79+
ChannelConfigPolicy string `json:"channelConfigPolicy,omitempty"`
80+
CollectionConfig []*pb.CollectionConfig `json:"collectionConfig,omitempty"`
81+
InitRequired bool `json:"initRequired,omitempty"`
82+
PackageID string `json:"packageID,omitempty"`
8383
}
8484

8585
// LifecycleCheckCCCommitReadinessRequest contains the parameters for checking the 'commit readiness' of a chaincode
8686
type LifecycleCheckCCCommitReadinessRequest struct {
8787
Name string `json:"name,omitempty"`
8888
Version string `json:"version,omitempty"`
8989
Sequence int64 `json:"sequence,omitempty"`
90-
EndorsementPlugin string `json:"endorsement_plugin,omitempty"`
91-
ValidationPlugin string `json:"validation_plugin,omitempty"`
92-
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signature_policy,omitempty"`
93-
ChannelConfigPolicy string `json:"channel_config_policy,omitempty"`
94-
CollectionConfig []*pb.CollectionConfig `json:"collection_config,omitempty"`
95-
InitRequired bool `json:"init_required,omitempty"`
90+
EndorsementPlugin string `json:"endorsementPlugin,omitempty"`
91+
ValidationPlugin string `json:"validationPlugin,omitempty"`
92+
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signaturePolicy,omitempty"`
93+
ChannelConfigPolicy string `json:"channelConfigPolicy,omitempty"`
94+
CollectionConfig []*pb.CollectionConfig `json:"collectionConfig,omitempty"`
95+
InitRequired bool `json:"initRequired,omitempty"`
9696
}
9797

9898
// LifecycleCheckCCCommitReadinessResponse contains the org approvals for the chaincode
@@ -105,12 +105,12 @@ type LifecycleCommitCCRequest struct {
105105
Name string `json:"name,omitempty"`
106106
Version string `json:"version,omitempty"`
107107
Sequence int64 `json:"sequence,omitempty"`
108-
EndorsementPlugin string `json:"endorsement_plugin,omitempty"`
109-
ValidationPlugin string `json:"validation_plugin,omitempty"`
110-
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signature_policy,omitempty"`
111-
ChannelConfigPolicy string `json:"channel_config_policy,omitempty"`
112-
CollectionConfig []*pb.CollectionConfig `json:"collection_config,omitempty"`
113-
InitRequired bool `json:"init_required,omitempty"`
108+
EndorsementPlugin string `json:"endorsementPlugin,omitempty"`
109+
ValidationPlugin string `json:"validationPlugin,omitempty"`
110+
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signaturePolicy,omitempty"`
111+
ChannelConfigPolicy string `json:"channelConfigPolicy,omitempty"`
112+
CollectionConfig []*pb.CollectionConfig `json:"collectionConfig,omitempty"`
113+
InitRequired bool `json:"initRequired,omitempty"`
114114
}
115115

116116
// LifecycleQueryCommittedCCRequest contains the parameters to query committed chaincodes.
@@ -126,12 +126,12 @@ type LifecycleChaincodeDefinition struct {
126126
Name string `json:"name,omitempty"`
127127
Version string `json:"version,omitempty"`
128128
Sequence int64 `json:"sequence,omitempty"`
129-
EndorsementPlugin string `json:"endorsement_plugin,omitempty"`
130-
ValidationPlugin string `json:"validation_plugin,omitempty"`
131-
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signature_policy,omitempty"`
132-
ChannelConfigPolicy string `json:"channel_config_policy,omitempty"`
133-
CollectionConfig []*pb.CollectionConfig `json:"collection_config,omitempty"`
134-
InitRequired bool `json:"init_required,omitempty"`
129+
EndorsementPlugin string `json:"endorsementPlugin,omitempty"`
130+
ValidationPlugin string `json:"validationPlugin,omitempty"`
131+
SignaturePolicy *common.SignaturePolicyEnvelope `json:"signaturePolicy,omitempty"`
132+
ChannelConfigPolicy string `json:"channelConfigPolicy,omitempty"`
133+
CollectionConfig []*pb.CollectionConfig `json:"collectionConfig,omitempty"`
134+
InitRequired bool `json:"initRequired,omitempty"`
135135
Approvals map[string]bool `json:"approvals,omitempty"`
136136
}
137137

0 commit comments

Comments
 (0)