From c9dc486e63edbbd8d6571bac87ee9ad7992e6af8 Mon Sep 17 00:00:00 2001 From: Aiwantaozi Date: Tue, 12 Jun 2018 09:37:32 +0800 Subject: [PATCH] update vendor --- .../v3/zz_generated_cluster_logging.go | 2 ++ .../v3/zz_generated_cluster_logging_spec.go | 2 ++ .../v3/zz_generated_elasticsearch_config.go | 34 ++++++++++++------- .../v3/zz_generated_kafka_config.go | 6 ++++ .../v3/zz_generated_project_logging.go | 2 ++ .../v3/zz_generated_project_logging_spec.go | 2 ++ .../v3/zz_generated_splunk_config.go | 28 ++++++++++----- 7 files changed, 54 insertions(+), 22 deletions(-) diff --git a/client/management/v3/zz_generated_cluster_logging.go b/client/management/v3/zz_generated_cluster_logging.go index 57824f7f..e2e384fe 100644 --- a/client/management/v3/zz_generated_cluster_logging.go +++ b/client/management/v3/zz_generated_cluster_logging.go @@ -12,6 +12,7 @@ const ( ClusterLoggingFieldConditions = "conditions" ClusterLoggingFieldCreated = "created" ClusterLoggingFieldCreatorID = "creatorId" + ClusterLoggingFieldDockerRootDir = "dockerRootDir" ClusterLoggingFieldElasticsearchConfig = "elasticsearchConfig" ClusterLoggingFieldEmbeddedConfig = "embeddedConfig" ClusterLoggingFieldFailedSpec = "failedSpec" @@ -39,6 +40,7 @@ type ClusterLogging struct { Conditions []LoggingCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` EmbeddedConfig *EmbeddedConfig `json:"embeddedConfig,omitempty" yaml:"embeddedConfig,omitempty"` FailedSpec *ClusterLoggingSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_logging_spec.go b/client/management/v3/zz_generated_cluster_logging_spec.go index cc874cf1..c8f81c37 100644 --- a/client/management/v3/zz_generated_cluster_logging_spec.go +++ b/client/management/v3/zz_generated_cluster_logging_spec.go @@ -4,6 +4,7 @@ const ( ClusterLoggingSpecType = "clusterLoggingSpec" ClusterLoggingSpecFieldClusterId = "clusterId" ClusterLoggingSpecFieldDisplayName = "displayName" + ClusterLoggingSpecFieldDockerRootDir = "dockerRootDir" ClusterLoggingSpecFieldElasticsearchConfig = "elasticsearchConfig" ClusterLoggingSpecFieldEmbeddedConfig = "embeddedConfig" ClusterLoggingSpecFieldKafkaConfig = "kafkaConfig" @@ -16,6 +17,7 @@ const ( type ClusterLoggingSpec struct { ClusterId string `json:"clusterId,omitempty" yaml:"clusterId,omitempty"` DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` + DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` EmbeddedConfig *EmbeddedConfig `json:"embeddedConfig,omitempty" yaml:"embeddedConfig,omitempty"` KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"` diff --git a/client/management/v3/zz_generated_elasticsearch_config.go b/client/management/v3/zz_generated_elasticsearch_config.go index f367c0bd..134353ca 100644 --- a/client/management/v3/zz_generated_elasticsearch_config.go +++ b/client/management/v3/zz_generated_elasticsearch_config.go @@ -1,20 +1,28 @@ package client const ( - ElasticsearchConfigType = "elasticsearchConfig" - ElasticsearchConfigFieldAuthPassword = "authPassword" - ElasticsearchConfigFieldAuthUserName = "authUsername" - ElasticsearchConfigFieldDateFormat = "dateFormat" - ElasticsearchConfigFieldEndpoint = "endpoint" - ElasticsearchConfigFieldIndexPrefix = "indexPrefix" - ElasticsearchConfigFieldSSLVerify = "sslVerify" + ElasticsearchConfigType = "elasticsearchConfig" + ElasticsearchConfigFieldAuthPassword = "authPassword" + ElasticsearchConfigFieldAuthUserName = "authUsername" + ElasticsearchConfigFieldCertificate = "certificate" + ElasticsearchConfigFieldClientCert = "clientCert" + ElasticsearchConfigFieldClientKey = "clientKey" + ElasticsearchConfigFieldClientKeyPass = "clientKeyPass" + ElasticsearchConfigFieldDateFormat = "dateFormat" + ElasticsearchConfigFieldEndpoint = "endpoint" + ElasticsearchConfigFieldIndexPrefix = "indexPrefix" + ElasticsearchConfigFieldSSLVerify = "sslVerify" ) type ElasticsearchConfig struct { - AuthPassword string `json:"authPassword,omitempty" yaml:"authPassword,omitempty"` - AuthUserName string `json:"authUsername,omitempty" yaml:"authUsername,omitempty"` - DateFormat string `json:"dateFormat,omitempty" yaml:"dateFormat,omitempty"` - Endpoint string `json:"endpoint,omitempty" yaml:"endpoint,omitempty"` - IndexPrefix string `json:"indexPrefix,omitempty" yaml:"indexPrefix,omitempty"` - SSLVerify bool `json:"sslVerify,omitempty" yaml:"sslVerify,omitempty"` + AuthPassword string `json:"authPassword,omitempty" yaml:"authPassword,omitempty"` + AuthUserName string `json:"authUsername,omitempty" yaml:"authUsername,omitempty"` + Certificate string `json:"certificate,omitempty" yaml:"certificate,omitempty"` + ClientCert string `json:"clientCert,omitempty" yaml:"clientCert,omitempty"` + ClientKey string `json:"clientKey,omitempty" yaml:"clientKey,omitempty"` + ClientKeyPass string `json:"clientKeyPass,omitempty" yaml:"clientKeyPass,omitempty"` + DateFormat string `json:"dateFormat,omitempty" yaml:"dateFormat,omitempty"` + Endpoint string `json:"endpoint,omitempty" yaml:"endpoint,omitempty"` + IndexPrefix string `json:"indexPrefix,omitempty" yaml:"indexPrefix,omitempty"` + SSLVerify bool `json:"sslVerify,omitempty" yaml:"sslVerify,omitempty"` } diff --git a/client/management/v3/zz_generated_kafka_config.go b/client/management/v3/zz_generated_kafka_config.go index 0ebdcf5f..b1f8aa70 100644 --- a/client/management/v3/zz_generated_kafka_config.go +++ b/client/management/v3/zz_generated_kafka_config.go @@ -3,12 +3,18 @@ package client const ( KafkaConfigType = "kafkaConfig" KafkaConfigFieldBrokerEndpoints = "brokerEndpoints" + KafkaConfigFieldCertificate = "certificate" + KafkaConfigFieldClientCert = "clientCert" + KafkaConfigFieldClientKey = "clientKey" KafkaConfigFieldTopic = "topic" KafkaConfigFieldZookeeperEndpoint = "zookeeperEndpoint" ) type KafkaConfig struct { BrokerEndpoints []string `json:"brokerEndpoints,omitempty" yaml:"brokerEndpoints,omitempty"` + Certificate string `json:"certificate,omitempty" yaml:"certificate,omitempty"` + ClientCert string `json:"clientCert,omitempty" yaml:"clientCert,omitempty"` + ClientKey string `json:"clientKey,omitempty" yaml:"clientKey,omitempty"` Topic string `json:"topic,omitempty" yaml:"topic,omitempty"` ZookeeperEndpoint string `json:"zookeeperEndpoint,omitempty" yaml:"zookeeperEndpoint,omitempty"` } diff --git a/client/management/v3/zz_generated_project_logging.go b/client/management/v3/zz_generated_project_logging.go index 0dc148dd..0677967d 100644 --- a/client/management/v3/zz_generated_project_logging.go +++ b/client/management/v3/zz_generated_project_logging.go @@ -9,6 +9,7 @@ const ( ProjectLoggingFieldAnnotations = "annotations" ProjectLoggingFieldCreated = "created" ProjectLoggingFieldCreatorID = "creatorId" + ProjectLoggingFieldDockerRootDir = "dockerRootDir" ProjectLoggingFieldElasticsearchConfig = "elasticsearchConfig" ProjectLoggingFieldKafkaConfig = "kafkaConfig" ProjectLoggingFieldLabels = "labels" @@ -33,6 +34,7 @@ type ProjectLogging struct { Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` + DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` diff --git a/client/management/v3/zz_generated_project_logging_spec.go b/client/management/v3/zz_generated_project_logging_spec.go index 1f30b85a..5e6b83e8 100644 --- a/client/management/v3/zz_generated_project_logging_spec.go +++ b/client/management/v3/zz_generated_project_logging_spec.go @@ -3,6 +3,7 @@ package client const ( ProjectLoggingSpecType = "projectLoggingSpec" ProjectLoggingSpecFieldDisplayName = "displayName" + ProjectLoggingSpecFieldDockerRootDir = "dockerRootDir" ProjectLoggingSpecFieldElasticsearchConfig = "elasticsearchConfig" ProjectLoggingSpecFieldKafkaConfig = "kafkaConfig" ProjectLoggingSpecFieldOutputFlushInterval = "outputFlushInterval" @@ -14,6 +15,7 @@ const ( type ProjectLoggingSpec struct { DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` + DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"` OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"` diff --git a/client/management/v3/zz_generated_splunk_config.go b/client/management/v3/zz_generated_splunk_config.go index 8714a554..0220e0f2 100644 --- a/client/management/v3/zz_generated_splunk_config.go +++ b/client/management/v3/zz_generated_splunk_config.go @@ -1,16 +1,26 @@ package client const ( - SplunkConfigType = "splunkConfig" - SplunkConfigFieldEndpoint = "endpoint" - SplunkConfigFieldSSLVerify = "sslVerify" - SplunkConfigFieldSource = "source" - SplunkConfigFieldToken = "token" + SplunkConfigType = "splunkConfig" + SplunkConfigFieldCertificate = "certificate" + SplunkConfigFieldClientCert = "clientCert" + SplunkConfigFieldClientKey = "clientKey" + SplunkConfigFieldClientKeyPass = "clientKeyPass" + SplunkConfigFieldEndpoint = "endpoint" + SplunkConfigFieldIndex = "index" + SplunkConfigFieldSSLVerify = "sslVerify" + SplunkConfigFieldSource = "source" + SplunkConfigFieldToken = "token" ) type SplunkConfig struct { - Endpoint string `json:"endpoint,omitempty" yaml:"endpoint,omitempty"` - SSLVerify bool `json:"sslVerify,omitempty" yaml:"sslVerify,omitempty"` - Source string `json:"source,omitempty" yaml:"source,omitempty"` - Token string `json:"token,omitempty" yaml:"token,omitempty"` + Certificate string `json:"certificate,omitempty" yaml:"certificate,omitempty"` + ClientCert string `json:"clientCert,omitempty" yaml:"clientCert,omitempty"` + ClientKey string `json:"clientKey,omitempty" yaml:"clientKey,omitempty"` + ClientKeyPass string `json:"clientKeyPass,omitempty" yaml:"clientKeyPass,omitempty"` + Endpoint string `json:"endpoint,omitempty" yaml:"endpoint,omitempty"` + Index string `json:"index,omitempty" yaml:"index,omitempty"` + SSLVerify bool `json:"sslVerify,omitempty" yaml:"sslVerify,omitempty"` + Source string `json:"source,omitempty" yaml:"source,omitempty"` + Token string `json:"token,omitempty" yaml:"token,omitempty"` }