IF-10358 Resolve conflict

nttcom · Apr 24, 2024 · 3c7deb7 · 3c7deb7
2 parents 09b9d96 + 93fffae
commit 3c7deb7
Show file tree

Hide file tree

Showing 552 changed files with 884 additions and 48,912 deletions.
diff --git a/ecl/sss/v1/approval_requests/testing/fixtures.go b/ecl/sss/v1/approval_requests/testing/fixtures.go
@@ -36,7 +36,7 @@ var listResponse = fmt.Sprintf(`
 			"descriptions": [
 				{
 					"lang": "en",
-					"text": "approval request test"
+					"text": "approval resquest test"
 				}
 			],
 			"request_user": false,
@@ -66,7 +66,7 @@ var listResponse = fmt.Sprintf(`
 			"descriptions": [
 				{
 					"lang": "en",
-					"text": "approval request test"
+					"text": "approval resquest test"
 				}
 			],
 			"request_user": false,
@@ -113,7 +113,7 @@ var firstApprovalRequest = ar.ApprovalRequest{
 	Descriptions: []ar.Description{
 		{
 			Lang: "en",
-			Text: "approval request test",
+			Text: "approval resquest test",
 		},
 	},
 	RequestUser:      false,
@@ -144,7 +144,7 @@ var secondApprovalRequest = ar.ApprovalRequest{
 	Descriptions: []ar.Description{
 		{
 			Lang: "en",
-			Text: "approval request test",
+			Text: "approval resquest test",
 		},
 	},
 	RequestUser:      false,
@@ -181,7 +181,7 @@ var getResponse = fmt.Sprintf(`
 		"descriptions": [
 			{
 				"lang": "en",
-				"text": "approval request test"
+				"text": "approval resquest test"
 			}
 		],
 		"request_user": false,

diff --git a/v2/ecl/imagestorage/v2/images/requests.go b/v2/ecl/imagestorage/v2/images/requests.go
@@ -173,9 +173,6 @@ type CreateOpts struct {
 	// is required to boot the image.
 	MinRAM int `json:"min_ram,omitempty"`
 
-	// License Switch is meant to bring your image license into ECL environment
-	LicenseSwitch string `json:"license_switch,omitempty"`
-
 	// protected is whether the image is not deletable.
 	Protected *bool `json:"protected,omitempty"`
 

diff --git a/v2/ecl/imagestorage/v2/images/results.go b/v2/ecl/imagestorage/v2/images/results.go
@@ -85,9 +85,6 @@ type Image struct {
 
 	// VirtualSize is the virtual size of the image
 	VirtualSize int64 `json:"virtual_size"`
-
-	// License Switch is meant to bring your image license into ECL environment
-	LicenseSwitch string `json:"license_switch"`
 }
 
 func (r *Image) UnmarshalJSON(b []byte) error {

diff --git a/v2/ecl/managed_load_balancer/v1/certificates/requests.go b/v2/ecl/managed_load_balancer/v1/certificates/requests.go
@@ -20,9 +20,11 @@ type ListOpts struct {
 	ID string `q:"id"`
 
 	// - Name of the resource
+	// - This field accepts single-byte characters only
 	Name string `q:"name"`
 
 	// - Description of the resource
+	// - This field accepts single-byte characters only
 	Description string `q:"description"`
 
 	// - ID of the owner tenant of the resource
@@ -77,13 +79,17 @@ Create Certificate
 type CreateOpts struct {
 
 	// - Name of the certificate
+	// - This field accepts single-byte characters only
 	Name string `json:"name,omitempty"`
 
 	// - Description of the certificate
+	// - This field accepts single-byte characters only
 	Description string `json:"description,omitempty"`
 
 	// - Tags of the certificate
-	// - Must be specified as JSON object
+	// - Set JSON object up to 32,768 characters
+	//   - Nested structure is permitted
+	// - This field accepts single-byte characters only
 	Tags map[string]interface{} `json:"tags,omitempty"`
 }
 
@@ -134,13 +140,17 @@ Update Certificate
 type UpdateOpts struct {
 
 	// - Name of the certificate
+	// - This field accepts single-byte characters only
 	Name *string `json:"name,omitempty"`
 
 	// - Description of the certificate
+	// - This field accepts single-byte characters only
 	Description *string `json:"description,omitempty"`
 
 	// - Tags of the certificate
-	// - Must be specified as JSON object
+	// - Set JSON object up to 32,768 characters
+	//   - Nested structure is permitted
+	// - This field accepts single-byte characters only
 	Tags *map[string]interface{} `json:"tags,omitempty"`
 }
 
@@ -195,9 +205,9 @@ type UploadFileOpts struct {
 	Type string `json:"type"`
 
 	// - Content of the certificate file to be uploaded
-	// - Size of the file before encoding by Base64 must be less than or equal to 16KB
-	// - Must be specified the content of the file that encoded by Base64 format
-	//   - Format of the file before encoding by Base64 must be PEM
+	// - Content must be Base64 encoded
+	//   - The file size before encoding must be less than or equal to 16KB
+	//   - The file format before encoding must be PEM
 	//   - DER can be converted to PEM by using OpenSSL command
 	Content string `json:"content"`
 }

diff --git a/v2/ecl/managed_load_balancer/v1/health_monitors/requests.go b/v2/ecl/managed_load_balancer/v1/health_monitors/requests.go
@@ -20,9 +20,11 @@ type ListOpts struct {
 	ID string `q:"id"`
 
 	// - Name of the resource
+	// - This field accepts single-byte characters only
 	Name string `q:"name"`
 
 	// - Description of the resource
+	// - This field accepts single-byte characters only
 	Description string `q:"description"`
 
 	// - Configuration status of the resource
@@ -100,17 +102,21 @@ Create Health Monitor
 type CreateOpts struct {
 
 	// - Name of the health monitor
+	// - This field accepts single-byte characters only
 	Name string `json:"name,omitempty"`
 
 	// - Description of the health monitor
+	// - This field accepts single-byte characters only
 	Description string `json:"description,omitempty"`
 
 	// - Tags of the health monitor
-	// - Must be specified as JSON object
+	// - Set JSON object up to 32,768 characters
+	//   - Nested structure is permitted
+	// - This field accepts single-byte characters only
 	Tags map[string]interface{} `json:"tags,omitempty"`
 
 	// - Port number of the health monitor for healthchecking
-	// - Must be specified `0` when `protocol` is `"icmp"`
+	// - If 'protocol' is 'icmp', value must be set `0`
 	Port int `json:"port"`
 
 	// - Protocol of the health monitor for healthchecking
@@ -121,20 +127,22 @@ type CreateOpts struct {
 
 	// - Retry count of healthchecking
 	// - Initial monitoring is not included
-	// - Retry is executed at the interval specified by `interval`
+	// - Retry is executed at the interval set in `interval`
 	Retry int `json:"retry,omitempty"`
 
 	// - Timeout of healthchecking (in seconds)
-	// - Must be specified a number less than or equal to `interval`
+	// - Value must be less than or equal to `interval`
 	Timeout int `json:"timeout,omitempty"`
 
 	// - URL path of healthchecking
-	// - Can be specified path to monitor when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, URL path can be set
+	//   - If `protocol` is neither `"http"` nor `"https"`, URL path must not be set
 	// - Must be started with /
 	Path string `json:"path,omitempty"`
 
 	// - HTTP status codes expected in healthchecking
-	// - Can be specified HTTP status code (or range) when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, HTTP status code (or range) can be set
+	//   - If `protocol` is neither `"http"` nor `"https"`, HTTP status code (or range) must not be set
 	// - Format: `"xxx"` or `"xxx-xxx"` ( `xxx` between [100, 599])
 	HttpStatusCode string `json:"http_status_code,omitempty"`
 
@@ -175,7 +183,7 @@ Show Health Monitor
 // ShowOpts represents options used to show a health monitor.
 type ShowOpts struct {
 
-	// - When `true` is specified, `current` and `staged` are returned in response body
+	// - If `true` is set, `current` and `staged` are returned in response body
 	Changes bool `q:"changes"`
 }
 
@@ -215,13 +223,17 @@ Update Health Monitor Attributes
 type UpdateOpts struct {
 
 	// - Name of the health monitor
+	// - This field accepts single-byte characters only
 	Name *string `json:"name,omitempty"`
 
 	// - Description of the health monitor
+	// - This field accepts single-byte characters only
 	Description *string `json:"description,omitempty"`
 
 	// - Tags of the health monitor
-	// - Must be specified as JSON object
+	// - Set JSON object up to 32,768 characters
+	//   - Nested structure is permitted
+	// - This field accepts single-byte characters only
 	Tags *map[string]interface{} `json:"tags,omitempty"`
 }
 
@@ -272,7 +284,7 @@ Create Staged Health Monitor Configurations
 type CreateStagedOpts struct {
 
 	// - Port number of the health monitor for healthchecking
-	// - Must be specified `0` when `protocol` is `"icmp"`
+	// - If 'protocol' is 'icmp', value must be set `0`
 	Port int `json:"port,omitempty"`
 
 	// - Protocol of the health monitor for healthchecking
@@ -283,20 +295,22 @@ type CreateStagedOpts struct {
 
 	// - Retry count of healthchecking
 	// - Initial monitoring is not included
-	// - Retry is executed at the interval specified by `interval`
+	// - Retry is executed at the interval set in `interval`
 	Retry int `json:"retry,omitempty"`
 
 	// - Timeout of healthchecking (in seconds)
-	// - Must be specified a number less than or equal to `interval`
+	// - Value must be less than or equal to `interval`
 	Timeout int `json:"timeout,omitempty"`
 
 	// - URL path of healthchecking
-	// - Can be specified path to monitor when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, URL path can be set
+	//   - If `protocol` is neither `"http"` nor `"https"`, URL path must not be set
 	// - Must be started with /
 	Path string `json:"path,omitempty"`
 
 	// - HTTP status codes expected in healthchecking
-	// - Can be specified HTTP status code (or range) when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, HTTP status code (or range) can be set
+	//   - If `protocol` is neither `"http"` nor `"https"`, HTTP status code (or range) must not be set
 	// - Format: `"xxx"` or `"xxx-xxx"` ( `xxx` between [100, 599])
 	HttpStatusCode string `json:"http_status_code,omitempty"`
 }
@@ -348,7 +362,7 @@ Update Staged Health Monitor Configurations
 type UpdateStagedOpts struct {
 
 	// - Port number of the health monitor for healthchecking
-	// - Must be specified `0` when `protocol` is `"icmp"`
+	// - If 'protocol' is 'icmp', value must be set `0`
 	Port *int `json:"port,omitempty"`
 
 	// - Protocol of the health monitor for healthchecking
@@ -359,20 +373,22 @@ type UpdateStagedOpts struct {
 
 	// - Retry count of healthchecking
 	// - Initial monitoring is not included
-	// - Retry is executed at the interval specified by `interval`
+	// - Retry is executed at the interval set in `interval`
 	Retry *int `json:"retry,omitempty"`
 
 	// - Timeout of healthchecking (in seconds)
-	// - Must be specified a number less than or equal to `interval`
+	// - Value must be less than or equal to `interval`
 	Timeout *int `json:"timeout,omitempty"`
 
 	// - URL path of healthchecking
-	// - Can be specified path to monitor when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, URL path can be set
+	//   - If `protocol` is neither `"http"` nor `"https"`, URL path must not be set
 	// - Must be started with /
 	Path *string `json:"path,omitempty"`
 
 	// - HTTP status codes expected in healthchecking
-	// - Can be specified HTTP status code (or range) when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, HTTP status code (or range) can be set
+	//   - If `protocol` is neither `"http"` nor `"https"`, HTTP status code (or range) must not be set
 	// - Format: `"xxx"` or `"xxx-xxx"` ( `xxx` between [100, 599])
 	HttpStatusCode *string `json:"http_status_code,omitempty"`
 }

diff --git a/v2/ecl/managed_load_balancer/v1/health_monitors/results.go b/v2/ecl/managed_load_balancer/v1/health_monitors/results.go
@@ -64,7 +64,7 @@ type CancelStagedResult struct {
 type ConfigurationInResponse struct {
 
 	// - Port number of the health monitor for healthchecking
-	// - Returns `0` when `protocol` is `"icmp"`
+	// - If `protocol` is `"icmp"`, returns `0`
 	Port int `json:"port,omitempty"`
 
 	// - Protocol of the health monitor for healthchecking
@@ -75,18 +75,18 @@ type ConfigurationInResponse struct {
 
 	// - Retry count of healthchecking
 	// - Initial monitoring is not included
-	// - Retry is executed at the interval specified by `interval`
+	// - Retry is executed at the interval set in `interval`
 	Retry int `json:"retry,omitempty"`
 
 	// - Timeout of healthchecking (in seconds)
 	Timeout int `json:"timeout,omitempty"`
 
 	// - URL path of healthchecking
-	// - Used when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, uses this parameter
 	Path string `json:"path,omitempty"`
 
 	// - HTTP status codes expected in healthchecking
-	// - Used when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, uses this parameter
 	// - Format: `"xxx"` or `"xxx-xxx"` ( `xxx` between [100, 599])
 	HttpStatusCode string `json:"http_status_code,omitempty"`
 }
@@ -144,7 +144,7 @@ type HealthMonitor struct {
 	TenantID string `json:"tenant_id"`
 
 	// - Port number of the health monitor for healthchecking
-	// - Returns `0` when `protocol` is `"icmp"`
+	// - If `protocol` is `"icmp"`, returns `0`
 	Port int `json:"port,omitempty"`
 
 	// - Protocol of the health monitor for healthchecking
@@ -155,29 +155,29 @@ type HealthMonitor struct {
 
 	// - Retry count of healthchecking
 	// - Initial monitoring is not included
-	// - Retry is executed at the interval specified by `interval`
+	// - Retry is executed at the interval set in `interval`
 	Retry int `json:"retry,omitempty"`
 
 	// - Timeout of healthchecking (in seconds)
 	Timeout int `json:"timeout,omitempty"`
 
 	// - URL path of healthchecking
-	// - Used when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, uses this parameter
 	Path string `json:"path,omitempty"`
 
 	// - HTTP status codes expected in healthchecking
-	// - Used when `protocol` is `"http"` or `"https"`
+	// - If `protocol` is `"http"` or `"https"`, uses this parameter
 	// - Format: `"xxx"` or `"xxx-xxx"` ( `xxx` between [100, 599])
 	HttpStatusCode string `json:"http_status_code,omitempty"`
 
 	// - Running configurations of the health monitor
-	// - Return object when `changes` is `true`
-	// - Return `null` when current configuration does not exist
+	// - If `changes` is `true`, return object
+	// - If current configuration does not exist, return `null`
 	Current ConfigurationInResponse `json:"current,omitempty"`
 
 	// - Added or changed configurations of the health monitor that waiting to be applied
-	// - Return object when `changes` is `true`
-	// - Return `null` when staged configuration does not exist
+	// - If `changes` is `true`, return object
+	// - If staged configuration does not exist, return `null`
 	Staged ConfigurationInResponse `json:"staged,omitempty"`
 }