Skip to content

Commit 9ceba1c

Browse files
authored
Url validations update (#604)
Url validations update
1 parent 67e912c commit 9ceba1c

File tree

7 files changed

+303
-292
lines changed

7 files changed

+303
-292
lines changed

proto/zigbeealliance/distributedcomplianceledger/model/tx.proto

+14-14
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ message MsgCreateModel {
3131
string productLabel = 6 [(gogoproto.moretags) = "validate:\"max=256\""];
3232
string partNumber = 7 [(gogoproto.moretags) = "validate:\"max=32\""];
3333
int32 commissioningCustomFlow = 8 [(gogoproto.moretags) = "validate:\"gte=0,lte=2\""];
34-
string commissioningCustomFlowUrl = 9 [(gogoproto.moretags) = "validate:\"required_if=CommissioningCustomFlow 2,omitempty,url,startsnotwith=http:,max=256\""];
34+
string commissioningCustomFlowUrl = 9 [(gogoproto.moretags) = "validate:\"required_if=CommissioningCustomFlow 2,omitempty,url,startswith=https:,max=256\""];
3535
uint32 commissioningModeInitialStepsHint = 10;
3636
string commissioningModeInitialStepsInstruction = 11 [(gogoproto.moretags) = "validate:\"max=1024\""];
3737
uint32 commissioningModeSecondaryStepsHint = 12;
3838
string commissioningModeSecondaryStepsInstruction = 13 [(gogoproto.moretags) = "validate:\"max=1024\""];
39-
string userManualUrl = 14 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
40-
string supportUrl = 15 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
41-
string productUrl = 16 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
42-
string lsfUrl = 17 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
39+
string userManualUrl = 14 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
40+
string supportUrl = 15 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
41+
string productUrl = 16 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
42+
string lsfUrl = 17 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
4343
uint32 schemaVersion = 18 [(gogoproto.moretags) = "validate:\"eq=0\""];
4444
int32 enhancedSetupFlowOptions = 19 [(gogoproto.moretags) = "validate:\"omitempty,gte=0,lte=65535\""];
4545
string enhancedSetupFlowTCUrl = 20 [(gogoproto.moretags) = "validate:\"required_if_bit_0_set=EnhancedSetupFlowOptions,omitempty,url,startswith=https:,max=256\""];
@@ -58,13 +58,13 @@ message MsgUpdateModel {
5858
string productName = 4 [(gogoproto.moretags) = "validate:\"max=128\""];
5959
string productLabel = 5 [(gogoproto.moretags) = "validate:\"max=256\""];
6060
string partNumber = 6 [(gogoproto.moretags) = "validate:\"max=32\""];
61-
string commissioningCustomFlowUrl = 7 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
61+
string commissioningCustomFlowUrl = 7 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
6262
string commissioningModeInitialStepsInstruction = 8 [(gogoproto.moretags) = "validate:\"max=1024\""];
6363
string commissioningModeSecondaryStepsInstruction = 9 [(gogoproto.moretags) = "validate:\"max=1024\""];
64-
string userManualUrl = 10 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
65-
string supportUrl = 11 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
66-
string productUrl = 12 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
67-
string lsfUrl = 13 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
64+
string userManualUrl = 10 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
65+
string supportUrl = 11 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
66+
string productUrl = 12 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
67+
string lsfUrl = 13 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
6868
int32 lsfRevision = 14 [(gogoproto.moretags) = "validate:\"gte=0,lte=65535\""];
6969
uint32 schemaVersion = 15 [(gogoproto.moretags) = "validate:\"eq=0\""];
7070
uint32 commissioningModeInitialStepsHint = 16;
@@ -93,13 +93,13 @@ message MsgCreateModelVersion {
9393
int32 cdVersionNumber = 6 [(gogoproto.moretags) = "validate:\"gte=0,lte=65535\""];
9494
string firmwareInformation = 7 [(gogoproto.moretags) = "validate:\"max=512\""];
9595
bool softwareVersionValid = 8;
96-
string otaUrl = 9 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
96+
string otaUrl = 9 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
9797
uint64 otaFileSize = 10 [(gogoproto.moretags) = "validate:\"required_with=OtaUrl\""];
9898
string otaChecksum = 11 [(gogoproto.moretags) = "validate:\"required_with=OtaUrl,max=64\""];
9999
int32 otaChecksumType = 12 [(gogoproto.moretags) = "validate:\"required_with=OtaUrl,gte=0,lte=65535\""];
100100
uint32 minApplicableSoftwareVersion = 13;
101101
uint32 maxApplicableSoftwareVersion = 14 [(gogoproto.moretags) = "validate:\"gtecsfield=MinApplicableSoftwareVersion\""];
102-
string releaseNotesUrl = 15 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
102+
string releaseNotesUrl = 15 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
103103
uint32 schemaVersion = 16 [(gogoproto.moretags) = "validate:\"eq=0\""];
104104
}
105105
message MsgCreateModelVersionResponse {}
@@ -110,10 +110,10 @@ message MsgUpdateModelVersion {
110110
int32 pid = 3 [(gogoproto.moretags) = "validate:\"gte=1,lte=65535\""];
111111
uint32 softwareVersion = 4;
112112
bool softwareVersionValid = 5;
113-
string otaUrl = 6 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
113+
string otaUrl = 6 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
114114
uint32 minApplicableSoftwareVersion = 7;
115115
uint32 maxApplicableSoftwareVersion = 8 [(gogoproto.moretags) = "validate:\"omitempty,gtecsfield=MinApplicableSoftwareVersion\""];
116-
string releaseNotesUrl = 9 [(gogoproto.moretags) = "validate:\"omitempty,url,startsnotwith=http:,max=256\""];
116+
string releaseNotesUrl = 9 [(gogoproto.moretags) = "validate:\"omitempty,url,startswith=https:,max=256\""];
117117
uint64 otaFileSize = 10;
118118
string otaChecksum = 11 [(gogoproto.moretags) = "validate:\"max=64\""];
119119
uint32 schemaVersion = 12 [(gogoproto.moretags) = "validate:\"eq=0\""];

proto/zigbeealliance/distributedcomplianceledger/vendorinfo/tx.proto

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ message MsgCreateVendorInfo {
2222
string vendorName = 3 [(gogoproto.moretags) = "validate:\"required,max=128\""];
2323
string companyLegalName = 4 [(gogoproto.moretags) = "validate:\"required,max=256\""];
2424
string companyPreferredName = 5 [(gogoproto.moretags) = "validate:\"omitempty,max=256\""];
25-
string vendorLandingPageURL = 6 [(gogoproto.moretags) = "validate:\"omitempty,max=256,url,startsnotwith=http:\""];
25+
string vendorLandingPageURL = 6 [(gogoproto.moretags) = "validate:\"omitempty,max=256,url,startswith=https:\""];
2626
uint32 schemaVersion = 7 [(gogoproto.moretags) = "validate:\"eq=0\""];
2727
}
2828
message MsgCreateVendorInfoResponse {}
@@ -34,7 +34,7 @@ message MsgUpdateVendorInfo {
3434
string vendorName = 3 [(gogoproto.moretags) = "validate:\"omitempty,max=128\""];
3535
string companyLegalName = 4 [(gogoproto.moretags) = "validate:\"omitempty,max=256\""];
3636
string companyPreferredName = 5 [(gogoproto.moretags) = "validate:\"omitempty,max=256\""];
37-
string vendorLandingPageURL = 6 [(gogoproto.moretags) = "validate:\"omitempty,max=256,url,startsnotwith=http:\""];
37+
string vendorLandingPageURL = 6 [(gogoproto.moretags) = "validate:\"omitempty,max=256,url,startswith=https:\""];
3838
uint32 schemaVersion = 7 [(gogoproto.moretags) = "validate:\"eq=0\""];
3939
}
4040
message MsgUpdateVendorInfoResponse {}

0 commit comments

Comments
 (0)