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

Commit d7bfeb2

Browse files
gitlawrgitlawr
committed
go generate
1 parent 7f64a70 commit d7bfeb2

File tree

7 files changed

+58
-14
lines changed

7 files changed

+58
-14
lines changed

‎apis/management.cattle.io/v3/zz_generated_deepcopy.go‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,14 +2281,8 @@ func (in *ClusterTemplateSpec) DeepCopy() *ClusterTemplateSpec {
22812281
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
22822282
func (in *ClusterTestInput) DeepCopyInto(out *ClusterTestInput) {
22832283
*out = *in
2284+
in.LoggingCommonField.DeepCopyInto(&out.LoggingCommonField)
22842285
in.LoggingTargets.DeepCopyInto(&out.LoggingTargets)
2285-
if in.OutputTags != nil {
2286-
in, out := &in.OutputTags, &out.OutputTags
2287-
*out = make(map[string]string, len(*in))
2288-
for key, val := range *in {
2289-
(*out)[key] = val
2290-
}
2291-
}
22922286
return
22932287
}
22942288

@@ -7379,14 +7373,8 @@ func (in *ProjectStatus) DeepCopy() *ProjectStatus {
73797373
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
73807374
func (in *ProjectTestInput) DeepCopyInto(out *ProjectTestInput) {
73817375
*out = *in
7376+
in.LoggingCommonField.DeepCopyInto(&out.LoggingCommonField)
73827377
in.LoggingTargets.DeepCopyInto(&out.LoggingTargets)
7383-
if in.OutputTags != nil {
7384-
in, out := &in.OutputTags, &out.OutputTags
7385-
*out = make(map[string]string, len(*in))
7386-
for key, val := range *in {
7387-
(*out)[key] = val
7388-
}
7389-
}
73907378
return
73917379
}
73927380

‎client/management/v3/zz_generated_cluster_logging.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@ const (
1010
ClusterLoggingFieldAppliedSpec = "appliedSpec"
1111
ClusterLoggingFieldClusterID = "clusterId"
1212
ClusterLoggingFieldConditions = "conditions"
13+
ClusterLoggingFieldContinueLineRegexp = "continueLineRegexp"
1314
ClusterLoggingFieldCreated = "created"
1415
ClusterLoggingFieldCreatorID = "creatorId"
1516
ClusterLoggingFieldCustomTargetConfig = "customTargetConfig"
1617
ClusterLoggingFieldElasticsearchConfig = "elasticsearchConfig"
18+
ClusterLoggingFieldEnableMultiLineFilter = "enableMultiLineFilter"
1719
ClusterLoggingFieldFailedSpec = "failedSpec"
1820
ClusterLoggingFieldFluentForwarderConfig = "fluentForwarderConfig"
1921
ClusterLoggingFieldIncludeSystemComponent = "includeSystemComponent"
2022
ClusterLoggingFieldKafkaConfig = "kafkaConfig"
2123
ClusterLoggingFieldLabels = "labels"
24+
ClusterLoggingFieldMultiLineEndRegexp = "multiLineEndRegexp"
25+
ClusterLoggingFieldMultiLineStartRegexp = "multiLineStartRegexp"
2226
ClusterLoggingFieldName = "name"
2327
ClusterLoggingFieldNamespaceId = "namespaceId"
2428
ClusterLoggingFieldOutputFlushInterval = "outputFlushInterval"
@@ -39,15 +43,19 @@ type ClusterLogging struct {
3943
AppliedSpec *ClusterLoggingSpec `json:"appliedSpec,omitempty" yaml:"appliedSpec,omitempty"`
4044
ClusterID string `json:"clusterId,omitempty" yaml:"clusterId,omitempty"`
4145
Conditions []LoggingCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"`
46+
ContinueLineRegexp string `json:"continueLineRegexp,omitempty" yaml:"continueLineRegexp,omitempty"`
4247
Created string `json:"created,omitempty" yaml:"created,omitempty"`
4348
CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"`
4449
CustomTargetConfig *CustomTargetConfig `json:"customTargetConfig,omitempty" yaml:"customTargetConfig,omitempty"`
4550
ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"`
51+
EnableMultiLineFilter bool `json:"enableMultiLineFilter,omitempty" yaml:"enableMultiLineFilter,omitempty"`
4652
FailedSpec *ClusterLoggingSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"`
4753
FluentForwarderConfig *FluentForwarderConfig `json:"fluentForwarderConfig,omitempty" yaml:"fluentForwarderConfig,omitempty"`
4854
IncludeSystemComponent *bool `json:"includeSystemComponent,omitempty" yaml:"includeSystemComponent,omitempty"`
4955
KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"`
5056
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
57+
MultiLineEndRegexp string `json:"multiLineEndRegexp,omitempty" yaml:"multiLineEndRegexp,omitempty"`
58+
MultiLineStartRegexp string `json:"multiLineStartRegexp,omitempty" yaml:"multiLineStartRegexp,omitempty"`
5159
Name string `json:"name,omitempty" yaml:"name,omitempty"`
5260
NamespaceId string `json:"namespaceId,omitempty" yaml:"namespaceId,omitempty"`
5361
OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"`

‎client/management/v3/zz_generated_cluster_logging_spec.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ package client
33
const (
44
ClusterLoggingSpecType = "clusterLoggingSpec"
55
ClusterLoggingSpecFieldClusterID = "clusterId"
6+
ClusterLoggingSpecFieldContinueLineRegexp = "continueLineRegexp"
67
ClusterLoggingSpecFieldCustomTargetConfig = "customTargetConfig"
78
ClusterLoggingSpecFieldDisplayName = "displayName"
89
ClusterLoggingSpecFieldElasticsearchConfig = "elasticsearchConfig"
10+
ClusterLoggingSpecFieldEnableMultiLineFilter = "enableMultiLineFilter"
911
ClusterLoggingSpecFieldFluentForwarderConfig = "fluentForwarderConfig"
1012
ClusterLoggingSpecFieldIncludeSystemComponent = "includeSystemComponent"
1113
ClusterLoggingSpecFieldKafkaConfig = "kafkaConfig"
14+
ClusterLoggingSpecFieldMultiLineEndRegexp = "multiLineEndRegexp"
15+
ClusterLoggingSpecFieldMultiLineStartRegexp = "multiLineStartRegexp"
1216
ClusterLoggingSpecFieldOutputFlushInterval = "outputFlushInterval"
1317
ClusterLoggingSpecFieldOutputTags = "outputTags"
1418
ClusterLoggingSpecFieldSplunkConfig = "splunkConfig"
@@ -17,12 +21,16 @@ const (
1721

1822
type ClusterLoggingSpec struct {
1923
ClusterID string `json:"clusterId,omitempty" yaml:"clusterId,omitempty"`
24+
ContinueLineRegexp string `json:"continueLineRegexp,omitempty" yaml:"continueLineRegexp,omitempty"`
2025
CustomTargetConfig *CustomTargetConfig `json:"customTargetConfig,omitempty" yaml:"customTargetConfig,omitempty"`
2126
DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"`
2227
ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"`
28+
EnableMultiLineFilter bool `json:"enableMultiLineFilter,omitempty" yaml:"enableMultiLineFilter,omitempty"`
2329
FluentForwarderConfig *FluentForwarderConfig `json:"fluentForwarderConfig,omitempty" yaml:"fluentForwarderConfig,omitempty"`
2430
IncludeSystemComponent *bool `json:"includeSystemComponent,omitempty" yaml:"includeSystemComponent,omitempty"`
2531
KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"`
32+
MultiLineEndRegexp string `json:"multiLineEndRegexp,omitempty" yaml:"multiLineEndRegexp,omitempty"`
33+
MultiLineStartRegexp string `json:"multiLineStartRegexp,omitempty" yaml:"multiLineStartRegexp,omitempty"`
2634
OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"`
2735
OutputTags map[string]string `json:"outputTags,omitempty" yaml:"outputTags,omitempty"`
2836
SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty" yaml:"splunkConfig,omitempty"`

‎client/management/v3/zz_generated_cluster_test_input.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,33 @@ package client
33
const (
44
ClusterTestInputType = "clusterTestInput"
55
ClusterTestInputFieldClusterName = "clusterId"
6+
ClusterTestInputFieldContinueLineRegexp = "continueLineRegexp"
67
ClusterTestInputFieldCustomTargetConfig = "customTargetConfig"
8+
ClusterTestInputFieldDisplayName = "displayName"
79
ClusterTestInputFieldElasticsearchConfig = "elasticsearchConfig"
10+
ClusterTestInputFieldEnableMultiLineFilter = "enableMultiLineFilter"
811
ClusterTestInputFieldFluentForwarderConfig = "fluentForwarderConfig"
912
ClusterTestInputFieldKafkaConfig = "kafkaConfig"
13+
ClusterTestInputFieldMultiLineEndRegexp = "multiLineEndRegexp"
14+
ClusterTestInputFieldMultiLineStartRegexp = "multiLineStartRegexp"
15+
ClusterTestInputFieldOutputFlushInterval = "outputFlushInterval"
1016
ClusterTestInputFieldOutputTags = "outputTags"
1117
ClusterTestInputFieldSplunkConfig = "splunkConfig"
1218
ClusterTestInputFieldSyslogConfig = "syslogConfig"
1319
)
1420

1521
type ClusterTestInput struct {
1622
ClusterName string `json:"clusterId,omitempty" yaml:"clusterId,omitempty"`
23+
ContinueLineRegexp string `json:"continueLineRegexp,omitempty" yaml:"continueLineRegexp,omitempty"`
1724
CustomTargetConfig *CustomTargetConfig `json:"customTargetConfig,omitempty" yaml:"customTargetConfig,omitempty"`
25+
DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"`
1826
ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"`
27+
EnableMultiLineFilter bool `json:"enableMultiLineFilter,omitempty" yaml:"enableMultiLineFilter,omitempty"`
1928
FluentForwarderConfig *FluentForwarderConfig `json:"fluentForwarderConfig,omitempty" yaml:"fluentForwarderConfig,omitempty"`
2029
KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"`
30+
MultiLineEndRegexp string `json:"multiLineEndRegexp,omitempty" yaml:"multiLineEndRegexp,omitempty"`
31+
MultiLineStartRegexp string `json:"multiLineStartRegexp,omitempty" yaml:"multiLineStartRegexp,omitempty"`
32+
OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"`
2133
OutputTags map[string]string `json:"outputTags,omitempty" yaml:"outputTags,omitempty"`
2234
SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty" yaml:"splunkConfig,omitempty"`
2335
SyslogConfig *SyslogConfig `json:"syslogConfig,omitempty" yaml:"syslogConfig,omitempty"`

‎client/management/v3/zz_generated_project_logging.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@ import (
77
const (
88
ProjectLoggingType = "projectLogging"
99
ProjectLoggingFieldAnnotations = "annotations"
10+
ProjectLoggingFieldContinueLineRegexp = "continueLineRegexp"
1011
ProjectLoggingFieldCreated = "created"
1112
ProjectLoggingFieldCreatorID = "creatorId"
1213
ProjectLoggingFieldCustomTargetConfig = "customTargetConfig"
1314
ProjectLoggingFieldElasticsearchConfig = "elasticsearchConfig"
15+
ProjectLoggingFieldEnableMultiLineFilter = "enableMultiLineFilter"
1416
ProjectLoggingFieldFluentForwarderConfig = "fluentForwarderConfig"
1517
ProjectLoggingFieldKafkaConfig = "kafkaConfig"
1618
ProjectLoggingFieldLabels = "labels"
19+
ProjectLoggingFieldMultiLineEndRegexp = "multiLineEndRegexp"
20+
ProjectLoggingFieldMultiLineStartRegexp = "multiLineStartRegexp"
1721
ProjectLoggingFieldName = "name"
1822
ProjectLoggingFieldNamespaceId = "namespaceId"
1923
ProjectLoggingFieldOutputFlushInterval = "outputFlushInterval"
@@ -33,13 +37,17 @@ const (
3337
type ProjectLogging struct {
3438
types.Resource
3539
Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
40+
ContinueLineRegexp string `json:"continueLineRegexp,omitempty" yaml:"continueLineRegexp,omitempty"`
3641
Created string `json:"created,omitempty" yaml:"created,omitempty"`
3742
CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"`
3843
CustomTargetConfig *CustomTargetConfig `json:"customTargetConfig,omitempty" yaml:"customTargetConfig,omitempty"`
3944
ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"`
45+
EnableMultiLineFilter bool `json:"enableMultiLineFilter,omitempty" yaml:"enableMultiLineFilter,omitempty"`
4046
FluentForwarderConfig *FluentForwarderConfig `json:"fluentForwarderConfig,omitempty" yaml:"fluentForwarderConfig,omitempty"`
4147
KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"`
4248
Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"`
49+
MultiLineEndRegexp string `json:"multiLineEndRegexp,omitempty" yaml:"multiLineEndRegexp,omitempty"`
50+
MultiLineStartRegexp string `json:"multiLineStartRegexp,omitempty" yaml:"multiLineStartRegexp,omitempty"`
4351
Name string `json:"name,omitempty" yaml:"name,omitempty"`
4452
NamespaceId string `json:"namespaceId,omitempty" yaml:"namespaceId,omitempty"`
4553
OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"`

‎client/management/v3/zz_generated_project_logging_spec.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@ package client
22

33
const (
44
ProjectLoggingSpecType = "projectLoggingSpec"
5+
ProjectLoggingSpecFieldContinueLineRegexp = "continueLineRegexp"
56
ProjectLoggingSpecFieldCustomTargetConfig = "customTargetConfig"
67
ProjectLoggingSpecFieldDisplayName = "displayName"
78
ProjectLoggingSpecFieldElasticsearchConfig = "elasticsearchConfig"
9+
ProjectLoggingSpecFieldEnableMultiLineFilter = "enableMultiLineFilter"
810
ProjectLoggingSpecFieldFluentForwarderConfig = "fluentForwarderConfig"
911
ProjectLoggingSpecFieldKafkaConfig = "kafkaConfig"
12+
ProjectLoggingSpecFieldMultiLineEndRegexp = "multiLineEndRegexp"
13+
ProjectLoggingSpecFieldMultiLineStartRegexp = "multiLineStartRegexp"
1014
ProjectLoggingSpecFieldOutputFlushInterval = "outputFlushInterval"
1115
ProjectLoggingSpecFieldOutputTags = "outputTags"
1216
ProjectLoggingSpecFieldProjectID = "projectId"
@@ -15,11 +19,15 @@ const (
1519
)
1620

1721
type ProjectLoggingSpec struct {
22+
ContinueLineRegexp string `json:"continueLineRegexp,omitempty" yaml:"continueLineRegexp,omitempty"`
1823
CustomTargetConfig *CustomTargetConfig `json:"customTargetConfig,omitempty" yaml:"customTargetConfig,omitempty"`
1924
DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"`
2025
ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"`
26+
EnableMultiLineFilter bool `json:"enableMultiLineFilter,omitempty" yaml:"enableMultiLineFilter,omitempty"`
2127
FluentForwarderConfig *FluentForwarderConfig `json:"fluentForwarderConfig,omitempty" yaml:"fluentForwarderConfig,omitempty"`
2228
KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"`
29+
MultiLineEndRegexp string `json:"multiLineEndRegexp,omitempty" yaml:"multiLineEndRegexp,omitempty"`
30+
MultiLineStartRegexp string `json:"multiLineStartRegexp,omitempty" yaml:"multiLineStartRegexp,omitempty"`
2331
OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"`
2432
OutputTags map[string]string `json:"outputTags,omitempty" yaml:"outputTags,omitempty"`
2533
ProjectID string `json:"projectId,omitempty" yaml:"projectId,omitempty"`

‎client/management/v3/zz_generated_project_test_input.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,33 @@ package client
22

33
const (
44
ProjectTestInputType = "projectTestInput"
5+
ProjectTestInputFieldContinueLineRegexp = "continueLineRegexp"
56
ProjectTestInputFieldCustomTargetConfig = "customTargetConfig"
7+
ProjectTestInputFieldDisplayName = "displayName"
68
ProjectTestInputFieldElasticsearchConfig = "elasticsearchConfig"
9+
ProjectTestInputFieldEnableMultiLineFilter = "enableMultiLineFilter"
710
ProjectTestInputFieldFluentForwarderConfig = "fluentForwarderConfig"
811
ProjectTestInputFieldKafkaConfig = "kafkaConfig"
12+
ProjectTestInputFieldMultiLineEndRegexp = "multiLineEndRegexp"
13+
ProjectTestInputFieldMultiLineStartRegexp = "multiLineStartRegexp"
14+
ProjectTestInputFieldOutputFlushInterval = "outputFlushInterval"
915
ProjectTestInputFieldOutputTags = "outputTags"
1016
ProjectTestInputFieldProjectName = "projectId"
1117
ProjectTestInputFieldSplunkConfig = "splunkConfig"
1218
ProjectTestInputFieldSyslogConfig = "syslogConfig"
1319
)
1420

1521
type ProjectTestInput struct {
22+
ContinueLineRegexp string `json:"continueLineRegexp,omitempty" yaml:"continueLineRegexp,omitempty"`
1623
CustomTargetConfig *CustomTargetConfig `json:"customTargetConfig,omitempty" yaml:"customTargetConfig,omitempty"`
24+
DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"`
1725
ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"`
26+
EnableMultiLineFilter bool `json:"enableMultiLineFilter,omitempty" yaml:"enableMultiLineFilter,omitempty"`
1827
FluentForwarderConfig *FluentForwarderConfig `json:"fluentForwarderConfig,omitempty" yaml:"fluentForwarderConfig,omitempty"`
1928
KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"`
29+
MultiLineEndRegexp string `json:"multiLineEndRegexp,omitempty" yaml:"multiLineEndRegexp,omitempty"`
30+
MultiLineStartRegexp string `json:"multiLineStartRegexp,omitempty" yaml:"multiLineStartRegexp,omitempty"`
31+
OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"`
2032
OutputTags map[string]string `json:"outputTags,omitempty" yaml:"outputTags,omitempty"`
2133
ProjectName string `json:"projectId,omitempty" yaml:"projectId,omitempty"`
2234
SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty" yaml:"splunkConfig,omitempty"`

0 commit comments

Comments
 (0)