Skip to content

Commit 79634f8

Browse files
0x4c65650x4c6565
authored
PSS v2 (#181)
* add PSS v2 commands
1 parent d1f5ca8 commit 79634f8

67 files changed

Lines changed: 2917 additions & 236 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/ddosx/ddosx_domain.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ func DomainStatusWaitFunc(service ddosx.DDoSXService, domainName string, status
262262
return false, fmt.Errorf("Failed to retrieve domain [%s]: %s", domainName, err)
263263
}
264264
if domain.Status == ddosx.DomainStatusFailed {
265-
return false, fmt.Errorf("Domain [%s] in [%s] state", domainName, domain.Status.String())
265+
return false, fmt.Errorf("Domain [%s] in [%s] state", domainName, domain.Status)
266266
}
267267
if domain.Status == status {
268268
return true, nil

‎cmd/ddosx/ddosx_domain_acl_geoip_mode.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func ddosxDomainACLGeoIPRulesModeUpdate(service ddosx.DDoSXService, cmd *cobra.C
9595

9696
if cmd.Flags().Changed("mode") {
9797
mode, _ := cmd.Flags().GetString("mode")
98-
parsedMode, err := ddosx.ParseACLGeoIPRulesMode(mode)
98+
parsedMode, err := ddosx.ACLGeoIPRulesModeEnum.Parse(mode)
9999
if err != nil {
100100
return err
101101
}

‎cmd/ddosx/ddosx_domain_acl_ip.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func ddosxDomainACLIPRuleCreateCmd(f factory.ClientFactory) *cobra.Command {
148148
func ddosxDomainACLIPRuleCreate(service ddosx.DDoSXService, cmd *cobra.Command, args []string) error {
149149
ip, _ := cmd.Flags().GetString("ip")
150150
mode, _ := cmd.Flags().GetString("mode")
151-
parsedMode, err := ddosx.ParseACLIPMode(mode)
151+
parsedMode, err := ddosx.ACLIPModeEnum.Parse(mode)
152152
if err != nil {
153153
return clierrors.NewErrInvalidFlagValue("mode", mode, err)
154154
}
@@ -219,7 +219,7 @@ func ddosxDomainACLIPRuleUpdate(service ddosx.DDoSXService, cmd *cobra.Command,
219219

220220
if cmd.Flags().Changed("mode") {
221221
mode, _ := cmd.Flags().GetString("mode")
222-
parsedMode, err := ddosx.ParseACLIPMode(mode)
222+
parsedMode, err := ddosx.ACLIPModeEnum.Parse(mode)
223223
if err != nil {
224224
return err
225225
}

‎cmd/ddosx/ddosx_domain_cdn_rule.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ func ddosxDomainCDNRuleCreateCmd(f factory.ClientFactory) *cobra.Command {
146146

147147
func ddosxDomainCDNRuleCreate(service ddosx.DDoSXService, cmd *cobra.Command, args []string) error {
148148
cacheControl, _ := cmd.Flags().GetString("cache-control")
149-
parsedCacheControl, err := ddosx.ParseCDNRuleCacheControl(cacheControl)
149+
parsedCacheControl, err := ddosx.CDNRuleCacheControlEnum.Parse(cacheControl)
150150
if err != nil {
151151
return clierrors.NewErrInvalidFlagValue("cache-control", cacheControl, err)
152152
}
153153

154154
ruleType, _ := cmd.Flags().GetString("type")
155-
parsedRuleType, err := ddosx.ParseCDNRuleType(ruleType)
155+
parsedRuleType, err := ddosx.CDNRuleTypeEnum.Parse(ruleType)
156156
if err != nil {
157157
return clierrors.NewErrInvalidFlagValue("type", ruleType, err)
158158
}
@@ -230,7 +230,7 @@ func ddosxDomainCDNRuleUpdate(service ddosx.DDoSXService, cmd *cobra.Command, ar
230230

231231
if cmd.Flags().Changed("cache-control") {
232232
cacheControl, _ := cmd.Flags().GetString("cache-control")
233-
parsedCacheControl, err := ddosx.ParseCDNRuleCacheControl(cacheControl)
233+
parsedCacheControl, err := ddosx.CDNRuleCacheControlEnum.Parse(cacheControl)
234234
if err != nil {
235235
return clierrors.NewErrInvalidFlagValue("cache-control", cacheControl, err)
236236
}
@@ -254,7 +254,7 @@ func ddosxDomainCDNRuleUpdate(service ddosx.DDoSXService, cmd *cobra.Command, ar
254254

255255
if cmd.Flags().Changed("type") {
256256
ruleType, _ := cmd.Flags().GetString("type")
257-
parsedRuleType, err := ddosx.ParseCDNRuleType(ruleType)
257+
parsedRuleType, err := ddosx.CDNRuleTypeEnum.Parse(ruleType)
258258
if err != nil {
259259
return clierrors.NewErrInvalidFlagValue("type", ruleType, err)
260260
}

‎cmd/ddosx/ddosx_domain_hsts_rule.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func ddosxDomainHSTSRuleCreateCmd(f factory.ClientFactory) *cobra.Command {
143143

144144
func ddosxDomainHSTSRuleCreate(service ddosx.DDoSXService, cmd *cobra.Command, args []string) error {
145145
ruleType, _ := cmd.Flags().GetString("type")
146-
parsedRuleType, err := ddosx.ParseHSTSRuleType(ruleType)
146+
parsedRuleType, err := ddosx.HSTSRuleTypeEnum.Parse(ruleType)
147147
if err != nil {
148148
return clierrors.NewErrInvalidFlagValue("type", ruleType, err)
149149
}

‎cmd/ddosx/ddosx_domain_waf.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ func ddosxDomainWAFCreateCmd(f factory.ClientFactory) *cobra.Command {
102102

103103
func ddosxDomainWAFCreate(service ddosx.DDoSXService, cmd *cobra.Command, args []string) error {
104104
mode, _ := cmd.Flags().GetString("mode")
105-
parsedMode, err := ddosx.ParseWAFMode(mode)
105+
parsedMode, err := ddosx.WAFModeEnum.Parse(mode)
106106
if err != nil {
107107
return err
108108
}
109109
paranoiaLevel, _ := cmd.Flags().GetString("paranoia-level")
110-
parsedParanoiaLevel, err := ddosx.ParseWAFParanoiaLevel(paranoiaLevel)
110+
parsedParanoiaLevel, err := ddosx.WAFParanoiaLevelEnum.Parse(paranoiaLevel)
111111
if err != nil {
112112
return err
113113
}
@@ -164,7 +164,7 @@ func ddosxDomainWAFUpdate(service ddosx.DDoSXService, cmd *cobra.Command, args [
164164

165165
if cmd.Flags().Changed("mode") {
166166
mode, _ := cmd.Flags().GetString("mode")
167-
parsedMode, err := ddosx.ParseWAFMode(mode)
167+
parsedMode, err := ddosx.WAFModeEnum.Parse(mode)
168168
if err != nil {
169169
return err
170170
}
@@ -174,7 +174,7 @@ func ddosxDomainWAFUpdate(service ddosx.DDoSXService, cmd *cobra.Command, args [
174174

175175
if cmd.Flags().Changed("paranoia-level") {
176176
paranoiaLevel, _ := cmd.Flags().GetString("paranoia-level")
177-
parsedParanoiaLevel, err := ddosx.ParseWAFParanoiaLevel(paranoiaLevel)
177+
parsedParanoiaLevel, err := ddosx.WAFParanoiaLevelEnum.Parse(paranoiaLevel)
178178
if err != nil {
179179
return err
180180
}

‎cmd/ddosx/ddosx_domain_waf_advancedrule.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func ddosxDomainWAFAdvancedRuleCreate(service ddosx.DDoSXService, cmd *cobra.Com
150150
createRequest := ddosx.CreateWAFAdvancedRuleRequest{}
151151

152152
modifier, _ := cmd.Flags().GetString("modifier")
153-
parsedModifier, err := ddosx.ParseWAFAdvancedRuleModifier(modifier)
153+
parsedModifier, err := ddosx.WAFAdvancedRuleModifierEnum.Parse(modifier)
154154
if err != nil {
155155
return err
156156
}
@@ -213,7 +213,7 @@ func ddosxDomainWAFAdvancedRuleUpdate(service ddosx.DDoSXService, cmd *cobra.Com
213213

214214
if cmd.Flags().Changed("modifier") {
215215
modifier, _ := cmd.Flags().GetString("modifier")
216-
parsedModifier, err := ddosx.ParseWAFAdvancedRuleModifier(modifier)
216+
parsedModifier, err := ddosx.WAFAdvancedRuleModifierEnum.Parse(modifier)
217217
if err != nil {
218218
return err
219219
}

‎cmd/ecloud/ecloud.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func TaskStatusWaitFunc(service ecloud.ECloudService, taskID string, expectedSta
186186
return false, fmt.Errorf("Failed to retrieve task status: %s", err)
187187
}
188188
if task.Status == ecloud.TaskStatusFailed {
189-
return false, fmt.Errorf("Task in [%s] state", ecloud.TaskStatusFailed.String())
189+
return false, fmt.Errorf("Task in [%s] state", ecloud.TaskStatusFailed)
190190
}
191191
if task.Status == expectedStatus {
192192
return true, nil

‎cmd/ecloud/ecloud_affinityrule.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ func ecloudAffinityRuleCreate(service ecloud.ECloudService, cmd *cobra.Command,
118118
createRequest := ecloud.CreateAffinityRuleRequest{}
119119
createRequest.VPCID, _ = cmd.Flags().GetString("vpc")
120120
createRequest.AvailabilityZoneID, _ = cmd.Flags().GetString("availability-zone")
121-
121+
122122
ruleType, _ := cmd.Flags().GetString("type")
123-
parsedType, err := ecloud.ParseAffinityRuleType(ruleType)
123+
parsedType, err := ecloud.AffinityRuleTypeEnum.Parse(ruleType)
124124
if err != nil {
125125
return err
126126
}

‎cmd/ecloud/ecloud_firewallrule.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,14 @@ func ecloudFirewallRuleCreate(service ecloud.ECloudService, cmd *cobra.Command,
130130
createRequest.Enabled, _ = cmd.Flags().GetBool("enabled")
131131

132132
direction, _ := cmd.Flags().GetString("direction")
133-
directionParsed, err := ecloud.ParseFirewallRuleDirection(direction)
133+
directionParsed, err := ecloud.FirewallRuleDirectionEnum.Parse(direction)
134134
if err != nil {
135135
return err
136136
}
137137
createRequest.Direction = directionParsed
138138

139139
action, _ := cmd.Flags().GetString("action")
140-
actionParsed, err := ecloud.ParseFirewallRuleAction(action)
140+
actionParsed, err := ecloud.FirewallRuleActionEnum.Parse(action)
141141
if err != nil {
142142
return err
143143
}
@@ -212,7 +212,7 @@ func ecloudFirewallRuleUpdate(service ecloud.ECloudService, cmd *cobra.Command,
212212

213213
if cmd.Flags().Changed("direction") {
214214
direction, _ := cmd.Flags().GetString("direction")
215-
directionParsed, err := ecloud.ParseFirewallRuleDirection(direction)
215+
directionParsed, err := ecloud.FirewallRuleDirectionEnum.Parse(direction)
216216
if err != nil {
217217
return err
218218
}
@@ -222,7 +222,7 @@ func ecloudFirewallRuleUpdate(service ecloud.ECloudService, cmd *cobra.Command,
222222

223223
if cmd.Flags().Changed("action") {
224224
action, _ := cmd.Flags().GetString("action")
225-
actionParsed, err := ecloud.ParseFirewallRuleAction(action)
225+
actionParsed, err := ecloud.FirewallRuleActionEnum.Parse(action)
226226
if err != nil {
227227
return err
228228
}

0 commit comments

Comments
 (0)