create endpoints using egoscale 3.1.6 structs

exoscale · Sep 19, 2024 · 946301c · 946301c
1 parent 686fa4b
commit 946301c
Show file tree

Hide file tree

Showing 17 changed files with 792 additions and 405 deletions.
diff --git a/cmd/dbaas_external_endpoint_create_datadog.go b/cmd/dbaas_external_endpoint_create_datadog.go
@@ -26,8 +26,8 @@ func (c *dbaasExternalEndpointCreateCmd) createDatadog(_ *cobra.Command, _ []str
 		}
 	}
 
-	datadogRequestPayload := v3.CreateDBAASExternalEndpointDatadogRequest{
-		Settings: &v3.DBAASEndpointDatadog{},
+	datadogRequestPayload := v3.DBAASEndpointDatadogPayload{
+		Settings: &v3.DBAASEndpointDatadogPayloadSettings{},
 	}
 
 	if c.DatadogAPIKey != "" {

diff --git a/cmd/dbaas_external_endpoint_create_elasticsearch.go b/cmd/dbaas_external_endpoint_create_elasticsearch.go
@@ -15,8 +15,8 @@ func (c *dbaasExternalEndpointCreateCmd) createElasticsearch(_ *cobra.Command, _
 		return err
 	}
 
-	elasticsearchRequestPayload := v3.CreateDBAASExternalEndpointElasticsearchRequest{
-		Settings: &v3.DBAASEndpointElasticsearch{},
+	elasticsearchRequestPayload := v3.DBAASEndpointElasticsearchPayload{
+		Settings: &v3.DBAASEndpointElasticsearchPayloadSettings{},
 	}
 
 	if c.ElasticsearchURL != "" {

diff --git a/cmd/dbaas_external_endpoint_create_opensearch.go b/cmd/dbaas_external_endpoint_create_opensearch.go
@@ -15,8 +15,8 @@ func (c *dbaasExternalEndpointCreateCmd) createOpensearch(_ *cobra.Command, _ []
 		return err
 	}
 
-	opensearchRequestPayload := v3.CreateDBAASExternalEndpointOpensearchRequest{
-		Settings: &v3.DBAASEndpointOpensearch{},
+	opensearchRequestPayload := v3.DBAASEndpointOpensearchPayload{
+		Settings: &v3.DBAASEndpointOpensearchPayloadSettings{},
 	}
 
 	if c.OpensearchURL != "" {

diff --git a/cmd/dbaas_external_endpoint_create_prometheus.go b/cmd/dbaas_external_endpoint_create_prometheus.go
@@ -15,8 +15,8 @@ func (c *dbaasExternalEndpointCreateCmd) createPrometheus(_ *cobra.Command, _ []
 		return err
 	}
 
-	prometheusRequestPayload := v3.CreateDBAASExternalEndpointPrometheusRequest{
-		Settings: &v3.DBAASEndpointPrometheus{},
+	prometheusRequestPayload := v3.DBAASEndpointPrometheusPayload{
+		Settings: &v3.DBAASEndpointPrometheusPayloadSettings{},
 	}
 
 	if c.PrometheusBasicAuthPassword != "" {

diff --git a/cmd/dbaas_external_endpoint_create_rsyslog.go b/cmd/dbaas_external_endpoint_create_rsyslog.go
@@ -15,8 +15,8 @@ func (c *dbaasExternalEndpointCreateCmd) createRsyslog(_ *cobra.Command, _ []str
 		return err
 	}
 
-	rsyslogRequestPayload := v3.CreateDBAASExternalEndpointRsyslogRequest{
-		Settings: &v3.DBAASEndpointRsyslog{},
+	rsyslogRequestPayload := v3.DBAASEndpointRsyslogPayload{
+		Settings: &v3.DBAASEndpointRsyslogPayloadSettings{},
 	}
 
 	if c.RsyslogCA != "" {

diff --git a/cmd/dbaas_external_endpoint_show_datadog.go b/cmd/dbaas_external_endpoint_show_datadog.go
@@ -33,7 +33,6 @@ func (o *datadogOutput) ToTable() {
 	t.Append([]string{"Endpoint Type", o.Type})
 
 	settings := o.Settings
-	t.Append([]string{"Datadog API Key", settings.DatadogAPIKey})
 	t.Append([]string{"Site", string(settings.Site)})
 
 	disableConsumerStats := "false"

diff --git a/cmd/dbaas_external_endpoint_show_elasticsearch.go b/cmd/dbaas_external_endpoint_show_elasticsearch.go
@@ -33,7 +33,6 @@ func (o *elasticsearchOutput) ToTable() {
 	settings := o.Settings
 	t.Append([]string{"Elasticsearch URL", settings.URL})
 	t.Append([]string{"Index Prefix", settings.IndexPrefix})
-	t.Append([]string{"CA Certificate", truncateString(settings.CA, 50)})
 	t.Append([]string{"Index Days Max", strconv.FormatInt(settings.IndexDaysMax, 10)})
 	t.Append([]string{"Timeout", strconv.FormatInt(settings.Timeout, 10)})
 }

diff --git a/cmd/dbaas_external_endpoint_show_opensearch.go b/cmd/dbaas_external_endpoint_show_opensearch.go
@@ -33,7 +33,6 @@ func (o *opensearchOutput) ToTable() {
 	settings := o.Settings
 	t.Append([]string{"OpenSearch URL", settings.URL})
 	t.Append([]string{"Index Prefix", settings.IndexPrefix})
-	t.Append([]string{"CA Certificate", truncateString(settings.CA, 50)})
 	t.Append([]string{"Index Days Max", strconv.FormatInt(settings.IndexDaysMax, 10)})
 	t.Append([]string{"Timeout", strconv.FormatInt(settings.Timeout, 10)})
 }

diff --git a/cmd/dbaas_external_endpoint_show_prometheus.go b/cmd/dbaas_external_endpoint_show_prometheus.go
@@ -31,7 +31,6 @@ func (o *prometheusOutput) ToTable() {
 
 	settings := o.Settings
 	t.Append([]string{"Basic Auth Username", settings.BasicAuthUsername})
-	t.Append([]string{"Basic Auth Password", settings.BasicAuthPassword})
 }
 
 func (c *dbaasExternalEndpointShowCmd) showPrometheus() (output.Outputter, error) {

diff --git a/cmd/dbaas_external_endpoint_show_rsyslog.go b/cmd/dbaas_external_endpoint_show_rsyslog.go
@@ -40,13 +40,9 @@ if settings.Tls != nil && *settings.Tls {
 	t.Append([]string{"Server", settings.Server})
 	t.Append([]string{"Port", strconv.FormatInt(settings.Port,10)})
 	t.Append([]string{"Tls", tls})
-	t.Append([]string{"CA Certificate", truncateString(settings.CA, 50)})
-	t.Append([]string{"Client Certificate", truncateString(settings.Cert, 50)})
-	t.Append([]string{"Client Key", truncateString(settings.Key, 50)})
 	t.Append([]string{"Max Message Size", strconv.FormatInt(settings.MaxMessageSize, 10)})
 	t.Append([]string{"Structured data block", settings.SD})
 	t.Append([]string{"Custom logline format", settings.Logline})
-	t.Append([]string{"Custom logline format", settings.Logline})
 }
 
 func (c *dbaasExternalEndpointShowCmd) showRsyslog() (output.Outputter, error) {

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/aws/smithy-go v1.1.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/exoscale/egoscale v0.102.4
-	github.com/exoscale/egoscale/v3 v3.1.4
+	github.com/exoscale/egoscale/v3 v3.1.6
 	github.com/exoscale/openapi-cli-generator v1.1.0
 	github.com/fatih/camelcase v1.0.0
 	github.com/google/uuid v1.4.0

diff --git a/go.sum b/go.sum
@@ -197,8 +197,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
 github.com/exoscale/egoscale v0.102.4 h1:GBKsZMIOzwBfSu+4ZmWka3Ejf2JLiaBDHp4CQUgvp2E=
 github.com/exoscale/egoscale v0.102.4/go.mod h1:ROSmPtle0wvf91iLZb09++N/9BH2Jo9XxIpAEumvocA=
-github.com/exoscale/egoscale/v3 v3.1.4 h1:xpKEGX58GIC3CHTsJdRB5+ij74DmgWPts/n8OrItJ6s=
-github.com/exoscale/egoscale/v3 v3.1.4/go.mod h1:GHKucK/J26v8PGWztGdhxWNMjrjG9PbelxKCJ4YI11Q=
+github.com/exoscale/egoscale/v3 v3.1.6 h1:bTxsGG2B+9iHjziTfiySJ+FiZHyAiKiIoTs/Qfq6Orw=
+github.com/exoscale/egoscale/v3 v3.1.6/go.mod h1:GHKucK/J26v8PGWztGdhxWNMjrjG9PbelxKCJ4YI11Q=
 github.com/exoscale/openapi-cli-generator v1.1.0 h1:fYjmPqHR5vxlOBrbvde7eo7bISNQIFxsGn4A5/acwKA=
 github.com/exoscale/openapi-cli-generator v1.1.0/go.mod h1:TZBnbT7f3hJ5ImyUphJwRM+X5xF/zCQZ6o8a42gQeTs=
 github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=

diff --git a/vendor/github.com/exoscale/egoscale/v3/client.go b/vendor/github.com/exoscale/egoscale/v3/client.go